Changeset 2520
- Timestamp:
- Dec 22, 2008, 7:17:46 PM (16 years ago)
- Location:
- code/branches/buildsystem2
- Files:
-
- 6 edited
-
src/tolua/lua/doit.lua (modified) (4 diffs)
-
src/tolua/lua/package.lua (modified) (1 diff)
-
visual_studio/vc8/base.vsprops (modified) (1 diff)
-
visual_studio/vc8/core.vcproj (modified) (4 diffs)
-
visual_studio/vc8/orxonox.vcproj (modified) (4 diffs)
-
visual_studio/vc8/orxonox_vc8.sln (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
code/branches/buildsystem2/src/tolua/lua/doit.lua
r2509 r2520 46 46 -- do this after setting the package name 47 47 if flags.L then 48 if string.sub(flags.L, 1, 1) == '/' or string.sub(flags.L, 1, 1) == '\\' then48 if string.sub(flags.L, 1, 1) == '/' or string.sub(flags.L, 1, 1) == '\\' or (string.len(flags.L) > 1 and string.sub(flags.L, 2, 2) == ':') then 49 49 dofile(flags.L) 50 50 else … … 63 63 local file 64 64 if flags.f then 65 if string.sub(flags.f, 1, 1) == '/' or string.sub(flags.f, 1, 1) == '\\' then65 if string.sub(flags.f, 1, 1) == '/' or string.sub(flags.f, 1, 1) == '\\' or (string.len(flags.f) > 1 and string.sub(flags.f, 2, 2) == ':') then 66 66 file = flags.f 67 67 else … … 79 79 if flags.o then 80 80 local file 81 if string.sub(flags.o, 1, 1) == '/' or string.sub(flags.o, 1, 1) == '\\' then81 if string.sub(flags.o, 1, 1) == '/' or string.sub(flags.o, 1, 1) == '\\' or (string.len(flags.o) > 1 and string.sub(flags.o, 2, 2) == ':') then 82 82 file = flags.o 83 83 else … … 110 110 if flags.H then 111 111 local file 112 if string.sub(flags.H, 1, 1) == '/' or string.sub(flags.H, 1, 1) == '\\' then112 if string.sub(flags.H, 1, 1) == '/' or string.sub(flags.H, 1, 1) == '\\' or (string.len(flags.H) > 1 and string.sub(flags.H, 2, 2) == ':') then 113 113 file = flags.H 114 114 else -
code/branches/buildsystem2/src/tolua/lua/package.lua
r2509 r2520 252 252 local file 253 253 if flags.f then 254 if string.sub(flags.f, 1, 1) == '/' or string.sub(flags.f, 1, 1) == '\\' then254 if string.sub(flags.f, 1, 1) == '/' or string.sub(flags.f, 1, 1) == '\\' or (string.len(flags.f) > 1 and string.sub(flags.f, 2, 2) == ':') then 255 255 file = flags.f 256 256 else -
code/branches/buildsystem2/visual_studio/vc8/base.vsprops
r2516 r2520 8 8 <Tool 9 9 Name="VCCLCompilerTool" 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""10 AdditionalIncludeDirectories=""$(RootDir)src";"$(RootDir)\build\$(SolutionName)\$(ConfigurationName)";"$(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" -
code/branches/buildsystem2/visual_studio/vc8/core.vcproj
r2516 r2520 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 "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.htolua.pkg
"164 AdditionalDependencies="$(RootDir)\src\core\LuaBind.h; $(RootDir)\src\core\CommandExecutor.h"165 Outputs="$( RootDir)\src\core\ToluaBindCore.cc; $(RootDir)\src\core\ToluaBindCore.h"163 CommandLine="path $(LibDir)\..\..\bin\$(SolutionName)\$(ConfigurationName); %path%
cd $(RootDir)\bin
echo $cfile "CommandExecutor.h" > $(IntDir)\tolua.pkg
echo $cfile "LuaBind.h" >> $(IntDir)\tolua.pkg
$(OutDir)\toluaexe$(CS).exe -n Core -w $(RootDir)\src\core\ -s $(RootDir)\src\tolua\all-5.1.lua -o $(IntDir)\ToluaBindCore.cc -H $(IntDir)\ToluaBindCore.h $(IntDir)\tolua.pkg
" 164 AdditionalDependencies="$(RootDir)\src\core\LuaBind.h; $(RootDir)\src\core\CommandExecutor.h" 165 Outputs="$(IntDir)\ToluaBindCore.cc; $(IntDir)\ToluaBindCore.h; $(IntDir)\tolua.pkg" 166 166 /> 167 167 </FileConfiguration> … … 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 "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.htolua.pkg
"175 AdditionalDependencies="$(RootDir)\src\core\LuaBind.h; $(RootDir)\src\core\CommandExecutor.h"176 Outputs="$( RootDir)\src\core\ToluaBindCore.cc; $(RootDir)\src\core\ToluaBindCore.h"174 CommandLine="path $(LibDir)\..\..\bin\$(SolutionName)\$(ConfigurationName); %path%
cd $(RootDir)\bin
echo $cfile "CommandExecutor.h" > $(IntDir)\tolua.pkg
echo $cfile "LuaBind.h" >> $(IntDir)\tolua.pkg
$(OutDir)\toluaexe$(CS).exe -n Core -w $(RootDir)\src\core\ -s $(RootDir)\src\tolua\all-5.1.lua -o $(IntDir)\ToluaBindCore.cc -H $(IntDir)\ToluaBindCore.h $(IntDir)\tolua.pkg
" 175 AdditionalDependencies="$(RootDir)\src\core\LuaBind.h; $(RootDir)\src\core\CommandExecutor.h" 176 Outputs="$(IntDir)\ToluaBindCore.cc; $(IntDir)\ToluaBindCore.h; $(IntDir)\tolua.pkg" 177 177 /> 178 178 </FileConfiguration> … … 219 219 </File> 220 220 <File 221 RelativePath="$(IntDir)\ToluaBindCore.cc" 222 > 223 </File> 224 <File 221 225 RelativePath="..\..\src\core\XMLNameListener.cc" 222 >223 </File>224 <File225 RelativePath="..\..\src\core\ToluaBindCore.cc"226 226 > 227 227 </File> … … 445 445 </File> 446 446 <File 447 RelativePath=" ..\..\src\core\ToluaBindCore.h"447 RelativePath="$(IntDir)\ToluaBindCore.h" 448 448 > 449 449 </File> -
code/branches/buildsystem2/visual_studio/vc8/orxonox.vcproj
r2516 r2520 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-5.1.lua -o ToluaBindOrxonox.cc -H ToluaBindOrxonox.htolua.pkg
"169 CommandLine="path $(LibDir)\..\..\bin\$(SolutionName)\$(ConfigurationName); %path%
cd $(RootDir)\bin
echo $cfile "gui/GUIManager.h" > $(IntDir)\tolua.pkg
"$(OutDir)\toluaexe$(CS).exe" -n Orxonox -w $(RootDir)\src\orxonox\ -s $(RootDir)\src\tolua\all-5.1.lua -o $(IntDir)\ToluaBindOrxonox.cc -H $(IntDir)\ToluaBindOrxonox.h $(IntDir)\tolua.pkg
" 170 170 AdditionalDependencies="$(RootDir)\src\orxonox\gui\GUIManager.h" 171 Outputs="$( RootDir)\src\orxonox\ToluaBindOrxonox.cc; $(RootDir)\src\orxonox\ToluaBindOrxonox.h"171 Outputs="$(IntDir)\ToluaBindOrxonox.cc; $(IntDir)\ToluaBindOrxonox.h; $(IntDir)\tolua.pkg" 172 172 /> 173 173 </FileConfiguration> … … 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-5.1.lua -o ToluaBindOrxonox.cc -H ToluaBindOrxonox.htolua.pkg
"180 CommandLine="path $(LibDir)\..\..\bin\$(SolutionName)\$(ConfigurationName); %path%
cd $(RootDir)\bin
echo $cfile "gui/GUIManager.h" > $(IntDir)\tolua.pkg
"$(OutDir)\toluaexe$(CS).exe" -n Orxonox -w $(RootDir)\src\orxonox\ -s $(RootDir)\src\tolua\all-5.1.lua -o $(IntDir)\ToluaBindOrxonox.cc -H $(IntDir)\ToluaBindOrxonox.h $(IntDir)\tolua.pkg
" 181 181 AdditionalDependencies="$(RootDir)\src\orxonox\gui\GUIManager.h" 182 Outputs="$( RootDir)\src\orxonox\ToluaBindOrxonox.cc; $(RootDir)\src\orxonox\ToluaBindOrxonox.h"182 Outputs="$(IntDir)\ToluaBindOrxonox.cc; $(IntDir)\ToluaBindOrxonox.h; $(IntDir)\tolua.pkg" 183 183 /> 184 184 </FileConfiguration> … … 225 225 </File> 226 226 <File 227 RelativePath=" ..\..\src\orxonox\ToluaBindOrxonox.cc"227 RelativePath="$(IntDir)\ToluaBindOrxonox.cc" 228 228 > 229 229 <FileConfiguration … … 847 847 </File> 848 848 <File 849 RelativePath=" ..\..\src\orxonox\ToluaBindOrxonox.h"849 RelativePath="$(IntDir)\ToluaBindOrxonox.h" 850 850 > 851 851 </File> -
code/branches/buildsystem2/visual_studio/vc8/orxonox_vc8.sln
r2516 r2520 25 25 EndProjectSection 26 26 EndProject 27 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "audio", "audio.vcproj", "{4733BD1A-E04C-458D-8BFB-5010250EA497}"28 ProjectSection(ProjectDependencies) = postProject29 {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86}30 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}31 EndProjectSection32 EndProject33 27 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "network", "network.vcproj", "{35575B59-E1AE-40E8-89C4-2862B5B09B68}" 34 28 ProjectSection(ProjectDependencies) = postProject … … 45 39 {4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F} = {4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F} 46 40 {35575B59-E1AE-40E8-89C4-2862B5B09B68} = {35575B59-E1AE-40E8-89C4-2862B5B09B68} 47 {4733BD1A-E04C-458D-8BFB-5010250EA497} = {4733BD1A-E04C-458D-8BFB-5010250EA497}48 41 {A0724246-CB7C-420B-BCF0-68EF205AFE34} = {A0724246-CB7C-420B-BCF0-68EF205AFE34} 49 42 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} … … 89 82 {271715F3-5B90-4110-A552-70C788084A86}.Release|Win32.ActiveCfg = Release|Win32 90 83 {271715F3-5B90-4110-A552-70C788084A86}.Release|Win32.Build.0 = Release|Win32 91 {4733BD1A-E04C-458D-8BFB-5010250EA497}.Debug|Win32.ActiveCfg = Debug|Win3292 {4733BD1A-E04C-458D-8BFB-5010250EA497}.Debug|Win32.Build.0 = Debug|Win3293 {4733BD1A-E04C-458D-8BFB-5010250EA497}.Release|Win32.ActiveCfg = Release|Win3294 {4733BD1A-E04C-458D-8BFB-5010250EA497}.Release|Win32.Build.0 = Release|Win3295 84 {35575B59-E1AE-40E8-89C4-2862B5B09B68}.Debug|Win32.ActiveCfg = Debug|Win32 96 85 {35575B59-E1AE-40E8-89C4-2862B5B09B68}.Debug|Win32.Build.0 = Debug|Win32
Note: See TracChangeset
for help on using the changeset viewer.
