Changeset 2509 for code/branches/buildsystem2/visual_studio
- Timestamp:
- Dec 17, 2008, 8:59:48 PM (16 years ago)
- Location:
- code/branches/buildsystem2
- Files:
-
- 2 added
- 10 deleted
- 18 edited
-
. (modified) (2 props)
-
visual_studio/vc8/audio.vsprops (modified) (1 prop)
-
visual_studio/vc8/base.vsprops (modified) (2 diffs, 1 prop)
-
visual_studio/vc8/ceguilua.vsprops (modified) (1 diff, 1 prop)
-
visual_studio/vc8/core.vcproj (modified) (4 diffs)
-
visual_studio/vc8/core.vsprops (modified) (1 diff, 1 prop)
-
visual_studio/vc8/cpptcl.vsprops (modified) (1 prop)
-
visual_studio/vc8/debug.vsprops (modified) (1 prop)
-
visual_studio/vc8/directories.vsprops (modified) (1 prop)
-
visual_studio/vc8/lua.vcproj (deleted)
-
visual_studio/vc8/lua.vsprops (deleted)
-
visual_studio/vc8/lua_static.vcproj (deleted)
-
visual_studio/vc8/lua_static.vsprops (deleted)
-
visual_studio/vc8/network.vsprops (modified) (1 prop)
-
visual_studio/vc8/orxonox.vcproj (modified) (7 diffs)
-
visual_studio/vc8/orxonox.vsprops (modified) (1 diff, 1 prop)
-
visual_studio/vc8/orxonox_vc8.sln (modified) (5 diffs, 1 prop)
-
visual_studio/vc8/release.vsprops (modified) (1 prop)
-
visual_studio/vc8/tinyxml.vcproj (modified) (1 prop)
-
visual_studio/vc8/tinyxml.vsprops (modified) (1 prop)
-
visual_studio/vc8/tolua.vsprops (modified) (1 diff, 1 prop)
-
visual_studio/vc8/tolua_static.vcproj (deleted)
-
visual_studio/vc8/tolua_static.vsprops (deleted)
-
visual_studio/vc8/toluaexe.vcproj (added)
-
visual_studio/vc8/toluaexe.vsprops (added)
-
visual_studio/vc8/toluagen.vcproj (deleted)
-
visual_studio/vc8/toluagen.vsprops (deleted)
-
visual_studio/vc8/toluagen_orxonox.vcproj (deleted)
-
visual_studio/vc8/toluagen_orxonox.vsprops (deleted)
-
visual_studio/vc8/util.vsprops (modified) (1 prop)
Legend:
- Unmodified
- Added
- Removed
-
code/branches/buildsystem2
- Property svn:ignore deleted
- Property svn:mergeinfo changed
/code/branches/buildsystem (added) merged: 1875,1882-1886,1975-1982,1991,1999,2054,2061,2135,2137-2139,2197-2199,2204,2214-2220,2223-2224,2229,2233-2244,2248-2249,2252-2253,2260,2275
-
code/branches/buildsystem2/visual_studio/vc8/audio.vsprops
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/buildsystem2/visual_studio/vc8/base.vsprops
- Property svn:mergeinfo changed
/code/branches/buildsystem/visual_studio/vc8/base.vsprops (added) merged: 2217,2220
r2261 r2509 8 8 <Tool 9 9 Name="VCCLCompilerTool" 10 AdditionalIncludeDirectories=""$(RootDir) ";"$(RootDir)src";"$(RootDir)src\orxonox";"$(RootDir)src\ceguilua-0.6.1";"$(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""11 PreprocessorDefinitions="WIN32;__WIN32__;_WIN32;_WINDOWS;BOOST_ALL_DYN_LINK;OIS_DYNAMIC_LIB;ZLIB_WINAPI "10 AdditionalIncludeDirectories=""$(RootDir)src";"$(RootDir)src\tolua";"$(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 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" 13 13 DisableSpecificWarnings="4522;4251;4800" … … 21 21 Name="VCLinkerTool" 22 22 OutputFile="$(OutDir)$(ProjectName)$(CS).dll" 23 AdditionalLibraryDirectories=""$(LibDir)boost-1.35.0\lib\$(ConfigurationName)";"$(LibDir)cegui-0.6.1\lib\$(ConfigurationName)";"$(LibDir)enet-1.2\lib\$(ConfigurationName)";"$(LibDir)freealut-1.1.0\lib\$(ConfigurationName)";"$(LibDir)libogg-1.1.3\lib\$(ConfigurationName)";"$(LibDir)libvorbis-1.2.0\lib\$(ConfigurationName)";"$(LibDir)ogre-1.4.9\lib\$(ConfigurationName)";"$(LibDir)openal-1.1\lib\$(ConfigurationName)";"$(LibDir)tcl-8.5.2\lib\$(ConfigurationName)";"$(LibDir)zlib-1.2.3\lib\$(ConfigurationName)" "23 AdditionalLibraryDirectories=""$(LibDir)boost-1.35.0\lib\$(ConfigurationName)";"$(LibDir)cegui-0.6.1\lib\$(ConfigurationName)";"$(LibDir)enet-1.2\lib\$(ConfigurationName)";"$(LibDir)freealut-1.1.0\lib\$(ConfigurationName)";"$(LibDir)libogg-1.1.3\lib\$(ConfigurationName)";"$(LibDir)libvorbis-1.2.0\lib\$(ConfigurationName)";"$(LibDir)ogre-1.4.9\lib\$(ConfigurationName)";"$(LibDir)openal-1.1\lib\$(ConfigurationName)";"$(LibDir)tcl-8.5.2\lib\$(ConfigurationName)";"$(LibDir)zlib-1.2.3\lib\$(ConfigurationName)";"$(LibDir)lua-5.1.3\lib\$(ConfigurationName)"" 24 24 SubSystem="1" 25 25 ImportLibrary="$(IntDir)\$(TargetName).lib" 26 26 TargetMachine="1" 27 /> 28 <UserMacro 29 Name="LibOutDir" 30 Value="$(RootDir)build\" 27 31 /> 28 32 <UserMacro - Property svn:mergeinfo changed
-
code/branches/buildsystem2/visual_studio/vc8/ceguilua.vsprops
- Property svn:mergeinfo changed
/code/branches/buildsystem/visual_studio/vc8/ceguilua.vsprops (added) merged: 2217
r2261 r2509 13 13 <Tool 14 14 Name="VCLinkerTool" 15 AdditionalDependencies="CEGUIBase$(CS).lib "15 AdditionalDependencies="CEGUIBase$(CS).lib lua$(CS).lib" 16 16 /> 17 17 </VisualStudioPropertySheet> - Property svn:mergeinfo changed
-
code/branches/buildsystem2/visual_studio/vc8/core.vcproj
r2087 r2509 153 153 </File> 154 154 <File 155 RelativePath="..\..\src\core\CMakeLists.txt" 156 > 157 <FileConfiguration 158 Name="Debug|Win32" 159 > 160 <Tool 161 Name="VCCustomBuildTool" 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" 165 Outputs="$(RootDir)\src\core\ToluaBindCore.cc; $(RootDir)\src\core\ToluaBindCore.h" 166 /> 167 </FileConfiguration> 168 <FileConfiguration 169 Name="Release|Win32" 170 > 171 <Tool 172 Name="VCCustomBuildTool" 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" 176 Outputs="$(RootDir)\src\core\ToluaBindCore.cc; $(RootDir)\src\core\ToluaBindCore.h" 177 /> 178 </FileConfiguration> 179 </File> 180 <File 155 181 RelativePath="..\..\src\core\ConfigFileManager.cc" 156 182 > … … 196 222 > 197 223 </File> 198 <Filter 199 Name="tolua" 200 > 201 <File 202 RelativePath="..\..\src\core\tolua\tolua.pkg" 203 > 204 <FileConfiguration 205 Name="Debug|Win32" 206 > 207 <Tool 208 Name="VCCustomBuildTool" 209 Description="Generating tolua bind files..." 210 CommandLine=""$(RootDir)\build\$(SolutionName)\$(ConfigurationName)\toluagen_orxonox\toluagen_orxonox$(CS).exe" -n Core -o $(RootDir)/src/core/tolua/tolua_bind.cc -H $(RootDir)/src/core/tolua/tolua_bind.h $(RootDir)/src/core/tolua/tolua.pkg
" 211 AdditionalDependencies="$(RootDir)\src\core\Script.h;$(RootDir)\src\core\CommandExecutor.h" 212 Outputs="$(RootDir)\src\core\tolua\tolua_bind.cc; $(RootDir)\src\core\tolua\tolua_bind.h" 213 /> 214 </FileConfiguration> 215 <FileConfiguration 216 Name="Release|Win32" 217 > 218 <Tool 219 Name="VCCustomBuildTool" 220 Description="Generating tolua bind files..." 221 CommandLine=""$(RootDir)\build\$(SolutionName)\$(ConfigurationName)\toluagen_orxonox\toluagen_orxonox$(CS).exe" -n Core -o $(RootDir)/src/core/tolua/tolua_bind.cc -H $(RootDir)/src/core/tolua/tolua_bind.h $(RootDir)/src/core/tolua/tolua.pkg
" 222 AdditionalDependencies="$(RootDir)\src\core\Script.h;$(RootDir)\src\core\CommandExecutor.h" 223 Outputs="$(RootDir)\src\core\tolua\tolua_bind.cc; $(RootDir)\src\core\tolua\tolua_bind.h" 224 /> 225 </FileConfiguration> 226 </File> 227 <File 228 RelativePath="..\..\src\core\tolua\tolua_bind.cc" 229 > 230 </File> 231 </Filter> 224 <File 225 RelativePath="..\..\src\core\ToluaBindCore.cc" 226 > 227 </File> 232 228 <Filter 233 229 Name="command" … … 445 441 </File> 446 442 <File 443 RelativePath="..\..\src\core\tolua_bind.h" 444 > 445 </File> 446 <File 447 RelativePath="..\..\src\core\ToluaBindCore.h" 448 > 449 </File> 450 <File 447 451 RelativePath="..\..\src\core\XMLIncludes.h" 448 452 > … … 641 645 <File 642 646 RelativePath="..\..\src\core\XMLPort.h" 643 >644 </File>645 </Filter>646 <Filter647 Name="tolua"648 >649 <File650 RelativePath="..\..\src\core\tolua\tolua_bind.h"651 647 > 652 648 </File> -
code/branches/buildsystem2/visual_studio/vc8/core.vsprops
- Property svn:mergeinfo changed
/code/branches/buildsystem/visual_studio/vc8/core.vsprops (added) merged: 2217
r2261 r2509 13 13 <Tool 14 14 Name="VCLinkerTool" 15 AdditionalDependencies="OgreMain$(CS).lib tcl85t.lib "15 AdditionalDependencies="OgreMain$(CS).lib tcl85t.lib lua$(CS).lib" 16 16 /> 17 17 </VisualStudioPropertySheet> - Property svn:mergeinfo changed
-
code/branches/buildsystem2/visual_studio/vc8/cpptcl.vsprops
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/buildsystem2/visual_studio/vc8/debug.vsprops
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/buildsystem2/visual_studio/vc8/directories.vsprops
- Property svn:mergeinfo changed
/code/branches/buildsystem/visual_studio/vc8/directories.vsprops (added) merged: 2217
- Property svn:mergeinfo changed
-
code/branches/buildsystem2/visual_studio/vc8/network.vsprops
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/buildsystem2/visual_studio/vc8/orxonox.vcproj
r2171 r2509 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 80 /> 79 81 </Configuration> … … 139 141 <Tool 140 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
" 141 145 /> 142 146 </Configuration> … … 155 159 </File> 156 160 <File 161 RelativePath="..\..\src\orxonox\CMakeLists.txt" 162 > 163 <FileConfiguration 164 Name="Debug|Win32" 165 > 166 <Tool 167 Name="VCCustomBuildTool" 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
" 170 AdditionalDependencies="$(RootDir)\src\orxonox\gui\GUIManager.h" 171 Outputs="$(RootDir)\src\orxonox\ToluaBindOrxonox.cc; $(RootDir)\src\orxonox\ToluaBindOrxonox.h" 172 /> 173 </FileConfiguration> 174 <FileConfiguration 175 Name="Release|Win32" 176 > 177 <Tool 178 Name="VCCustomBuildTool" 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
" 181 AdditionalDependencies="$(RootDir)\src\orxonox\gui\GUIManager.h" 182 Outputs="$(RootDir)\src\orxonox\ToluaBindOrxonox.cc; $(RootDir)\src\orxonox\ToluaBindOrxonox.h" 183 /> 184 </FileConfiguration> 185 </File> 186 <File 157 187 RelativePath="..\..\src\orxonox\GraphicsEngine.cc" 158 188 > … … 193 223 RelativePath="..\..\src\orxonox\Settings.cc" 194 224 > 225 </File> 226 <File 227 RelativePath="..\..\src\orxonox\ToluaBindOrxonox.cc" 228 > 229 <FileConfiguration 230 Name="Debug|Win32" 231 > 232 <Tool 233 Name="VCCLCompilerTool" 234 UsePrecompiledHeader="0" 235 /> 236 </FileConfiguration> 237 <FileConfiguration 238 Name="Release|Win32" 239 > 240 <Tool 241 Name="VCCLCompilerTool" 242 UsePrecompiledHeader="0" 243 /> 244 </FileConfiguration> 195 245 </File> 196 246 <Filter … … 635 685 </Filter> 636 686 <Filter 637 Name="tolua"638 >639 <File640 RelativePath="..\..\src\orxonox\tolua\tolua.pkg"641 >642 <FileConfiguration643 Name="Debug|Win32"644 >645 <Tool646 Name="VCCustomBuildTool"647 Description="Generating tolua bind files..."648 CommandLine=""$(RootDir)\build\$(SolutionName)\$(ConfigurationName)\toluagen_orxonox\toluagen_orxonox$(CS).exe" -n Orxonox -o $(RootDir)/src/orxonox/tolua/tolua_bind.cc -H $(RootDir)/src/orxonox/tolua/tolua_bind.h $(RootDir)/src/orxonox/tolua/tolua.pkg
"649 AdditionalDependencies="$(RootDir)\src\orxonox\gui\GUIManager.h"650 Outputs="$(RootDir)\src\orxonox\tolua\tolua_bind.cc; $(RootDir)\src\orxonox\tolua\tolua_bind.h"651 />652 </FileConfiguration>653 <FileConfiguration654 Name="Release|Win32"655 >656 <Tool657 Name="VCCustomBuildTool"658 Description="Generating tolua bind files..."659 CommandLine=""$(RootDir)\build\$(SolutionName)\$(ConfigurationName)\toluagen_orxonox\toluagen_orxonox$(CS).exe" -n Orxonox -o $(RootDir)/src/orxonox/tolua/tolua_bind.cc -H $(RootDir)/src/orxonox/tolua/tolua_bind.h $(RootDir)/src/orxonox/tolua/tolua.pkg
"660 AdditionalDependencies="$(RootDir)\src\orxonox\gui\GUIManager.h"661 Outputs="$(RootDir)\src\orxonox\tolua\tolua_bind.cc; $(RootDir)\src\orxonox\tolua\tolua_bind.h"662 />663 </FileConfiguration>664 </File>665 <File666 RelativePath="..\..\src\orxonox\tolua\tolua_bind.cc"667 >668 <FileConfiguration669 Name="Debug|Win32"670 >671 <Tool672 Name="VCCLCompilerTool"673 UsePrecompiledHeader="0"674 />675 </FileConfiguration>676 <FileConfiguration677 Name="Release|Win32"678 >679 <Tool680 Name="VCCLCompilerTool"681 UsePrecompiledHeader="0"682 />683 </FileConfiguration>684 </File>685 </Filter>686 <Filter687 687 Name="overlays" 688 688 > … … 838 838 > 839 839 </File> 840 <File 841 RelativePath="..\..\src\orxonox\tolua_bind.h" 842 > 843 </File> 844 <File 845 RelativePath="..\..\src\orxonox\ToluaBindOrxonox.h" 846 > 847 </File> 840 848 <Filter 841 849 Name="objects" … … 1159 1167 <File 1160 1168 RelativePath="..\..\src\orxonox\tools\WindowEventListener.h" 1161 >1162 </File>1163 </Filter>1164 <Filter1165 Name="tolua"1166 >1167 <File1168 RelativePath="..\..\src\orxonox\tolua\tolua_bind.h"1169 1169 > 1170 1170 </File> -
code/branches/buildsystem2/visual_studio/vc8/orxonox.vsprops
- Property svn:mergeinfo changed
/code/branches/buildsystem/visual_studio/vc8/orxonox.vsprops (added) merged: 2217
r2261 r2509 15 15 <Tool 16 16 Name="VCLinkerTool" 17 AdditionalDependencies="OgreMain$(CS).lib tcl85t.lib enet$(CS).lib zlib$(CS).lib CEGUIBase$(CS).lib "17 AdditionalDependencies="OgreMain$(CS).lib tcl85t.lib enet$(CS).lib zlib$(CS).lib CEGUIBase$(CS).lib lua$(CS).lib" 18 18 OutputFile="$(OutDir)$(ProjectName)$(CS).exe" 19 19 IgnoreDefaultLibraryNames="" - Property svn:mergeinfo changed
-
code/branches/buildsystem2/visual_studio/vc8/orxonox_vc8.sln
- Property svn:mergeinfo changed
/code/branches/buildsystem/visual_studio/vc8/orxonox_vc8.sln (added) merged: 2217
r2261 r2509 2 2 Microsoft Visual Studio Solution File, Format Version 9.00 3 3 # Visual Studio 2005 4 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "orxonox", "orxonox.vcproj", "{0B6C5CFD-F91B-432A-80A3-2610F61E060B}"5 ProjectSection(WebsiteProperties) = preProject6 Debug.AspNetCompiler.Debug = "True"7 Release.AspNetCompiler.Debug = "False"8 EndProjectSection9 ProjectSection(ProjectDependencies) = postProject10 {4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F} = {4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F}11 {F101C2F0-1CB9-4A57-827B-6C399A99B28F} = {F101C2F0-1CB9-4A57-827B-6C399A99B28F}12 {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86}13 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}14 {35575B59-E1AE-40E8-89C4-2862B5B09B68} = {35575B59-E1AE-40E8-89C4-2862B5B09B68}15 {4733BD1A-E04C-458D-8BFB-5010250EA497} = {4733BD1A-E04C-458D-8BFB-5010250EA497}16 {63B3E57A-4382-42F3-85EC-E869CFCCA88F} = {63B3E57A-4382-42F3-85EC-E869CFCCA88F}17 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}18 {71FC0211-5EB5-4637-BE8A-A48EC3CC27D0} = {71FC0211-5EB5-4637-BE8A-A48EC3CC27D0}19 EndProjectSection20 EndProject21 4 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpptcl", "cpptcl.vcproj", "{53C56131-E2AA-4A27-B460-7AC05D61A0E6}" 22 ProjectSection(WebsiteProperties) = preProject23 Debug.AspNetCompiler.Debug = "True"24 Release.AspNetCompiler.Debug = "False"25 EndProjectSection26 5 EndProject 27 6 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinyxml", "tinyxml.vcproj", "{F101C2F0-1CB9-4A57-827B-6C399A99B28F}" 28 ProjectSection(WebsiteProperties) = preProject29 Debug.AspNetCompiler.Debug = "True"30 Release.AspNetCompiler.Debug = "False"31 EndProjectSection32 7 EndProject 33 8 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tolua", "tolua.vcproj", "{35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}" 34 ProjectSection(WebsiteProperties) = preProject 35 Debug.AspNetCompiler.Debug = "True" 36 Release.AspNetCompiler.Debug = "False" 37 EndProjectSection 9 EndProject 10 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toluaexe", "toluaexe.vcproj", "{A0724246-CB7C-420B-BCF0-68EF205AFE34}" 38 11 ProjectSection(ProjectDependencies) = postProject 39 {63B3E57A-4382-42F3-85EC-E869CFCCA88F} = {63B3E57A-4382-42F3-85EC-E869CFCCA88F} 40 EndProjectSection 41 EndProject 42 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toluagen_orxonox", "toluagen_orxonox.vcproj", "{71FC0211-5EB5-4637-BE8A-A48EC3CC27D0}" 43 ProjectSection(WebsiteProperties) = preProject 44 Debug.AspNetCompiler.Debug = "True" 45 Release.AspNetCompiler.Debug = "False" 46 EndProjectSection 47 ProjectSection(ProjectDependencies) = postProject 48 {8F5B7ED0-D380-4B4F-A744-3A568718176C} = {8F5B7ED0-D380-4B4F-A744-3A568718176C} 49 {C6692661-9160-49E6-B109-A155F9485402} = {C6692661-9160-49E6-B109-A155F9485402} 50 {A0724246-CB7C-420B-BCF0-68EF205AFE34} = {A0724246-CB7C-420B-BCF0-68EF205AFE34} 51 EndProjectSection 52 EndProject 53 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toluagen", "toluagen.vcproj", "{A0724246-CB7C-420B-BCF0-68EF205AFE34}" 54 ProjectSection(WebsiteProperties) = preProject 55 Debug.AspNetCompiler.Debug = "True" 56 Release.AspNetCompiler.Debug = "False" 57 EndProjectSection 58 ProjectSection(ProjectDependencies) = postProject 59 {8F5B7ED0-D380-4B4F-A744-3A568718176C} = {8F5B7ED0-D380-4B4F-A744-3A568718176C} 60 {C6692661-9160-49E6-B109-A155F9485402} = {C6692661-9160-49E6-B109-A155F9485402} 12 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} 61 13 EndProjectSection 62 14 EndProject 63 15 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "util.vcproj", "{2240ECD7-2F48-4431-8E1B-25466A384CCC}" 64 ProjectSection(WebsiteProperties) = preProject65 Debug.AspNetCompiler.Debug = "True"66 Release.AspNetCompiler.Debug = "False"67 EndProjectSection68 16 EndProject 69 17 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "core.vcproj", "{271715F3-5B90-4110-A552-70C788084A86}" 70 ProjectSection(WebsiteProperties) = preProject71 Debug.AspNetCompiler.Debug = "True"72 Release.AspNetCompiler.Debug = "False"73 EndProjectSection74 18 ProjectSection(ProjectDependencies) = postProject 19 {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} 75 24 {EA969DF2-70AF-46E6-BBE2-E03112E04CB8} = {EA969DF2-70AF-46E6-BBE2-E03112E04CB8} 76 {F101C2F0-1CB9-4A57-827B-6C399A99B28F} = {F101C2F0-1CB9-4A57-827B-6C399A99B28F}77 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}78 {53C56131-E2AA-4A27-B460-7AC05D61A0E6} = {53C56131-E2AA-4A27-B460-7AC05D61A0E6}79 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}80 {63B3E57A-4382-42F3-85EC-E869CFCCA88F} = {63B3E57A-4382-42F3-85EC-E869CFCCA88F}81 {71FC0211-5EB5-4637-BE8A-A48EC3CC27D0} = {71FC0211-5EB5-4637-BE8A-A48EC3CC27D0}82 25 EndProjectSection 83 26 EndProject 84 27 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "audio", "audio.vcproj", "{4733BD1A-E04C-458D-8BFB-5010250EA497}" 85 ProjectSection(WebsiteProperties) = preProject86 Debug.AspNetCompiler.Debug = "True"87 Release.AspNetCompiler.Debug = "False"88 EndProjectSection89 28 ProjectSection(ProjectDependencies) = postProject 29 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC} 90 30 {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86} 91 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}92 31 EndProjectSection 93 32 EndProject 94 33 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "network", "network.vcproj", "{35575B59-E1AE-40E8-89C4-2862B5B09B68}" 95 ProjectSection(WebsiteProperties) = preProject96 Debug.AspNetCompiler.Debug = "True"97 Release.AspNetCompiler.Debug = "False"98 EndProjectSection99 34 ProjectSection(ProjectDependencies) = postProject 35 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC} 100 36 {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86} 101 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}102 37 EndProjectSection 103 38 EndProject 104 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua", "lua.vcproj", "{63B3E57A-4382-42F3-85EC-E869CFCCA88F}" 105 ProjectSection(WebsiteProperties) = preProject 106 Debug.AspNetCompiler.Debug = "True" 107 Release.AspNetCompiler.Debug = "False" 39 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "orxonox", "orxonox.vcproj", "{0B6C5CFD-F91B-432A-80A3-2610F61E060B}" 40 ProjectSection(ProjectDependencies) = postProject 41 {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} 108 49 EndProjectSection 109 50 EndProject 110 51 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ceguilua", "ceguilua.vcproj", "{4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F}" 111 ProjectSection(WebsiteProperties) = preProject112 Debug.AspNetCompiler.Debug = "True"113 Release.AspNetCompiler.Debug = "False"114 EndProjectSection115 52 ProjectSection(ProjectDependencies) = postProject 116 53 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} 117 {63B3E57A-4382-42F3-85EC-E869CFCCA88F} = {63B3E57A-4382-42F3-85EC-E869CFCCA88F}118 54 EndProjectSection 119 55 EndProject 120 56 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ois", "ois.vcproj", "{EA969DF2-70AF-46E6-BBE2-E03112E04CB8}" 121 ProjectSection(WebsiteProperties) = preProject122 Debug.AspNetCompiler.Debug = "True"123 Release.AspNetCompiler.Debug = "False"124 EndProjectSection125 57 EndProject 126 58 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "externals", "externals", "{B9D56701-B4DB-43F8-9920-241CA418C1CE}" 127 ProjectSection(WebsiteProperties) = preProject128 Debug.AspNetCompiler.Debug = "True"129 Release.AspNetCompiler.Debug = "False"130 EndProjectSection131 EndProject132 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tolua_static", "tolua_static.vcproj", "{C6692661-9160-49E6-B109-A155F9485402}"133 ProjectSection(WebsiteProperties) = preProject134 Debug.AspNetCompiler.Debug = "True"135 Release.AspNetCompiler.Debug = "False"136 EndProjectSection137 EndProject138 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua_static", "lua_static.vcproj", "{8F5B7ED0-D380-4B4F-A744-3A568718176C}"139 ProjectSection(WebsiteProperties) = preProject140 Debug.AspNetCompiler.Debug = "True"141 Release.AspNetCompiler.Debug = "False"142 EndProjectSection143 59 EndProject 144 60 Global … … 160 76 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}.Release|Win32.ActiveCfg = Release|Win32 161 77 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}.Release|Win32.Build.0 = Release|Win32 162 {71FC0211-5EB5-4637-BE8A-A48EC3CC27D0}.Debug|Win32.ActiveCfg = Debug|Win32163 {71FC0211-5EB5-4637-BE8A-A48EC3CC27D0}.Debug|Win32.Build.0 = Debug|Win32164 {71FC0211-5EB5-4637-BE8A-A48EC3CC27D0}.Release|Win32.ActiveCfg = Release|Win32165 {71FC0211-5EB5-4637-BE8A-A48EC3CC27D0}.Release|Win32.Build.0 = Release|Win32166 78 {A0724246-CB7C-420B-BCF0-68EF205AFE34}.Debug|Win32.ActiveCfg = Debug|Win32 167 79 {A0724246-CB7C-420B-BCF0-68EF205AFE34}.Debug|Win32.Build.0 = Debug|Win32 … … 188 100 {0B6C5CFD-F91B-432A-80A3-2610F61E060B}.Release|Win32.ActiveCfg = Release|Win32 189 101 {0B6C5CFD-F91B-432A-80A3-2610F61E060B}.Release|Win32.Build.0 = Release|Win32 190 {63B3E57A-4382-42F3-85EC-E869CFCCA88F}.Debug|Win32.ActiveCfg = Debug|Win32191 {63B3E57A-4382-42F3-85EC-E869CFCCA88F}.Debug|Win32.Build.0 = Debug|Win32192 {63B3E57A-4382-42F3-85EC-E869CFCCA88F}.Release|Win32.ActiveCfg = Release|Win32193 {63B3E57A-4382-42F3-85EC-E869CFCCA88F}.Release|Win32.Build.0 = Release|Win32194 102 {4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F}.Debug|Win32.ActiveCfg = Debug|Win32 195 103 {4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F}.Debug|Win32.Build.0 = Debug|Win32 … … 200 108 {EA969DF2-70AF-46E6-BBE2-E03112E04CB8}.Release|Win32.ActiveCfg = Release|Win32 201 109 {EA969DF2-70AF-46E6-BBE2-E03112E04CB8}.Release|Win32.Build.0 = Release|Win32 202 {C6692661-9160-49E6-B109-A155F9485402}.Debug|Win32.ActiveCfg = Debug|Win32203 {C6692661-9160-49E6-B109-A155F9485402}.Debug|Win32.Build.0 = Debug|Win32204 {C6692661-9160-49E6-B109-A155F9485402}.Release|Win32.ActiveCfg = Release|Win32205 {C6692661-9160-49E6-B109-A155F9485402}.Release|Win32.Build.0 = Release|Win32206 {8F5B7ED0-D380-4B4F-A744-3A568718176C}.Debug|Win32.ActiveCfg = Debug|Win32207 {8F5B7ED0-D380-4B4F-A744-3A568718176C}.Debug|Win32.Build.0 = Debug|Win32208 {8F5B7ED0-D380-4B4F-A744-3A568718176C}.Release|Win32.ActiveCfg = Release|Win32209 {8F5B7ED0-D380-4B4F-A744-3A568718176C}.Release|Win32.Build.0 = Release|Win32210 110 EndGlobalSection 211 111 GlobalSection(SolutionProperties) = preSolution … … 215 115 {F101C2F0-1CB9-4A57-827B-6C399A99B28F} = {B9D56701-B4DB-43F8-9920-241CA418C1CE} 216 116 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {B9D56701-B4DB-43F8-9920-241CA418C1CE} 217 {71FC0211-5EB5-4637-BE8A-A48EC3CC27D0} = {B9D56701-B4DB-43F8-9920-241CA418C1CE}218 117 {A0724246-CB7C-420B-BCF0-68EF205AFE34} = {B9D56701-B4DB-43F8-9920-241CA418C1CE} 219 {63B3E57A-4382-42F3-85EC-E869CFCCA88F} = {B9D56701-B4DB-43F8-9920-241CA418C1CE}220 118 {4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F} = {B9D56701-B4DB-43F8-9920-241CA418C1CE} 221 119 {EA969DF2-70AF-46E6-BBE2-E03112E04CB8} = {B9D56701-B4DB-43F8-9920-241CA418C1CE} 222 120 {53C56131-E2AA-4A27-B460-7AC05D61A0E6} = {B9D56701-B4DB-43F8-9920-241CA418C1CE} 223 {C6692661-9160-49E6-B109-A155F9485402} = {B9D56701-B4DB-43F8-9920-241CA418C1CE}224 {8F5B7ED0-D380-4B4F-A744-3A568718176C} = {B9D56701-B4DB-43F8-9920-241CA418C1CE}225 121 EndGlobalSection 226 122 EndGlobal - Property svn:mergeinfo changed
-
code/branches/buildsystem2/visual_studio/vc8/release.vsprops
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/buildsystem2/visual_studio/vc8/tinyxml.vcproj
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/buildsystem2/visual_studio/vc8/tinyxml.vsprops
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/buildsystem2/visual_studio/vc8/tolua.vsprops
- Property svn:mergeinfo changed
/code/branches/buildsystem/visual_studio/vc8/tolua.vsprops (added) merged: 2217
r2261 r2509 12 12 DisableSpecificWarnings="4996" 13 13 /> 14 <Tool 15 Name="VCLinkerTool" 16 AdditionalDependencies="lua$(CS).lib" 17 /> 14 18 </VisualStudioPropertySheet> - Property svn:mergeinfo changed
-
code/branches/buildsystem2/visual_studio/vc8/util.vsprops
- Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset
for help on using the changeset viewer.
