Navigation Menu

Skip to content

Commit

Permalink
Reworked the Refinery build and install.
Browse files Browse the repository at this point in the history 
- Refinery builds with Visual Studio 7 again.
- All configurations can be built side-by-side properly.
- Removed the COLLADA_REFINERY_LOCATION environment variable. It's no longer needed.
- Added all necessary binaries to the bin directories.

git-svn-id: https://colladarefinery.svn.sourceforge.net/svnroot/colladarefinery/COLLADA_Refinery/trunk@43 7d79dae2-2c22-0410-a73c-a02ad39e49d4
  • Loading branch information
steve314 committed Jun 9, 2007
1 parent 6bd6c69 commit 8086e38
Show file tree
Hide file tree
Showing 47 changed files with 1,041 additions and 644 deletions.
2 changes: 0 additions & 2 deletions bin/refinery.bat
View file

This file was deleted.

Binary file added bin/vc7/debug/DevIL.dll
View file
Binary file not shown.
Binary file added bin/vc7/debug/iconv.dll
View file
Binary file not shown.
0 ...bs/COLLADA_DOM/lib/libcollada141dom12.dll → bin/vc7/debug/libcollada141dom12.dll
View file
File renamed without changes.
2 changes: 2 additions & 0 deletions bin/vc7/debug/refinery.bat
View file
@@ -0,0 +1,2 @@
@echo off
java -jar ..\..\refinery.jar %*
Binary file added bin/vc7/debug/zip32.dll
View file
Binary file not shown.
Binary file added bin/vc7/release/DevIL.dll
View file
Binary file not shown.
Binary file added bin/vc7/release/iconv.dll
View file
Binary file not shown.
Binary file added bin/vc7/release/libcollada141dom12.dll
View file
Binary file not shown.
2 changes: 2 additions & 0 deletions bin/vc7/release/refinery.bat
View file
@@ -0,0 +1,2 @@
@echo off
java -jar ..\..\refinery.jar %*
Binary file added bin/vc7/release/zip32.dll
View file
Binary file not shown.
Binary file added bin/vc8/debug/DevIL.dll
View file
Binary file not shown.
Binary file added bin/vc8/debug/iconv.dll
View file
Binary file not shown.
Binary file added bin/vc8/debug/libcollada141dom12.dll
View file
Binary file not shown.
2 changes: 2 additions & 0 deletions bin/vc8/debug/refinery.bat
View file
@@ -0,0 +1,2 @@
@echo off
java -jar ..\..\refinery.jar %*
Binary file added bin/vc8/debug/zip32.dll
View file
Binary file not shown.
Binary file added bin/vc8/release/DevIL.dll
View file
Binary file not shown.
Binary file added bin/vc8/release/iconv.dll
View file
Binary file not shown.
Binary file added bin/vc8/release/libcollada141dom12.dll
View file
Binary file not shown.
2 changes: 2 additions & 0 deletions bin/vc8/release/refinery.bat
View file
@@ -0,0 +1,2 @@
@echo off
java -jar ..\..\refinery.jar %*
Binary file added bin/vc8/release/zip32.dll
View file
Binary file not shown.
Binary file removed external-libs/COLLADA_DOM/lib/libcollada141dom12_d.dll
View file
Binary file not shown.
Binary file removed external-libs/COLLADA_DOM/lib/libcollada141dom12_d.lib
View file
Binary file not shown.
28 changes: 16 additions & 12 deletions projects/VC++7/JavaSrc.vcproj
View file
Expand Up @@ -18,13 +18,15 @@
ConfigurationType="0">
<Tool
Name="VCNMakeTool"
BuildCommandLine="&quot;C:\Program Files\Java\jdk1.5.0_07\bin\javac.exe&quot; -nowarn -sourcepath &quot;../../src/refinery&quot; -d &quot;../../tmp&quot; ../../src/refinery/*.java ../../src/refinery/display/*.java ../../src/refinery/document/*.java ../../src/refinery/history/*.java ../../src/refinery/output/*.java
&quot;C:\Program Files\Java\jdk1.5.0_07\bin\jar&quot; cfm ../../refinery.jar ../../src/refinery/manifest.txt -C ../../tmp refinery"
ReBuildCommandLine="&quot;C:\Program Files\Java\jdk1.5.0_07\bin\javac.exe&quot; -nowarn -sourcepath &quot;../../src/refinery&quot; -d &quot;../../tmp&quot; ../../src/refinery/*.java ../../src/refinery/display/*.java ../../src/refinery/document/*.java ../../src/refinery/history/*.java ../../src/refinery/output/*.java
&quot;C:\Program Files\Java\jdk1.5.0_07\bin\jar&quot; cfm ../../refinery.jar ../../src/refinery/manifest.txt -C ../../tmp refinery"
CleanCommandLine="del /F /Q ..\..\refinery.jar
BuildCommandLine="mkdir ..\..\tmp
&quot;$(JDK_HOME)\bin\javac&quot; -nowarn -sourcepath &quot;../../src/refinery&quot; -d &quot;../../tmp&quot; ../../src/refinery/*.java ../../src/refinery/display/*.java ../../src/refinery/document/*.java ../../src/refinery/history/*.java ../../src/refinery/output/*.java
&quot;$(JDK_HOME)\bin\jar&quot; cfm ../../bin/refinery.jar ../../src/refinery/manifest.txt -C ../../tmp refinery"
ReBuildCommandLine="mkdir ..\..\tmp
&quot;$(JDK_HOME)\bin\javac&quot; -nowarn -sourcepath &quot;../../src/refinery&quot; -d &quot;../../tmp&quot; ../../src/refinery/*.java ../../src/refinery/display/*.java ../../src/refinery/document/*.java ../../src/refinery/history/*.java ../../src/refinery/output/*.java
&quot;$(JDK_HOME)\bin\jar&quot; cfm ../../bin/refinery.jar ../../src/refinery/manifest.txt -C ../../tmp refinery"
CleanCommandLine="del /F /Q ..\..\bin\refinery.jar
rmdir /S /Q ..\..\tmp\refinery"
Output="..\..\refinery.jar"/>
Output="..\..\bin\refinery.jar"/>
</Configuration>
<Configuration
Name="Release|Win32"
Expand All @@ -33,13 +35,15 @@ rmdir /S /Q ..\..\tmp\refinery"
ConfigurationType="0">
<Tool
Name="VCNMakeTool"
BuildCommandLine="&quot;C:\Program Files\Java\jdk1.5.0_07\bin\javac&quot; -nowarn -sourcepath &quot;../../src/refinery&quot; -d &quot;../../tmp&quot; ../../src/refinery/*.java ../../src/refinery/display/*.java ../../src/refinery/document/*.java ../../src/refinery/history/*.java ../../src/refinery/output/*.java
&quot;C:\Program Files\Java\jdk1.5.0_07\bin\jar&quot; cfm ../../refinery.jar ../../src/refinery/manifest.txt -C ../../tmp refinery"
ReBuildCommandLine="&quot;C:\Program Files\Java\jdk1.5.0_07\bin\javac&quot; -nowarn -sourcepath &quot;../../src/refinery&quot; -d &quot;../../tmp&quot; ../../src/refinery/*.java ../../src/refinery/display/*.java ../../src/refinery/document/*.java ../../src/refinery/history/*.java ../../src/refinery/output/*.java
&quot;C:\Program Files\Java\jdk1.5.0_07\bin\jar&quot; cfm ../../refinery.jar ../../src/refinery/manifest.txt -C ../../tmp refinery"
CleanCommandLine="del /F /Q ..\..\refinery.jar
BuildCommandLine="mkdir ..\..\tmp
&quot;$(JDK_HOME)\bin\javac&quot; -nowarn -sourcepath &quot;../../src/refinery&quot; -d &quot;../../tmp&quot; ../../src/refinery/*.java ../../src/refinery/display/*.java ../../src/refinery/document/*.java ../../src/refinery/history/*.java ../../src/refinery/output/*.java
&quot;$(JDK_HOME)\bin\jar&quot; cfm ../../bin/refinery.jar ../../src/refinery/manifest.txt -C ../../tmp refinery"
ReBuildCommandLine="mkdir ..\..\tmp
&quot;$(JDK_HOME)\bin\javac&quot; -nowarn -sourcepath &quot;../../src/refinery&quot; -d &quot;../../tmp&quot; ../../src/refinery/*.java ../../src/refinery/display/*.java ../../src/refinery/document/*.java ../../src/refinery/history/*.java ../../src/refinery/output/*.java
&quot;$(JDK_HOME)\bin\jar&quot; cfm ../../bin/refinery.jar ../../src/refinery/manifest.txt -C ../../tmp refinery"
CleanCommandLine="del /F /Q ..\..\bin\refinery.jar
rmdir /S /Q ..\..\tmp\refinery"
Output="..\..\refinery.jar"/>
Output="..\..\bin\refinery.jar"/>
</Configuration>
</Configurations>
<References>
Expand Down
16 changes: 8 additions & 8 deletions projects/VC++7/Refinery.sln
View file
Expand Up @@ -17,10 +17,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "coherencytest", "coherencyt
{0D8CF61D-032E-4D68-87C6-B2F6DB067A07} = {0D8CF61D-032E-4D68-87C6-B2F6DB067A07}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "conditioners", "Conditioners.vcproj", "{E4E438F4-0E1A-4614-B135-42AF727F0C71}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kmzcleanup", "kmzcleanup.vcproj", "{E9EAE43E-B43F-44D6-91C2-A0D5170A9CA8}"
ProjectSection(ProjectDependencies) = postProject
{0D8CF61D-032E-4D68-87C6-B2F6DB067A07} = {0D8CF61D-032E-4D68-87C6-B2F6DB067A07}
Expand All @@ -30,6 +26,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "packager", "packager.vcproj
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "conditioners", "conditioners.vcproj", "{1BFF556C-A3E4-47AF-8B65-04C106EF07F0}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
Debug = Debug
Expand All @@ -52,10 +52,6 @@ Global
{FCFBF455-F739-4C02-8DCD-25CABE66F39A}.Debug.Build.0 = Debug|Win32
{FCFBF455-F739-4C02-8DCD-25CABE66F39A}.Release.ActiveCfg = Release|Win32
{FCFBF455-F739-4C02-8DCD-25CABE66F39A}.Release.Build.0 = Release|Win32
{E4E438F4-0E1A-4614-B135-42AF727F0C71}.Debug.ActiveCfg = Debug|Win32
{E4E438F4-0E1A-4614-B135-42AF727F0C71}.Debug.Build.0 = Debug|Win32
{E4E438F4-0E1A-4614-B135-42AF727F0C71}.Release.ActiveCfg = Release|Win32
{E4E438F4-0E1A-4614-B135-42AF727F0C71}.Release.Build.0 = Release|Win32
{E9EAE43E-B43F-44D6-91C2-A0D5170A9CA8}.Debug.ActiveCfg = Debug|Win32
{E9EAE43E-B43F-44D6-91C2-A0D5170A9CA8}.Debug.Build.0 = Debug|Win32
{E9EAE43E-B43F-44D6-91C2-A0D5170A9CA8}.Release.ActiveCfg = Release|Win32
Expand All @@ -64,6 +60,10 @@ Global
{3BDD95A3-4681-475F-A6FF-512EBE12C502}.Debug.Build.0 = Debug|Win32
{3BDD95A3-4681-475F-A6FF-512EBE12C502}.Release.ActiveCfg = Release|Win32
{3BDD95A3-4681-475F-A6FF-512EBE12C502}.Release.Build.0 = Release|Win32
{1BFF556C-A3E4-47AF-8B65-04C106EF07F0}.Debug.ActiveCfg = Debug|Win32
{1BFF556C-A3E4-47AF-8B65-04C106EF07F0}.Debug.Build.0 = Debug|Win32
{1BFF556C-A3E4-47AF-8B65-04C106EF07F0}.Release.ActiveCfg = Release|Win32
{1BFF556C-A3E4-47AF-8B65-04C106EF07F0}.Release.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
Expand Down
132 changes: 79 additions & 53 deletions projects/VC++7/bindmaterialfixer.vcproj
View file
Expand Up @@ -5,114 +5,140 @@
Name="bindmaterialfixer"
ProjectGUID="{1CF098BF-9F14-4BBB-8763-DD9596F78E6F}"
RootNamespace="libloader"
Keyword="Win32Proj"
>
Keyword="Win32Proj">
<Platforms>
<Platform
Name="Win32"
/>
Name="Win32"/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="../../tmp/$(ProjectName)/$(ConfigurationName)"
IntermediateDirectory="../../tmp/$(ProjectName)/$(ConfigurationName)"
OutputDirectory="../../bin/vc7/$(ConfigurationName)/conditioners"
IntermediateDirectory="../../tmp/vc7/$(ConfigurationName)/$(ProjectName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
CharacterSet="2"
>
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="&quot;C:\Program Files\Java\jdk1.5.0_07\include&quot;;&quot;C:\Program Files\Java\jdk1.5.0_07\include\win32&quot;;../../include;&quot;$(COLLADA_DOM_LOCATION)/include/1.4&quot;;&quot;$(COLLADA_DOM_LOCATION)/include&quot;"
AdditionalIncludeDirectories="&quot;$(JDK_HOME)\include&quot;;&quot;$(JDK_HOME)\include\win32&quot;;../../include;&quot;../../external-libs/collada_dom/include/1.4&quot;;&quot;../../external-libs/collada_dom/include&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;REFINERY;_CRT_SECURE_NO_DEPRECATE;REFINERY;DOM_DYNAMIC"
MinimalRebuild="true"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="4"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="libcollada141dom12_d.lib libloader.lib"
OutputFile="../../conditioners/$(ProjectName).dll"
AdditionalDependencies="libcollada141dom12.lib libloader.lib"
OutputFile="$(OutDir)/$(ProjectName).dll"
LinkIncremental="2"
AdditionalLibraryDirectories="$(COLLADA_DOM_LOCATION)/lib-dbg;../../lib"
AdditionalLibraryDirectories="../../external-libs/collada_dom/lib;../../lib/vc7/$(ConfigurationName)"
IgnoreDefaultLibraryNames="msvcrt"
DelayLoadDLLs=""
GenerateDebugInformation="true"
ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
SubSystem="2"
ImportLibrary="../../lib/$(TargetName).lib"
TargetMachine="1"
/>
ImportLibrary="../../lib/vc7/$(ConfigurationName)/$(TargetName).lib"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="../../tmp/$(ProjectName)/$(ConfigurationName)"
IntermediateDirectory="../../tmp/$(ProjectName)/$(ConfigurationName)"
OutputDirectory="../../bin/vc7/$(ConfigurationName)/conditioners"
IntermediateDirectory="../../tmp/vc7/$(ConfigurationName)/$(ProjectName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
CharacterSet="2"
>
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;C:\Program Files\Java\jdk1.5.0_07\include&quot;;&quot;C:\Program Files\Java\jdk1.5.0_07\include\win32&quot;;../../include;&quot;$(COLLADA_DOM_LOCATION)/include/1.4&quot;;&quot;$(COLLADA_DOM_LOCATION)/include&quot;"
AdditionalIncludeDirectories="&quot;$(JDK_HOME)\include&quot;;&quot;$(JDK_HOME)\include\win32&quot;;../../include;&quot;../../external-libs/collada_dom/include/1.4&quot;;&quot;../../external-libs/collada_dom/include&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBLOADER_EXPORTS;_CRT_SECURE_NO_DEPRECATE;REFINERY;DOM_DYNAMIC"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="0"
/>
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="0"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="libcollada141dom12.lib libloader.lib"
OutputFile="../../conditioners/$(ProjectName).dll"
LinkIncremental="2"
AdditionalLibraryDirectories="$(COLLADA_DOM_LOCATION)/lib;../../lib"
OutputFile="$(OutDir)/$(ProjectName).dll"
LinkIncremental="1"
AdditionalLibraryDirectories="../../external-libs/collada_dom/lib;../../lib/vc7/$(ConfigurationName)"
IgnoreDefaultLibraryNames=" "
GenerateDebugInformation="false"
ProgramDatabaseFile="$(IntDir)/$(ProjectName).pdb"
GenerateDebugInformation="FALSE"
ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
SubSystem="2"
OptimizeReferences="0"
EnableCOMDATFolding="0"
ImportLibrary="../../lib/$(TargetName).lib"
TargetMachine="1"
/>
ImportLibrary="../../lib/vc7/$(ConfigurationName)/$(TargetName).lib"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
>
Name="Source Files">
<File
RelativePath="..\..\src\conditioners\bindmaterialfixer_core.cpp"
>
RelativePath="..\..\src\conditioners\bindmaterialfixer_core.cpp">
</File>
<File
RelativePath="..\..\src\libloader\conditionerBase.cpp"
>
RelativePath="..\..\src\libloader\conditionerBase.cpp">
</File>
</Filter>
<Filter
Name="Header Files"
>
Name="Header Files">
<File
RelativePath="..\..\include\bindmaterialfixer.h"
>
RelativePath="..\..\include\bindmaterialfixer.h">
</File>
<File
RelativePath="..\..\include\conditionerBase.h"
>
RelativePath="..\..\include\conditionerBase.h">
</File>
</Filter>
</Files>
Expand Down

0 comments on commit 8086e38

Please sign in to comment.