Changeset 2516
- Timestamp:
- Dec 21, 2008, 6:57:40 PM (16 years ago)
- Location:
- code/branches/buildsystem2
- Files:
-
- 5 added
- 1 deleted
- 9 edited
-
bin/msvc/orxonox_vc8 (added)
-
bin/msvc/orxonox_vc8/debug (added)
-
bin/msvc/orxonox_vc8/debug/orxonox.ini (added)
-
bin/msvc/orxonox_vc8/release (added)
-
bin/msvc/orxonox_vc8/release/orxonox.ini (added)
-
init (deleted)
-
visual_studio/vc8/base.vsprops (modified) (3 diffs)
-
visual_studio/vc8/core.vcproj (modified) (2 diffs)
-
visual_studio/vc8/core.vsprops (modified) (1 diff)
-
visual_studio/vc8/network.vsprops (modified) (1 diff)
-
visual_studio/vc8/ois.vsprops (modified) (1 diff)
-
visual_studio/vc8/orxonox.vcproj (modified) (6 diffs)
-
visual_studio/vc8/orxonox.vcproj.user (modified) (2 diffs)
-
visual_studio/vc8/orxonox.vsprops (modified) (1 diff)
-
visual_studio/vc8/orxonox_vc8.sln (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
code/branches/buildsystem2/visual_studio/vc8/base.vsprops
r2510 r2516 8 8 <Tool 9 9 Name="VCCLCompilerTool" 10 AdditionalIncludeDirectories=""$(RootDir)src";"$(RootDir)src\tolua";"$(RootDir)src\o rxonox";"$(RootDir)src\ceguilua-0.6.1\ceguilua";"$(LibDir)ogre-1.4.9\include";"$(LibDir)boost-1.35.0\include";"$(LibDir)cegui-0.6.1\include";"$(LibDir)enet-1.2\include";"$(LibDir)libogg-1.1.3\include";"$(LibDir)libvorbis-1.2.0\include";"$(LibDir)openal-1.1\include";"$(LibDir)freealut-1.1.0\include";"$(LibDir)tcl-8.5.2\include";"$(LibDir)zlib-1.2.3\include";"$(LibDir)lua-5.1.3\include""10 AdditionalIncludeDirectories=""$(RootDir)src";"$(RootDir)src\tolua";"$(RootDir)src\ois";"$(RootDir)src\orxonox";"$(RootDir)src\ceguilua-0.6.1\ceguilua";"$(LibDir)ogre-1.4.9\include";"$(LibDir)boost-1.35.0\include";"$(LibDir)cegui-0.6.1\include";"$(LibDir)enet-1.2\include";"$(LibDir)libogg-1.1.3\include";"$(LibDir)libvorbis-1.2.0\include";"$(LibDir)openal-1.1\include";"$(LibDir)freealut-1.1.0\include";"$(LibDir)tcl-8.5.2\include";"$(LibDir)zlib-1.2.3\include";"$(LibDir)lua-5.1.3\include"" 11 11 PreprocessorDefinitions="WIN32;__WIN32__;_WIN32;_WINDOWS;BOOST_ALL_DYN_LINK;OIS_DYNAMIC_LIB;ZLIB_WINAPI;LUA_BUILD_AS_DLL;TIXML_USE_TICPP;_CRT_SECURE_NO_WARNINGS" 12 12 WarningLevel="3" … … 16 16 Name="VCLibrarianTool" 17 17 OutputFile="$(IntDir)$(ProjectName)$(CS).lib" 18 AdditionalLibraryDirectories="$(LibDir)"19 18 /> 20 19 <Tool … … 26 25 TargetMachine="1" 27 26 /> 28 <UserMacro29 Name="LibOutDir"30 Value="$(RootDir)build\"31 />32 <UserMacro33 Name="CS"34 Value=""35 />36 27 </VisualStudioPropertySheet> -
code/branches/buildsystem2/visual_studio/vc8/core.vcproj
r2509 r2516 161 161 Name="VCCustomBuildTool" 162 162 Description="Generating tolua bind files..." 163 CommandLine="path $(LibDir)\..\..\bin\$(SolutionName)\$(ConfigurationName); %path%
cd $(RootDir)\bin
echo $cfile "CommandExecutor.h" > $(RootDir)\src\core\tolua.pkg
echo $cfile " Script.h" >> $(RootDir)\src\core\tolua.pkg
$(OutDir)\toluaexe$(CS).exe -n Core -w $(RootDir)\src\core\ -s $(RootDir)\src\tolua\all.lua -o ToluaBindCore.cc -H ToluaBindCore.h tolua.pkg
"164 AdditionalDependencies="$(RootDir)\src\core\ Script.h;$(RootDir)\src\core\CommandExecutor.h"163 CommandLine="path $(LibDir)\..\..\bin\$(SolutionName)\$(ConfigurationName); %path%
cd $(RootDir)\bin
echo $cfile "CommandExecutor.h" > $(RootDir)\src\core\tolua.pkg
echo $cfile "LuaBind.h" >> $(RootDir)\src\core\tolua.pkg
$(OutDir)\toluaexe$(CS).exe -n Core -w $(RootDir)\src\core\ -s $(RootDir)\src\tolua\all-5.1.lua -o ToluaBindCore.cc -H ToluaBindCore.h tolua.pkg
" 164 AdditionalDependencies="$(RootDir)\src\core\LuaBind.h;$(RootDir)\src\core\CommandExecutor.h" 165 165 Outputs="$(RootDir)\src\core\ToluaBindCore.cc; $(RootDir)\src\core\ToluaBindCore.h" 166 166 /> … … 172 172 Name="VCCustomBuildTool" 173 173 Description="Generating tolua bind files..." 174 CommandLine="path $(LibDir)\..\..\bin\$(SolutionName)\$(ConfigurationName); %path%
cd $(RootDir)\bin
echo $cfile "CommandExecutor.h" > $(RootDir)\src\core\tolua.pkg
echo $cfile " Script.h" >> $(RootDir)\src\core\tolua.pkg
$(OutDir)\toluaexe$(CS).exe -n Core -w $(RootDir)\src\core\ -s $(RootDir)\src\tolua\all.lua -o ToluaBindCore.cc -H ToluaBindCore.h tolua.pkg
"175 AdditionalDependencies="$(RootDir)\src\core\ Script.h;$(RootDir)\src\core\CommandExecutor.h"174 CommandLine="path $(LibDir)\..\..\bin\$(SolutionName)\$(ConfigurationName); %path%
cd $(RootDir)\bin
echo $cfile "CommandExecutor.h" > $(RootDir)\src\core\tolua.pkg
echo $cfile "LuaBind.h" >> $(RootDir)\src\core\tolua.pkg
$(OutDir)\toluaexe$(CS).exe -n Core -w $(RootDir)\src\core\ -s $(RootDir)\src\tolua\all-5.1.lua -o ToluaBindCore.cc -H ToluaBindCore.h tolua.pkg
" 175 AdditionalDependencies="$(RootDir)\src\core\LuaBind.h;$(RootDir)\src\core\CommandExecutor.h" 176 176 Outputs="$(RootDir)\src\core\ToluaBindCore.cc; $(RootDir)\src\core\ToluaBindCore.h" 177 177 /> -
code/branches/buildsystem2/visual_studio/vc8/core.vsprops
r2510 r2516 9 9 Name="VCCLCompilerTool" 10 10 AdditionalOptions="/MP2" 11 PreprocessorDefinitions="CORE_SHARED_BUILD ;LUA_BUILD_AS_DLL"11 PreprocessorDefinitions="CORE_SHARED_BUILD" 12 12 /> 13 13 <Tool -
code/branches/buildsystem2/visual_studio/vc8/network.vsprops
r2510 r2516 14 14 Name="VCLinkerTool" 15 15 AdditionalDependencies="enet$(CS).lib zlib$(CS).lib" 16 IgnoreDefaultLibraryNames=" LIBCMT;LIBCMTD"16 IgnoreDefaultLibraryNames="" 17 17 /> 18 18 </VisualStudioPropertySheet> -
code/branches/buildsystem2/visual_studio/vc8/ois.vsprops
r2087 r2516 9 9 Name="VCCLCompilerTool" 10 10 AdditionalOptions="/MP2" 11 AdditionalIncludeDirectories="$(RootDir)src\ois"12 11 PreprocessorDefinitions="OIS_NONCLIENT_BUILD;OIS_DYNAMIC_LIB" 13 12 /> -
code/branches/buildsystem2/visual_studio/vc8/orxonox.vcproj
r2509 r2516 76 76 <Tool 77 77 Name="VCPostBuildEventTool" 78 Description="Copying files from init folder..."79 CommandLine="for %%a in ($(RootDir)\bin\msvc\$( ConfigurationName)\*) do replace %%a $(OutDir). /A >nul
rem for %%a in ($(RootDir)\init\common\*) do replace %%a $(OutDir). /A >nul
"78 Description="Copying default configuration files..." 79 CommandLine="for %%a in ($(RootDir)\bin\msvc\$(SolutionName)\$(ConfigurationName)\*) do replace %%a $(OutDir). /A >nul
for %%a in ($(RootDir)\bin\*) do replace %%a $(OutDir). /A >nul
" 80 80 /> 81 81 </Configuration> … … 141 141 <Tool 142 142 Name="VCPostBuildEventTool" 143 Description="Copying files from init folder..."144 CommandLine="for %%a in ($(RootDir)\bin\msvc\$( ConfigurationName)\*) do replace %%a $(OutDir). /A >nul
rem for %%a in ($(RootDir)\init\common\*) do replace %%a $(OutDir). /A >nul
"143 Description="Copying default configuration files..." 144 CommandLine="for %%a in ($(RootDir)\bin\msvc\$(SolutionName)\$(ConfigurationName)\*) do replace %%a $(OutDir). /A >nul
for %%a in ($(RootDir)\bin\*) do replace %%a $(OutDir). /A >nul
" 145 145 /> 146 146 </Configuration> … … 167 167 Name="VCCustomBuildTool" 168 168 Description="Generating tolua bind files..." 169 CommandLine="path $(LibDir)\..\..\bin\$(SolutionName)\$(ConfigurationName); %path%
cd $(RootDir)\bin
echo $cfile "gui/GUIManager.h" > $(RootDir)\src\orxonox\tolua.pkg
"$(OutDir)\toluaexe$(CS).exe" -n Orxonox -w $(RootDir)\src\orxonox\ -s $(RootDir)\src\tolua\all .lua -o ToluaBindOrxonox.cc -H ToluaBindOrxonox.h tolua.pkg
"169 CommandLine="path $(LibDir)\..\..\bin\$(SolutionName)\$(ConfigurationName); %path%
cd $(RootDir)\bin
echo $cfile "gui/GUIManager.h" > $(RootDir)\src\orxonox\tolua.pkg
"$(OutDir)\toluaexe$(CS).exe" -n Orxonox -w $(RootDir)\src\orxonox\ -s $(RootDir)\src\tolua\all-5.1.lua -o ToluaBindOrxonox.cc -H ToluaBindOrxonox.h tolua.pkg
" 170 170 AdditionalDependencies="$(RootDir)\src\orxonox\gui\GUIManager.h" 171 171 Outputs="$(RootDir)\src\orxonox\ToluaBindOrxonox.cc; $(RootDir)\src\orxonox\ToluaBindOrxonox.h" … … 178 178 Name="VCCustomBuildTool" 179 179 Description="Generating tolua bind files..." 180 CommandLine="path $(LibDir)\..\..\bin\$(SolutionName)\$(ConfigurationName); %path%
cd $(RootDir)\bin
echo $cfile "gui/GUIManager.h" > $(RootDir)\src\orxonox\tolua.pkg
"$(OutDir)\toluaexe$(CS).exe" -n Orxonox -w $(RootDir)\src\orxonox\ -s $(RootDir)\src\tolua\all .lua -o ToluaBindOrxonox.cc -H ToluaBindOrxonox.h tolua.pkg
"180 CommandLine="path $(LibDir)\..\..\bin\$(SolutionName)\$(ConfigurationName); %path%
cd $(RootDir)\bin
echo $cfile "gui/GUIManager.h" > $(RootDir)\src\orxonox\tolua.pkg
"$(OutDir)\toluaexe$(CS).exe" -n Orxonox -w $(RootDir)\src\orxonox\ -s $(RootDir)\src\tolua\all-5.1.lua -o ToluaBindOrxonox.cc -H ToluaBindOrxonox.h tolua.pkg
" 181 181 AdditionalDependencies="$(RootDir)\src\orxonox\gui\GUIManager.h" 182 182 Outputs="$(RootDir)\src\orxonox\ToluaBindOrxonox.cc; $(RootDir)\src\orxonox\ToluaBindOrxonox.h" … … 391 391 <File 392 392 RelativePath="..\..\src\orxonox\objects\worldentities\triggers\EventTrigger.cc" 393 > 394 </File> 395 <File 396 RelativePath="..\..\src\orxonox\objects\worldentities\triggers\PlayerTrigger.cc" 393 397 > 394 398 </File> … … 980 984 </File> 981 985 <File 986 RelativePath="..\..\src\orxonox\objects\worldentities\triggers\PlayerTrigger.h" 987 > 988 </File> 989 <File 982 990 RelativePath="..\..\src\orxonox\objects\worldentities\triggers\Trigger.h" 983 991 > -
code/branches/buildsystem2/visual_studio/vc8/orxonox.vcproj.user
r2087 r2516 10 10 > 11 11 <DebugSettings 12 Command="$(TargetPath)"13 12 WorkingDirectory="$(OutDir)" 14 CommandArguments=""15 Attach="false"16 DebuggerType="3"17 Remote="1"18 RemoteCommand=""19 HttpUrl=""20 PDBPath=""21 SQLDebugging=""22 Environment=""23 EnvironmentMerge="true"24 DebuggerFlavor="0"25 MPIRunCommand=""26 MPIRunArguments=""27 MPIRunWorkingDirectory=""28 ApplicationCommand=""29 ApplicationArguments=""30 ShimCommand=""31 MPIAcceptMode=""32 MPIAcceptFilter=""33 13 /> 34 14 </Configuration> … … 37 17 > 38 18 <DebugSettings 39 Command="$(TargetPath)"40 19 WorkingDirectory="$(OutDir)" 41 CommandArguments=""42 Attach="false"43 DebuggerType="3"44 Remote="1"45 RemoteCommand=""46 HttpUrl=""47 PDBPath=""48 SQLDebugging=""49 Environment=""50 EnvironmentMerge="true"51 DebuggerFlavor="0"52 MPIRunCommand=""53 MPIRunArguments=""54 MPIRunWorkingDirectory=""55 ApplicationCommand=""56 ApplicationArguments=""57 ShimCommand=""58 MPIAcceptMode=""59 MPIAcceptFilter=""60 20 /> 61 21 </Configuration> -
code/branches/buildsystem2/visual_studio/vc8/orxonox.vsprops
r2510 r2516 19 19 IgnoreDefaultLibraryNames="" 20 20 /> 21 <Tool22 Name="VCPostBuildEventTool"23 Description="Copying files from init folder..."24 CommandLine="for %%a in ($(RootDir)\init\$(SolutionName)\$(ConfigurationName)\*) do replace %%a $(OutDir). /A >nul
for %%a in ($(RootDir)\init\common\*) do replace %%a $(OutDir). /A >nul
"25 />26 21 </VisualStudioPropertySheet> -
code/branches/buildsystem2/visual_studio/vc8/orxonox_vc8.sln
r2510 r2516 17 17 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "core.vcproj", "{271715F3-5B90-4110-A552-70C788084A86}" 18 18 ProjectSection(ProjectDependencies) = postProject 19 {EA969DF2-70AF-46E6-BBE2-E03112E04CB8} = {EA969DF2-70AF-46E6-BBE2-E03112E04CB8} 20 {F101C2F0-1CB9-4A57-827B-6C399A99B28F} = {F101C2F0-1CB9-4A57-827B-6C399A99B28F} 21 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC} 22 {53C56131-E2AA-4A27-B460-7AC05D61A0E6} = {53C56131-E2AA-4A27-B460-7AC05D61A0E6} 23 {A0724246-CB7C-420B-BCF0-68EF205AFE34} = {A0724246-CB7C-420B-BCF0-68EF205AFE34} 19 24 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} 20 {A0724246-CB7C-420B-BCF0-68EF205AFE34} = {A0724246-CB7C-420B-BCF0-68EF205AFE34}21 {53C56131-E2AA-4A27-B460-7AC05D61A0E6} = {53C56131-E2AA-4A27-B460-7AC05D61A0E6}22 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}23 {F101C2F0-1CB9-4A57-827B-6C399A99B28F} = {F101C2F0-1CB9-4A57-827B-6C399A99B28F}24 {EA969DF2-70AF-46E6-BBE2-E03112E04CB8} = {EA969DF2-70AF-46E6-BBE2-E03112E04CB8}25 25 EndProjectSection 26 26 EndProject 27 27 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "audio", "audio.vcproj", "{4733BD1A-E04C-458D-8BFB-5010250EA497}" 28 28 ProjectSection(ProjectDependencies) = postProject 29 {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86} 29 30 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC} 30 {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86}31 31 EndProjectSection 32 32 EndProject … … 34 34 ProjectSection(ProjectDependencies) = postProject 35 35 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC} 36 {F101C2F0-1CB9-4A57-827B-6C399A99B28F} = {F101C2F0-1CB9-4A57-827B-6C399A99B28F} 36 37 {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86} 37 38 EndProjectSection … … 39 40 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "orxonox", "orxonox.vcproj", "{0B6C5CFD-F91B-432A-80A3-2610F61E060B}" 40 41 ProjectSection(ProjectDependencies) = postProject 42 {F101C2F0-1CB9-4A57-827B-6C399A99B28F} = {F101C2F0-1CB9-4A57-827B-6C399A99B28F} 43 {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86} 44 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC} 45 {4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F} = {4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F} 46 {35575B59-E1AE-40E8-89C4-2862B5B09B68} = {35575B59-E1AE-40E8-89C4-2862B5B09B68} 47 {4733BD1A-E04C-458D-8BFB-5010250EA497} = {4733BD1A-E04C-458D-8BFB-5010250EA497} 48 {A0724246-CB7C-420B-BCF0-68EF205AFE34} = {A0724246-CB7C-420B-BCF0-68EF205AFE34} 41 49 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} 42 {A0724246-CB7C-420B-BCF0-68EF205AFE34} = {A0724246-CB7C-420B-BCF0-68EF205AFE34}43 {4733BD1A-E04C-458D-8BFB-5010250EA497} = {4733BD1A-E04C-458D-8BFB-5010250EA497}44 {35575B59-E1AE-40E8-89C4-2862B5B09B68} = {35575B59-E1AE-40E8-89C4-2862B5B09B68}45 {4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F} = {4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F}46 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}47 {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86}48 {F101C2F0-1CB9-4A57-827B-6C399A99B28F} = {F101C2F0-1CB9-4A57-827B-6C399A99B28F}49 50 EndProjectSection 50 51 EndProject
Note: See TracChangeset
for help on using the changeset viewer.
