Changeset 1896 for code/trunk
- Timestamp:
- Oct 10, 2008, 12:07:45 AM (16 years ago)
- Location:
- code/trunk
- Files:
-
- 5 added
- 12 edited
-
src/orxonox/Main.cc (modified) (1 diff)
-
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/directories.vsprops (modified) (2 diffs)
-
visual_studio/vc8/lua.vsprops (modified) (1 diff)
-
visual_studio/vc8/lua_static.vcproj (added)
-
visual_studio/vc8/lua_static.vsprops (added)
-
visual_studio/vc8/orxonox.vcproj (modified) (2 diffs)
-
visual_studio/vc8/orxonox.vcproj.user (added)
-
visual_studio/vc8/orxonox.vsprops (modified) (1 diff)
-
visual_studio/vc8/orxonox_vc8.sln (modified) (4 diffs)
-
visual_studio/vc8/tolua_static.vcproj (added)
-
visual_studio/vc8/tolua_static.vsprops (added)
-
visual_studio/vc8/toluagen.vsprops (modified) (1 diff)
-
visual_studio/vc8/toluagen_orxonox.vcproj (modified) (2 diffs)
-
visual_studio/vc8/toluagen_orxonox.vsprops (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/src/orxonox/Main.cc
r1891 r1896 93 93 // Specifiy config file before creating the GameStates in order to have 94 94 // setConfigValues() in the constructor (required). 95 #if ORXONOX_DEBUG_MODE == 1 96 ConfigFileManager::getInstance().setFile(CFT_Settings, "orxonox_d.ini"); 97 #else 98 ConfigFileManager::getInstance().setFile(CFT_Settings, "orxonox.ini"); 99 #endif 95 ConfigFileManager::getInstance().setFile(CFT_Settings, "orxonox.ini"); 100 96 101 97 // create the gamestates -
code/trunk/visual_studio/vc8/base.vsprops
r1877 r1896 9 9 Name="VCCLCompilerTool" 10 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 ;LUA_BUILD_AS_DLL"11 PreprocessorDefinitions="WIN32;__WIN32__;_WIN32;_WINDOWS;BOOST_ALL_DYN_LINK;OIS_DYNAMIC_LIB;ZLIB_WINAPI" 12 12 WarningLevel="3" 13 13 DisableSpecificWarnings="4522;4251;4800" … … 15 15 <Tool 16 16 Name="VCLibrarianTool" 17 OutputFile="$(LibOutDir)$(ProjectName)$(CS).lib" 18 AdditionalLibraryDirectories="$(RootDir)dependencies\lib" 19 IgnoreAllDefaultLibraries="true" 17 OutputFile="$(IntDir)$(ProjectName)$(CS).lib" 18 AdditionalLibraryDirectories="$(LibDir)" 20 19 /> 21 20 <Tool … … 24 23 AdditionalLibraryDirectories=""$(LibDir)boost-1.35.0\lib";"$(LibDir)cegui-0.6.1\lib";"$(LibDir)enet-1.2\lib";"$(LibDir)freealut-1.1.0\lib";"$(LibDir)libogg-1.1.3\lib";"$(LibDir)libvorbis-1.2.0\lib";"$(LibDir)ogre-1.4.9\lib";"$(LibDir)openal-1.1\lib";"$(LibDir)tcl-8.5.2\lib";"$(LibDir)zlib-1.2.3\lib"" 25 24 SubSystem="1" 26 ImportLibrary="$( LibOutDir)$(TargetName).lib"25 ImportLibrary="$(IntDir)\$(TargetName).lib" 27 26 TargetMachine="1" 28 27 /> -
code/trunk/visual_studio/vc8/core.vcproj
r1887 r1896 196 196 Name="VCCustomBuildTool" 197 197 Description="Generating tolua bind files..." 198 CommandLine=""$( OutDir)\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
"198 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
" 199 199 AdditionalDependencies="$(RootDir)\src\core\Script.h;$(RootDir)\src\core\CommandExecutor.h" 200 200 Outputs="$(RootDir)\src\core\tolua\tolua_bind.cc; $(RootDir)\src\core\tolua\tolua_bind.h" … … 207 207 Name="VCCustomBuildTool" 208 208 Description="Generating tolua bind files..." 209 CommandLine=""$( OutDir)\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
"210 AdditionalDependencies=" "209 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
" 210 AdditionalDependencies="$(RootDir)\src\core\Script.h;$(RootDir)\src\core\CommandExecutor.h" 211 211 Outputs="$(RootDir)\src\core\tolua\tolua_bind.cc; $(RootDir)\src\core\tolua\tolua_bind.h" 212 212 /> -
code/trunk/visual_studio/vc8/core.vsprops
r1842 r1896 9 9 Name="VCCLCompilerTool" 10 10 AdditionalOptions="/MP2" 11 PreprocessorDefinitions="CORE_SHARED_BUILD "11 PreprocessorDefinitions="CORE_SHARED_BUILD;LUA_BUILD_AS_DLL" 12 12 /> 13 13 <Tool -
code/trunk/visual_studio/vc8/directories.vsprops
r1877 r1896 4 4 Version="8.00" 5 5 Name="directories" 6 OutputDirectory="$(RootDir)bin\ "7 IntermediateDirectory="$(RootDir) obj\$(ProjectName)\$(ConfigurationName)"6 OutputDirectory="$(RootDir)bin\$(SolutionName)\$(ConfigurationName)\" 7 IntermediateDirectory="$(RootDir)build\$(SolutionName)\$(ConfigurationName)\$(ProjectName)\" 8 8 > 9 9 <UserMacro … … 13 13 <UserMacro 14 14 Name="LibDir" 15 Value="$(RootDir) dependencies\"15 Value="$(RootDir)\dependencies\" 16 16 /> 17 17 <UserMacro -
code/trunk/visual_studio/vc8/lua.vsprops
r1839 r1896 8 8 <Tool 9 9 Name="VCCLCompilerTool" 10 PreprocessorDefinitions="LUA_BUILD_AS_DLL" 10 11 CompileAs="1" 11 12 DisableSpecificWarnings="4996" -
code/trunk/visual_studio/vc8/orxonox.vcproj
r1891 r1896 348 348 Name="VCCustomBuildTool" 349 349 Description="Generating tolua bind files..." 350 CommandLine=""$( OutDir)\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
"350 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
" 351 351 AdditionalDependencies="$(RootDir)\src\orxonox\gui\GUIManager.h" 352 352 Outputs="$(RootDir)\src\orxonox\tolua\tolua_bind.cc; $(RootDir)\src\orxonox\tolua\tolua_bind.h" … … 359 359 Name="VCCustomBuildTool" 360 360 Description="Generating tolua bind files..." 361 CommandLine=""$( OutDir)\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
"361 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
" 362 362 AdditionalDependencies="$(RootDir)\src\orxonox\gui\GUIManager.h" 363 363 Outputs="$(RootDir)\src\orxonox\tolua\tolua_bind.cc; $(RootDir)\src\orxonox\tolua\tolua_bind.h" -
code/trunk/visual_studio/vc8/orxonox.vsprops
r1842 r1896 9 9 Name="VCCLCompilerTool" 10 10 AdditionalOptions="/MP2" 11 PreprocessorDefinitions="ORXONOX_NO_EXPORTS;NETWORK_STATIC_BUILD "11 PreprocessorDefinitions="ORXONOX_NO_EXPORTS;NETWORK_STATIC_BUILD;LUA_BUILD_AS_DLL" 12 12 UsePrecompiledHeader="2" 13 13 PrecompiledHeaderThrough="OrxonoxStableHeaders.h" -
code/trunk/visual_studio/vc8/orxonox_vc8.sln
r1877 r1896 3 3 # Visual Studio 2005 4 4 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpptcl", "cpptcl.vcproj", "{53C56131-E2AA-4A27-B460-7AC05D61A0E6}" 5 ProjectSection(WebsiteProperties) = preProject 6 Debug.AspNetCompiler.Debug = "True" 7 Release.AspNetCompiler.Debug = "False" 8 EndProjectSection 5 9 EndProject 6 10 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinyxml", "tinyxml.vcproj", "{F101C2F0-1CB9-4A57-827B-6C399A99B28F}" 11 ProjectSection(WebsiteProperties) = preProject 12 Debug.AspNetCompiler.Debug = "True" 13 Release.AspNetCompiler.Debug = "False" 14 EndProjectSection 7 15 EndProject 8 16 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tolua", "tolua.vcproj", "{35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}" 17 ProjectSection(WebsiteProperties) = preProject 18 Debug.AspNetCompiler.Debug = "True" 19 Release.AspNetCompiler.Debug = "False" 20 EndProjectSection 9 21 ProjectSection(ProjectDependencies) = postProject 10 22 {63B3E57A-4382-42F3-85EC-E869CFCCA88F} = {63B3E57A-4382-42F3-85EC-E869CFCCA88F} … … 12 24 EndProject 13 25 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toluagen_orxonox", "toluagen_orxonox.vcproj", "{71FC0211-5EB5-4637-BE8A-A48EC3CC27D0}" 14 ProjectSection(ProjectDependencies) = postProject 26 ProjectSection(WebsiteProperties) = preProject 27 Debug.AspNetCompiler.Debug = "True" 28 Release.AspNetCompiler.Debug = "False" 29 EndProjectSection 30 ProjectSection(ProjectDependencies) = postProject 31 {8F5B7ED0-D380-4B4F-A744-3A568718176C} = {8F5B7ED0-D380-4B4F-A744-3A568718176C} 32 {C6692661-9160-49E6-B109-A155F9485402} = {C6692661-9160-49E6-B109-A155F9485402} 15 33 {A0724246-CB7C-420B-BCF0-68EF205AFE34} = {A0724246-CB7C-420B-BCF0-68EF205AFE34} 34 EndProjectSection 35 EndProject 36 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toluagen", "toluagen.vcproj", "{A0724246-CB7C-420B-BCF0-68EF205AFE34}" 37 ProjectSection(WebsiteProperties) = preProject 38 Debug.AspNetCompiler.Debug = "True" 39 Release.AspNetCompiler.Debug = "False" 40 EndProjectSection 41 ProjectSection(ProjectDependencies) = postProject 42 {8F5B7ED0-D380-4B4F-A744-3A568718176C} = {8F5B7ED0-D380-4B4F-A744-3A568718176C} 43 {C6692661-9160-49E6-B109-A155F9485402} = {C6692661-9160-49E6-B109-A155F9485402} 44 EndProjectSection 45 EndProject 46 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "util.vcproj", "{2240ECD7-2F48-4431-8E1B-25466A384CCC}" 47 ProjectSection(WebsiteProperties) = preProject 48 Debug.AspNetCompiler.Debug = "True" 49 Release.AspNetCompiler.Debug = "False" 50 EndProjectSection 51 EndProject 52 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "core.vcproj", "{271715F3-5B90-4110-A552-70C788084A86}" 53 ProjectSection(WebsiteProperties) = preProject 54 Debug.AspNetCompiler.Debug = "True" 55 Release.AspNetCompiler.Debug = "False" 56 EndProjectSection 57 ProjectSection(ProjectDependencies) = postProject 58 {EA969DF2-70AF-46E6-BBE2-E03112E04CB8} = {EA969DF2-70AF-46E6-BBE2-E03112E04CB8} 59 {F101C2F0-1CB9-4A57-827B-6C399A99B28F} = {F101C2F0-1CB9-4A57-827B-6C399A99B28F} 60 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC} 61 {53C56131-E2AA-4A27-B460-7AC05D61A0E6} = {53C56131-E2AA-4A27-B460-7AC05D61A0E6} 16 62 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} 17 63 {63B3E57A-4382-42F3-85EC-E869CFCCA88F} = {63B3E57A-4382-42F3-85EC-E869CFCCA88F} 18 EndProjectSection 19 EndProject 20 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toluagen", "toluagen.vcproj", "{A0724246-CB7C-420B-BCF0-68EF205AFE34}" 21 ProjectSection(ProjectDependencies) = postProject 64 {71FC0211-5EB5-4637-BE8A-A48EC3CC27D0} = {71FC0211-5EB5-4637-BE8A-A48EC3CC27D0} 65 EndProjectSection 66 EndProject 67 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "audio", "audio.vcproj", "{4733BD1A-E04C-458D-8BFB-5010250EA497}" 68 ProjectSection(WebsiteProperties) = preProject 69 Debug.AspNetCompiler.Debug = "True" 70 Release.AspNetCompiler.Debug = "False" 71 EndProjectSection 72 ProjectSection(ProjectDependencies) = postProject 73 {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86} 74 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC} 75 EndProjectSection 76 EndProject 77 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "network", "network.vcproj", "{35575B59-E1AE-40E8-89C4-2862B5B09B68}" 78 ProjectSection(WebsiteProperties) = preProject 79 Debug.AspNetCompiler.Debug = "True" 80 Release.AspNetCompiler.Debug = "False" 81 EndProjectSection 82 ProjectSection(ProjectDependencies) = postProject 83 {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86} 84 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC} 85 EndProjectSection 86 EndProject 87 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "orxonox", "orxonox.vcproj", "{0B6C5CFD-F91B-432A-80A3-2610F61E060B}" 88 ProjectSection(WebsiteProperties) = preProject 89 Debug.AspNetCompiler.Debug = "True" 90 Release.AspNetCompiler.Debug = "False" 91 EndProjectSection 92 ProjectSection(ProjectDependencies) = postProject 93 {4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F} = {4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F} 94 {F101C2F0-1CB9-4A57-827B-6C399A99B28F} = {F101C2F0-1CB9-4A57-827B-6C399A99B28F} 95 {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86} 96 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC} 97 {35575B59-E1AE-40E8-89C4-2862B5B09B68} = {35575B59-E1AE-40E8-89C4-2862B5B09B68} 98 {4733BD1A-E04C-458D-8BFB-5010250EA497} = {4733BD1A-E04C-458D-8BFB-5010250EA497} 22 99 {63B3E57A-4382-42F3-85EC-E869CFCCA88F} = {63B3E57A-4382-42F3-85EC-E869CFCCA88F} 23 100 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} 24 EndProjectSection25 EndProject26 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "util.vcproj", "{2240ECD7-2F48-4431-8E1B-25466A384CCC}"27 EndProject28 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "core.vcproj", "{271715F3-5B90-4110-A552-70C788084A86}"29 ProjectSection(ProjectDependencies) = postProject30 101 {71FC0211-5EB5-4637-BE8A-A48EC3CC27D0} = {71FC0211-5EB5-4637-BE8A-A48EC3CC27D0} 31 {63B3E57A-4382-42F3-85EC-E869CFCCA88F} = {63B3E57A-4382-42F3-85EC-E869CFCCA88F} 102 EndProjectSection 103 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" 108 EndProjectSection 109 EndProject 110 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ceguilua", "ceguilua.vcproj", "{4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F}" 111 ProjectSection(WebsiteProperties) = preProject 112 Debug.AspNetCompiler.Debug = "True" 113 Release.AspNetCompiler.Debug = "False" 114 EndProjectSection 115 ProjectSection(ProjectDependencies) = postProject 32 116 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} 33 {53C56131-E2AA-4A27-B460-7AC05D61A0E6} = {53C56131-E2AA-4A27-B460-7AC05D61A0E6} 34 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC} 35 {F101C2F0-1CB9-4A57-827B-6C399A99B28F} = {F101C2F0-1CB9-4A57-827B-6C399A99B28F} 36 {EA969DF2-70AF-46E6-BBE2-E03112E04CB8} = {EA969DF2-70AF-46E6-BBE2-E03112E04CB8} 37 EndProjectSection 38 EndProject 39 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "audio", "audio.vcproj", "{4733BD1A-E04C-458D-8BFB-5010250EA497}" 40 ProjectSection(ProjectDependencies) = postProject 41 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC} 42 {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86} 43 EndProjectSection 44 EndProject 45 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "network", "network.vcproj", "{35575B59-E1AE-40E8-89C4-2862B5B09B68}" 46 ProjectSection(ProjectDependencies) = postProject 47 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC} 48 {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86} 49 EndProjectSection 50 EndProject 51 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "orxonox", "orxonox.vcproj", "{0B6C5CFD-F91B-432A-80A3-2610F61E060B}" 52 ProjectSection(ProjectDependencies) = postProject 53 {71FC0211-5EB5-4637-BE8A-A48EC3CC27D0} = {71FC0211-5EB5-4637-BE8A-A48EC3CC27D0} 54 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} 55 {63B3E57A-4382-42F3-85EC-E869CFCCA88F} = {63B3E57A-4382-42F3-85EC-E869CFCCA88F} 56 {4733BD1A-E04C-458D-8BFB-5010250EA497} = {4733BD1A-E04C-458D-8BFB-5010250EA497} 57 {35575B59-E1AE-40E8-89C4-2862B5B09B68} = {35575B59-E1AE-40E8-89C4-2862B5B09B68} 58 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC} 59 {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86} 60 {F101C2F0-1CB9-4A57-827B-6C399A99B28F} = {F101C2F0-1CB9-4A57-827B-6C399A99B28F} 61 {4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F} = {4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F} 62 EndProjectSection 63 EndProject 64 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua", "lua.vcproj", "{63B3E57A-4382-42F3-85EC-E869CFCCA88F}" 65 EndProject 66 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ceguilua", "ceguilua.vcproj", "{4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F}" 67 ProjectSection(ProjectDependencies) = postProject 68 {63B3E57A-4382-42F3-85EC-E869CFCCA88F} = {63B3E57A-4382-42F3-85EC-E869CFCCA88F} 69 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} 117 {63B3E57A-4382-42F3-85EC-E869CFCCA88F} = {63B3E57A-4382-42F3-85EC-E869CFCCA88F} 70 118 EndProjectSection 71 119 EndProject 72 120 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ois", "ois.vcproj", "{EA969DF2-70AF-46E6-BBE2-E03112E04CB8}" 121 ProjectSection(WebsiteProperties) = preProject 122 Debug.AspNetCompiler.Debug = "True" 123 Release.AspNetCompiler.Debug = "False" 124 EndProjectSection 73 125 EndProject 74 126 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "externals", "externals", "{B9D56701-B4DB-43F8-9920-241CA418C1CE}" 127 ProjectSection(WebsiteProperties) = preProject 128 Debug.AspNetCompiler.Debug = "True" 129 Release.AspNetCompiler.Debug = "False" 130 EndProjectSection 131 EndProject 132 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tolua_static", "tolua_static.vcproj", "{C6692661-9160-49E6-B109-A155F9485402}" 133 ProjectSection(WebsiteProperties) = preProject 134 Debug.AspNetCompiler.Debug = "True" 135 Release.AspNetCompiler.Debug = "False" 136 EndProjectSection 137 EndProject 138 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua_static", "lua_static.vcproj", "{8F5B7ED0-D380-4B4F-A744-3A568718176C}" 139 ProjectSection(WebsiteProperties) = preProject 140 Debug.AspNetCompiler.Debug = "True" 141 Release.AspNetCompiler.Debug = "False" 142 EndProjectSection 75 143 EndProject 76 144 Global … … 132 200 {EA969DF2-70AF-46E6-BBE2-E03112E04CB8}.Release|Win32.ActiveCfg = Release|Win32 133 201 {EA969DF2-70AF-46E6-BBE2-E03112E04CB8}.Release|Win32.Build.0 = Release|Win32 202 {C6692661-9160-49E6-B109-A155F9485402}.Debug|Win32.ActiveCfg = Debug|Win32 203 {C6692661-9160-49E6-B109-A155F9485402}.Debug|Win32.Build.0 = Debug|Win32 204 {C6692661-9160-49E6-B109-A155F9485402}.Release|Win32.ActiveCfg = Release|Win32 205 {C6692661-9160-49E6-B109-A155F9485402}.Release|Win32.Build.0 = Release|Win32 206 {8F5B7ED0-D380-4B4F-A744-3A568718176C}.Debug|Win32.ActiveCfg = Debug|Win32 207 {8F5B7ED0-D380-4B4F-A744-3A568718176C}.Debug|Win32.Build.0 = Debug|Win32 208 {8F5B7ED0-D380-4B4F-A744-3A568718176C}.Release|Win32.ActiveCfg = Release|Win32 209 {8F5B7ED0-D380-4B4F-A744-3A568718176C}.Release|Win32.Build.0 = Release|Win32 134 210 EndGlobalSection 135 211 GlobalSection(SolutionProperties) = preSolution … … 145 221 {EA969DF2-70AF-46E6-BBE2-E03112E04CB8} = {B9D56701-B4DB-43F8-9920-241CA418C1CE} 146 222 {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} 147 225 EndGlobalSection 148 226 EndGlobal -
code/trunk/visual_studio/vc8/toluagen.vsprops
r1877 r1896 8 8 <Tool 9 9 Name="VCCLCompilerTool" 10 PreprocessorDefinitions="TOLUA_STATIC_BUILD" 10 11 CompileAs="1" 11 12 /> 12 13 <Tool 13 14 Name="VCLinkerTool" 14 OutputFile="$( OutDir)$(ProjectName)$(CS).exe"15 OutputFile="$(IntDir)$(ProjectName)$(CS).exe" 15 16 /> 16 17 </VisualStudioPropertySheet> -
code/trunk/visual_studio/vc8/toluagen_orxonox.vcproj
r1877 r1896 157 157 Name="VCCustomBuildTool" 158 158 Description="Generating tolua bind files..." 159 CommandLine=""$( OutDir)\toluagen$(CS).exe" -n tolua -o $(RootDir)/src/tolua/toluabind_orxonox.c -H $(RootDir)/src/tolua/toluabind_orxonox.h $(RootDir)/src/tolua/tolua-5.1.pkg
"159 CommandLine=""$(RootDir)\build\$(SolutionName)\$(ConfigurationName)\toluagen\toluagen$(CS).exe" -n tolua -o $(RootDir)/src/tolua/toluabind_orxonox.c -H $(RootDir)/src/tolua/toluabind_orxonox.h $(RootDir)/src/tolua/tolua-5.1.pkg
" 160 160 AdditionalDependencies="$(RootDir)\src\tolua\lua\compat-5.1.lua;$(RootDir)\src\tolua\lua\compat.lua;$(RootDir)\src\tolua\lua\basic.lua;$(RootDir)\src\tolua\lua\feature.lua;$(RootDir)\src\tolua\lua\verbatim.lua;$(RootDir)\src\tolua\lua\code.lua;$(RootDir)\src\tolua\lua\typedef.lua;$(RootDir)\src\tolua\lua\container.lua;$(RootDir)\src\tolua\lua\package.lua;$(RootDir)\src\tolua\lua\module.lua;$(RootDir)\src\tolua\lua\namespace.lua;$(RootDir)\src\tolua\lua\define.lua;$(RootDir)\src\tolua\lua\enumerate.lua;$(RootDir)\src\tolua\lua\declaration.lua;$(RootDir)\src\tolua\lua\variable.lua;$(RootDir)\src\tolua\lua\array.lua;$(RootDir)\src\tolua\lua\function.lua;$(RootDir)\src\tolua\lua\operator.lua;$(RootDir)\src\tolua\lua\class.lua;$(RootDir)\src\tolua\lua\clean.lua;$(RootDir)\src\tolua\lua\doit.lua" 161 161 Outputs="$(RootDir)\src\tolua\toluabind_orxonox.c; $(RootDir)\src\tolua\toluabind_orxonox.h" … … 168 168 Name="VCCustomBuildTool" 169 169 Description="Generating tolua bind files..." 170 CommandLine=""$( OutDir)\toluagen$(CS).exe" -n tolua -o $(RootDir)/src/tolua/toluabind_orxonox.c -H $(RootDir)/src/tolua/toluabind_orxonox.h $(RootDir)/src/tolua/tolua-5.1.pkg
"170 CommandLine=""$(RootDir)\build\$(SolutionName)\$(ConfigurationName)\toluagen\toluagen$(CS).exe" -n tolua -o $(RootDir)/src/tolua/toluabind_orxonox.c -H $(RootDir)/src/tolua/toluabind_orxonox.h $(RootDir)/src/tolua/tolua-5.1.pkg
" 171 171 AdditionalDependencies="$(RootDir)\src\tolua\lua\compat-5.1.lua;$(RootDir)\src\tolua\lua\compat.lua;$(RootDir)\src\tolua\lua\basic.lua;$(RootDir)\src\tolua\lua\feature.lua;$(RootDir)\src\tolua\lua\verbatim.lua;$(RootDir)\src\tolua\lua\code.lua;$(RootDir)\src\tolua\lua\typedef.lua;$(RootDir)\src\tolua\lua\container.lua;$(RootDir)\src\tolua\lua\package.lua;$(RootDir)\src\tolua\lua\module.lua;$(RootDir)\src\tolua\lua\namespace.lua;$(RootDir)\src\tolua\lua\define.lua;$(RootDir)\src\tolua\lua\enumerate.lua;$(RootDir)\src\tolua\lua\declaration.lua;$(RootDir)\src\tolua\lua\variable.lua;$(RootDir)\src\tolua\lua\array.lua;$(RootDir)\src\tolua\lua\function.lua;$(RootDir)\src\tolua\lua\operator.lua;$(RootDir)\src\tolua\lua\class.lua;$(RootDir)\src\tolua\lua\clean.lua;$(RootDir)\src\tolua\lua\doit.lua" 172 172 Outputs="$(RootDir)\src\tolua\toluabind_orxonox.c; $(RootDir)\src\tolua\toluabind_orxonox.h" -
code/trunk/visual_studio/vc8/toluagen_orxonox.vsprops
r1877 r1896 13 13 <Tool 14 14 Name="VCLinkerTool" 15 OutputFile="$( OutDir)$(ProjectName)$(CS).exe"15 OutputFile="$(IntDir)$(ProjectName)$(CS).exe" 16 16 /> 17 17 </VisualStudioPropertySheet>
Note: See TracChangeset
for help on using the changeset viewer.
