Changeset 1755 for code/trunk/visual_studio
- Timestamp:
- Sep 10, 2008, 1:37:36 AM (16 years ago)
- Location:
- code/trunk
- Files:
-
- 14 edited
- 2 copied
-
. (modified) (1 prop)
-
visual_studio/base_properties.vsprops (modified) (2 diffs)
-
visual_studio/core_properties.vsprops (modified) (1 diff)
-
visual_studio/orxonox_properties.vsprops (modified) (2 diffs)
-
visual_studio/orxonox_vc8.sln (modified) (4 diffs)
-
visual_studio/tolua_app_properties.vsprops (modified) (1 diff)
-
visual_studio/tolua_gen_properties.vsprops (copied) (copied from code/branches/gui/visual_studio/tolua_gen_properties.vsprops)
-
visual_studio/tolua_properties.vsprops (modified) (1 diff)
-
visual_studio/util_properties.vsprops (modified) (1 diff)
-
visual_studio/vc8/core.vcproj (modified) (15 diffs)
-
visual_studio/vc8/ois.vcproj (modified) (2 diffs)
-
visual_studio/vc8/orxonox.vcproj (modified) (7 diffs)
-
visual_studio/vc8/tolua.vcproj (modified) (6 diffs)
-
visual_studio/vc8/tolua_app.vcproj (modified) (2 diffs)
-
visual_studio/vc8/tolua_gen.vcproj (copied) (copied from code/branches/gui/visual_studio/vc8/tolua_gen.vcproj)
-
visual_studio/vc8/util.vcproj (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/gui (added) merged: 1636,1638,1640-1647,1649-1654,1656,1659-1665,1670,1672-1674,1686,1688-1692,1694-1697,1704 /code/branches/input (added) merged: 1629-1630
- Property svn:mergeinfo changed
-
code/trunk/visual_studio/base_properties.vsprops
r1735 r1755 8 8 <Tool 9 9 Name="VCCLCompilerTool" 10 AdditionalIncludeDirectories=""$(RootDir)";"$(RootDir)src";"$(RootDir)src\orxonox";"$(RootDir)src\tolua";"$(RootDir)src\ois";"$(LibDir)ogre-1.4.9\OgreMain\include";"$(LibDir)boost-1.35.0";"$(LibDir) enet-1.2\include";"$(LibDir)libogg-1.1.3\include";"$(LibDir)libvorbis-1.2.0\include";"$(LibDir)lua-5.1.3\src";"$(LibDir)openal-1.1\include";"$(LibDir)openal-1.1\alut\include";"$(LibDir)tcl-8.5.\generic";"$(LibDir)zlib-1.2.3""10 AdditionalIncludeDirectories=""$(RootDir)";"$(RootDir)src";"$(RootDir)src\orxonox";"$(RootDir)src\tolua";"$(RootDir)src\ois";"$(LibDir)ogre-1.4.9\OgreMain\include";"$(LibDir)boost-1.35.0";"$(LibDir)cegui-0.6.1\include";"$(LibDir)cegui-0.6.1\ScriptingModules\CEGUILua\LuaScriptModule\include";"$(LibDir)enet-1.2\include";"$(LibDir)libogg-1.1.3\include";"$(LibDir)libvorbis-1.2.0\include";"$(LibDir)lua-5.1.3\src";"$(LibDir)openal-1.1\include";"$(LibDir)openal-1.1\alut\include";"$(LibDir)tcl-8.5.\generic";"$(LibDir)zlib-1.2.3"" 11 11 PreprocessorDefinitions="WIN32;__WIN32__;_WIN32;BOOST_ALL_DYN_LINK;OIS_DYNAMIC_LIB; ZLIB_WINAPI" 12 12 WarningLevel="3" … … 45 45 <UserMacro 46 46 Name="LibDir" 47 Value="$(RootDir)..\lib_ src\"47 Value="$(RootDir)..\lib_precompiled\include\" 48 48 /> 49 49 </VisualStudioPropertySheet> -
code/trunk/visual_studio/core_properties.vsprops
r1747 r1755 13 13 <Tool 14 14 Name="VCLinkerTool" 15 AdditionalDependencies="OgreMain$(CSS).lib lua-5.1.3$(CS).lib tcl85t.lib"15 AdditionalDependencies="OgreMain$(CSS).lib tcl85t.lib lua-5.1.3$(CS).lib" 16 16 /> 17 17 </VisualStudioPropertySheet> -
code/trunk/visual_studio/orxonox_properties.vsprops
r1747 r1755 9 9 Name="VCCLCompilerTool" 10 10 AdditionalOptions="/MP2" 11 PreprocessorDefinitions="ORXONOX_NO_EXPORTS;NETWORK_STATIC_BUILD "11 PreprocessorDefinitions="ORXONOX_NO_EXPORTS;NETWORK_STATIC_BUILD;OGRE_GUIRENDERER_EXPORTS" 12 12 UsePrecompiledHeader="2" 13 13 PrecompiledHeaderThrough="OrxonoxStableHeaders.h" … … 15 15 <Tool 16 16 Name="VCLinkerTool" 17 AdditionalDependencies="OgreMain$(CSS).lib tcl85t.lib enet-1.2$(CS).lib zlib-1.2.3$(CS).lib "17 AdditionalDependencies="OgreMain$(CSS).lib tcl85t.lib enet-1.2$(CS).lib zlib-1.2.3$(CS).lib CEGUILua$(CS).lib CEGUIBase$(CS).lib lua-5.1.3$(CS).lib" 18 18 OutputFile="$(OutDir)$(ProjectName)$(CS).exe" 19 19 IgnoreDefaultLibraryNames="LIBCMT;LIBCMTD" -
code/trunk/visual_studio/orxonox_vc8.sln
r1631 r1755 10 10 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tolua", "vc8\tolua.vcproj", "{35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}" 11 11 EndProject 12 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tolua_gen", "vc8\tolua_gen.vcproj", "{71FC0211-5EB5-4637-BE8A-A48EC3CC27D0}" 13 ProjectSection(ProjectDependencies) = postProject 14 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} 15 EndProjectSection 16 EndProject 17 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tolua_app", "vc8\tolua_app.vcproj", "{A0724246-CB7C-420B-BCF0-68EF205AFE34}" 18 ProjectSection(ProjectDependencies) = postProject 19 {71FC0211-5EB5-4637-BE8A-A48EC3CC27D0} = {71FC0211-5EB5-4637-BE8A-A48EC3CC27D0} 20 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} 21 EndProjectSection 22 EndProject 23 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "vc8\util.vcproj", "{2240ECD7-2F48-4431-8E1B-25466A384CCC}" 24 EndProject 25 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "vc8\core.vcproj", "{271715F3-5B90-4110-A552-70C788084A86}" 26 ProjectSection(ProjectDependencies) = postProject 27 {F101C2F0-1CB9-4A57-827B-6C399A99B28F} = {F101C2F0-1CB9-4A57-827B-6C399A99B28F} 28 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC} 29 {9CC704CB-4956-4479-BDEC-57CBC03F700E} = {9CC704CB-4956-4479-BDEC-57CBC03F700E} 30 {53C56131-E2AA-4A27-B460-7AC05D61A0E6} = {53C56131-E2AA-4A27-B460-7AC05D61A0E6} 31 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} 32 EndProjectSection 33 EndProject 12 34 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "audio", "vc8\audio.vcproj", "{4733BD1A-E04C-458D-8BFB-5010250EA497}" 13 35 ProjectSection(ProjectDependencies) = postProject … … 16 38 EndProjectSection 17 39 EndProject 18 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tolua_app", "vc8\tolua_app.vcproj", "{A0724246-CB7C-420B-BCF0-68EF205AFE34}"19 ProjectSection(ProjectDependencies) = postProject20 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}21 EndProjectSection22 EndProject23 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "vc8\util.vcproj", "{2240ECD7-2F48-4431-8E1B-25466A384CCC}"24 ProjectSection(ProjectDependencies) = postProject25 {F101C2F0-1CB9-4A57-827B-6C399A99B28F} = {F101C2F0-1CB9-4A57-827B-6C399A99B28F}26 EndProjectSection27 EndProject28 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "vc8\core.vcproj", "{271715F3-5B90-4110-A552-70C788084A86}"29 ProjectSection(ProjectDependencies) = postProject30 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}31 {53C56131-E2AA-4A27-B460-7AC05D61A0E6} = {53C56131-E2AA-4A27-B460-7AC05D61A0E6}32 {A0724246-CB7C-420B-BCF0-68EF205AFE34} = {A0724246-CB7C-420B-BCF0-68EF205AFE34}33 {9CC704CB-4956-4479-BDEC-57CBC03F700E} = {9CC704CB-4956-4479-BDEC-57CBC03F700E}34 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}35 {F101C2F0-1CB9-4A57-827B-6C399A99B28F} = {F101C2F0-1CB9-4A57-827B-6C399A99B28F}36 EndProjectSection37 EndProject38 40 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "network", "vc8\network.vcproj", "{35575B59-E1AE-40E8-89C4-2862B5B09B68}" 39 41 ProjectSection(ProjectDependencies) = postProject 42 {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86} 40 43 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC} 41 {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86}42 44 EndProjectSection 43 45 EndProject 44 46 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "orxonox", "vc8\orxonox.vcproj", "{0B6C5CFD-F91B-432A-80A3-2610F61E060B}" 45 47 ProjectSection(ProjectDependencies) = postProject 46 {4733BD1A-E04C-458D-8BFB-5010250EA497} = {4733BD1A-E04C-458D-8BFB-5010250EA497} 47 {35575B59-E1AE-40E8-89C4-2862B5B09B68} = {35575B59-E1AE-40E8-89C4-2862B5B09B68} 48 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC} 48 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} 49 49 {F101C2F0-1CB9-4A57-827B-6C399A99B28F} = {F101C2F0-1CB9-4A57-827B-6C399A99B28F} 50 50 {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86} 51 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC} 52 {35575B59-E1AE-40E8-89C4-2862B5B09B68} = {35575B59-E1AE-40E8-89C4-2862B5B09B68} 53 {4733BD1A-E04C-458D-8BFB-5010250EA497} = {4733BD1A-E04C-458D-8BFB-5010250EA497} 51 54 EndProjectSection 52 55 EndProject … … 73 76 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}.Release|Win32.ActiveCfg = Release|Win32 74 77 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}.Release|Win32.Build.0 = Release|Win32 75 { 4733BD1A-E04C-458D-8BFB-5010250EA497}.Debug|Win32.ActiveCfg = Debug|Win3276 { 4733BD1A-E04C-458D-8BFB-5010250EA497}.Debug|Win32.Build.0 = Debug|Win3277 { 4733BD1A-E04C-458D-8BFB-5010250EA497}.Release|Win32.ActiveCfg = Release|Win3278 { 4733BD1A-E04C-458D-8BFB-5010250EA497}.Release|Win32.Build.0 = Release|Win3278 {71FC0211-5EB5-4637-BE8A-A48EC3CC27D0}.Debug|Win32.ActiveCfg = Debug|Win32 79 {71FC0211-5EB5-4637-BE8A-A48EC3CC27D0}.Debug|Win32.Build.0 = Debug|Win32 80 {71FC0211-5EB5-4637-BE8A-A48EC3CC27D0}.Release|Win32.ActiveCfg = Release|Win32 81 {71FC0211-5EB5-4637-BE8A-A48EC3CC27D0}.Release|Win32.Build.0 = Release|Win32 79 82 {A0724246-CB7C-420B-BCF0-68EF205AFE34}.Debug|Win32.ActiveCfg = Debug|Win32 80 83 {A0724246-CB7C-420B-BCF0-68EF205AFE34}.Debug|Win32.Build.0 = Debug|Win32 … … 89 92 {271715F3-5B90-4110-A552-70C788084A86}.Release|Win32.ActiveCfg = Release|Win32 90 93 {271715F3-5B90-4110-A552-70C788084A86}.Release|Win32.Build.0 = Release|Win32 94 {4733BD1A-E04C-458D-8BFB-5010250EA497}.Debug|Win32.ActiveCfg = Debug|Win32 95 {4733BD1A-E04C-458D-8BFB-5010250EA497}.Debug|Win32.Build.0 = Debug|Win32 96 {4733BD1A-E04C-458D-8BFB-5010250EA497}.Release|Win32.ActiveCfg = Release|Win32 97 {4733BD1A-E04C-458D-8BFB-5010250EA497}.Release|Win32.Build.0 = Release|Win32 91 98 {35575B59-E1AE-40E8-89C4-2862B5B09B68}.Debug|Win32.ActiveCfg = Debug|Win32 92 99 {35575B59-E1AE-40E8-89C4-2862B5B09B68}.Debug|Win32.Build.0 = Debug|Win32 -
code/trunk/visual_studio/tolua_app_properties.vsprops
r1631 r1755 8 8 <Tool 9 9 Name="VCCLCompilerTool" 10 DisableSpecificWarnings="4996" 10 PreprocessorDefinitions="TOLUA_STATIC_BUILD" 11 CompileAs="1" 11 12 /> 12 13 <Tool -
code/trunk/visual_studio/tolua_properties.vsprops
r1219 r1755 8 8 <Tool 9 9 Name="VCCLCompilerTool" 10 PreprocessorDefinitions="TOLUA_SHARED_BUILD" 11 CompileAs="2" 10 12 DisableSpecificWarnings="4996" 11 13 /> 14 <Tool 15 Name="VCLinkerTool" 16 AdditionalDependencies="lua-5.1.3$(CS).lib" 17 /> 12 18 </VisualStudioPropertySheet> -
code/trunk/visual_studio/util_properties.vsprops
r1084 r1755 8 8 <Tool 9 9 Name="VCCLCompilerTool" 10 AdditionalOptions="/MP2" 10 11 PreprocessorDefinitions="UTIL_SHARED_BUILD" 11 12 /> -
code/trunk/visual_studio/vc8/core.vcproj
r1747 r1755 149 149 > 150 150 <File 151 RelativePath="..\..\src\core\Clock.cc" 152 > 153 </File> 154 <File 151 155 RelativePath="..\..\src\core\ConfigFileManager.cc" 152 156 > … … 161 165 </File> 162 166 <File 167 RelativePath="..\..\src\core\Exception.cc" 168 > 169 </File> 170 <File 171 RelativePath="..\..\src\core\GameState.cc" 172 > 173 </File> 174 <File 163 175 RelativePath="..\..\src\core\Language.cc" 164 176 > … … 169 181 </File> 170 182 <File 183 RelativePath="..\..\src\core\RootGameState.cc" 184 > 185 </File> 186 <File 171 187 RelativePath="..\..\src\core\Script.cc" 172 188 > … … 178 194 RelativePath="..\..\src\core\tolua\tolua.pkg" 179 195 > 196 <FileConfiguration 197 Name="Debug|Win32" 198 > 199 <Tool 200 Name="VCCustomBuildTool" 201 Description="Generating tolua bind files..." 202 CommandLine=""$(OutDir)\tolua_app_d.exe" -n Core -o ../../src/core/tolua/tolua_bind.cc -H ../../src/core/tolua/tolua_bind.h ../../src/core/tolua/tolua.pkg
" 203 AdditionalDependencies="$(RootDir)\src\core\Script.h; $(RootDir)\src\core\CommandExecutor.h" 204 Outputs="$(RootDir)\src\core\tolua\tolua_bind.cc; $(RootDir)\src\core\tolua\tolua_bind.h" 205 /> 206 </FileConfiguration> 180 207 <FileConfiguration 181 208 Name="Release|Win32" … … 184 211 Name="VCCustomBuildTool" 185 212 Description="Generating tolua bind files..." 186 CommandLine=""$(OutDir)\tolua_app.exe" -n core -o ../../src/core/tolua/tolua_bind.cc -H ../../src/core/tolua/tolua_bind.h ../../src/core/tolua/tolua.pkg"213 CommandLine=""$(OutDir)\tolua_app.exe" -n Core -o ../../src/core/tolua/tolua_bind.cc -H ../../src/core/tolua/tolua_bind.h ../../src/core/tolua/tolua.pkg
" 187 214 Outputs="$(RootDir)\src\core\tolua\tolua_bind.cc; $(RootDir)\src\core\tolua\tolua_bind.h" 188 215 /> … … 210 237 </File> 211 238 <File 239 RelativePath="..\..\src\core\CommandLine.cc" 240 > 241 </File> 242 <File 212 243 RelativePath="..\..\src\core\ConsoleCommand.cc" 213 244 > … … 282 313 </File> 283 314 <File 315 RelativePath="..\..\src\core\input\ExtendedInputState.cc" 316 > 317 </File> 318 <File 284 319 RelativePath="..\..\src\core\input\HalfAxis.cc" 285 320 > … … 303 338 <File 304 339 RelativePath="..\..\src\core\input\KeyDetector.cc" 340 > 341 </File> 342 <File 343 RelativePath="..\..\src\core\input\SimpleInputState.cc" 305 344 > 306 345 </File> … … 333 372 > 334 373 <File 374 RelativePath="..\..\src\core\Clock.h" 375 > 376 </File> 377 <File 335 378 RelativePath="..\..\src\core\ConfigFileManager.h" 336 379 > … … 353 396 </File> 354 397 <File 398 RelativePath="..\..\src\core\Exception.h" 399 > 400 </File> 401 <File 402 RelativePath="..\..\src\core\GameState.h" 403 > 404 </File> 405 <File 355 406 RelativePath="..\..\src\core\Language.h" 356 407 > … … 361 412 </File> 362 413 <File 414 RelativePath="..\..\src\core\RootGameState.h" 415 > 416 </File> 417 <File 363 418 RelativePath="..\..\src\core\Script.h" 364 419 > 365 420 </File> 366 421 <File 367 RelativePath="..\..\src\core\Script_clean.h"368 >369 </File>370 <File371 422 RelativePath="..\..\src\core\Super.h" 372 423 > … … 384 435 </File> 385 436 <File 437 RelativePath="..\..\src\core\input\ExtendedInputState.h" 438 > 439 </File> 440 <File 386 441 RelativePath="..\..\src\core\input\HalfAxis.h" 387 442 > … … 404 459 </File> 405 460 <File 461 RelativePath="..\..\src\core\input\InputState.h" 462 > 463 </File> 464 <File 406 465 RelativePath="..\..\src\core\input\KeyBinder.h" 407 466 > … … 411 470 > 412 471 </File> 472 <File 473 RelativePath="..\..\src\core\input\SimpleInputState.h" 474 > 475 </File> 413 476 </Filter> 414 477 <Filter … … 433 496 <File 434 497 RelativePath="..\..\src\core\CommandExecutor.h" 498 > 499 </File> 500 <File 501 RelativePath="..\..\src\core\CommandLine.h" 435 502 > 436 503 </File> -
code/trunk/visual_studio/vc8/ois.vcproj
r1625 r1755 43 43 <Tool 44 44 Name="VCCLCompilerTool" 45 AdditionalOptions="/MP2" 45 46 Optimization="2" 46 47 InlineFunctionExpansion="1" … … 128 129 <Tool 129 130 Name="VCCLCompilerTool" 131 AdditionalOptions="/MP2" 130 132 Optimization="0" 131 133 AdditionalIncludeDirectories="$(RootDir)\src\ois" -
code/trunk/visual_studio/vc8/orxonox.vcproj
r1750 r1755 161 161 </File> 162 162 <File 163 RelativePath="..\..\src\orxonox\Orxonox.cc"164 >165 </File>166 <File167 163 RelativePath="..\..\src\orxonox\PrecompiledHeaderFiles.cc" 168 164 > … … 289 285 > 290 286 </File> 291 <Filter292 Name="weapon"293 >294 <File295 RelativePath="..\..\src\orxonox\objects\weapon\AmmunitionDump.cc"296 >297 <FileConfiguration298 Name="Debug|Win32"299 ExcludedFromBuild="true"300 >301 <Tool302 Name="VCCLCompilerTool"303 />304 </FileConfiguration>305 <FileConfiguration306 Name="Release|Win32"307 ExcludedFromBuild="true"308 >309 <Tool310 Name="VCCLCompilerTool"311 />312 </FileConfiguration>313 </File>314 <File315 RelativePath="..\..\src\orxonox\objects\weapon\BarrelGun.cc"316 >317 <FileConfiguration318 Name="Debug|Win32"319 ExcludedFromBuild="true"320 >321 <Tool322 Name="VCCLCompilerTool"323 />324 </FileConfiguration>325 <FileConfiguration326 Name="Release|Win32"327 ExcludedFromBuild="true"328 >329 <Tool330 Name="VCCLCompilerTool"331 />332 </FileConfiguration>333 </File>334 <File335 RelativePath="..\..\src\orxonox\objects\weapon\BaseWeapon.cc"336 >337 <FileConfiguration338 Name="Debug|Win32"339 ExcludedFromBuild="true"340 >341 <Tool342 Name="VCCLCompilerTool"343 />344 </FileConfiguration>345 <FileConfiguration346 Name="Release|Win32"347 ExcludedFromBuild="true"348 >349 <Tool350 Name="VCCLCompilerTool"351 />352 </FileConfiguration>353 </File>354 <File355 RelativePath="..\..\src\orxonox\objects\weapon\Bullet.cc"356 >357 <FileConfiguration358 Name="Debug|Win32"359 ExcludedFromBuild="true"360 >361 <Tool362 Name="VCCLCompilerTool"363 />364 </FileConfiguration>365 <FileConfiguration366 Name="Release|Win32"367 ExcludedFromBuild="true"368 >369 <Tool370 Name="VCCLCompilerTool"371 />372 </FileConfiguration>373 </File>374 <File375 RelativePath="..\..\src\orxonox\objects\weapon\BulletManager.cc"376 >377 <FileConfiguration378 Name="Debug|Win32"379 ExcludedFromBuild="true"380 >381 <Tool382 Name="VCCLCompilerTool"383 />384 </FileConfiguration>385 <FileConfiguration386 Name="Release|Win32"387 ExcludedFromBuild="true"388 >389 <Tool390 Name="VCCLCompilerTool"391 />392 </FileConfiguration>393 </File>394 <File395 RelativePath="..\..\src\orxonox\objects\weapon\WeaponStation.cc"396 >397 <FileConfiguration398 Name="Debug|Win32"399 ExcludedFromBuild="true"400 >401 <Tool402 Name="VCCLCompilerTool"403 />404 </FileConfiguration>405 <FileConfiguration406 Name="Release|Win32"407 ExcludedFromBuild="true"408 >409 <Tool410 Name="VCCLCompilerTool"411 />412 </FileConfiguration>413 </File>414 </Filter>415 287 </Filter> 416 288 <Filter … … 449 321 Name="tolua" 450 322 > 323 <File 324 RelativePath="..\..\src\orxonox\tolua\tolua.pkg" 325 > 326 <FileConfiguration 327 Name="Debug|Win32" 328 > 329 <Tool 330 Name="VCCustomBuildTool" 331 Description="Generating tolua bind files..." 332 CommandLine=""$(OutDir)\tolua_app_d.exe" -n Orxonox -o ../../src/orxonox/tolua/tolua_bind.cc -H ../../src/orxonox/tolua/tolua_bind.h ../../src/orxonox/tolua/tolua.pkg
" 333 AdditionalDependencies="$(RootDir)\src\orxonox\gui\GUIManager.h" 334 Outputs="$(RootDir)\src\orxonox\tolua\tolua_bind.cc; $(RootDir)\src\orxonox\tolua\tolua_bind.h" 335 /> 336 </FileConfiguration> 337 <FileConfiguration 338 Name="Release|Win32" 339 > 340 <Tool 341 Name="VCCustomBuildTool" 342 Description="Generating tolua bind files..." 343 CommandLine=""$(OutDir)\tolua_app.exe" -n Orxonox -o ../../src/orxonox/tolua/tolua_bind.cc -H ../../src/orxonox/tolua/tolua_bind.h ../../src/orxonox/tolua/tolua.pkg
" 344 AdditionalDependencies="$(RootDir)\src\orxonox\gui\GUIManager.h" 345 Outputs="$(RootDir)\src\orxonox\tolua\tolua_bind.cc; $(RootDir)\src\orxonox\tolua\tolua_bind.h" 346 /> 347 </FileConfiguration> 348 </File> 451 349 <File 452 350 RelativePath="..\..\src\orxonox\tolua\tolua_bind.cc" … … 525 423 </File> 526 424 </Filter> 425 </Filter> 426 <Filter 427 Name="gui" 428 > 429 <File 430 RelativePath="..\..\src\orxonox\gui\GUIManager.cc" 431 > 432 </File> 433 <File 434 RelativePath="..\..\src\orxonox\gui\OgreCEGUIRenderer.cpp" 435 > 436 <FileConfiguration 437 Name="Debug|Win32" 438 > 439 <Tool 440 Name="VCCLCompilerTool" 441 UsePrecompiledHeader="0" 442 /> 443 </FileConfiguration> 444 <FileConfiguration 445 Name="Release|Win32" 446 > 447 <Tool 448 Name="VCCLCompilerTool" 449 UsePrecompiledHeader="0" 450 /> 451 </FileConfiguration> 452 </File> 453 <File 454 RelativePath="..\..\src\orxonox\gui\OgreCEGUIResourceProvider.cpp" 455 > 456 <FileConfiguration 457 Name="Debug|Win32" 458 > 459 <Tool 460 Name="VCCLCompilerTool" 461 UsePrecompiledHeader="0" 462 /> 463 </FileConfiguration> 464 <FileConfiguration 465 Name="Release|Win32" 466 > 467 <Tool 468 Name="VCCLCompilerTool" 469 UsePrecompiledHeader="0" 470 /> 471 </FileConfiguration> 472 </File> 473 <File 474 RelativePath="..\..\src\orxonox\gui\OgreCEGUITexture.cpp" 475 > 476 <FileConfiguration 477 Name="Debug|Win32" 478 > 479 <Tool 480 Name="VCCLCompilerTool" 481 UsePrecompiledHeader="0" 482 /> 483 </FileConfiguration> 484 <FileConfiguration 485 Name="Release|Win32" 486 > 487 <Tool 488 Name="VCCLCompilerTool" 489 UsePrecompiledHeader="0" 490 /> 491 </FileConfiguration> 492 </File> 493 </Filter> 494 <Filter 495 Name="gamestates" 496 > 497 <File 498 RelativePath="..\..\src\orxonox\gamestates\GSClient.cc" 499 > 500 </File> 501 <File 502 RelativePath="..\..\src\orxonox\gamestates\GSDedicated.cc" 503 > 504 </File> 505 <File 506 RelativePath="..\..\src\orxonox\gamestates\GSGraphics.cc" 507 > 508 </File> 509 <File 510 RelativePath="..\..\src\orxonox\gamestates\GSGUI.cc" 511 > 512 </File> 513 <File 514 RelativePath="..\..\src\orxonox\gamestates\GSIOConsole.cc" 515 > 516 </File> 517 <File 518 RelativePath="..\..\src\orxonox\gamestates\GSLevel.cc" 519 > 520 </File> 521 <File 522 RelativePath="..\..\src\orxonox\gamestates\GSRoot.cc" 523 > 524 </File> 525 <File 526 RelativePath="..\..\src\orxonox\gamestates\GSServer.cc" 527 > 528 </File> 529 <File 530 RelativePath="..\..\src\orxonox\gamestates\GSStandalone.cc" 531 > 532 </File> 527 533 </Filter> 528 534 </Filter> … … 537 543 </File> 538 544 <File 539 RelativePath="..\..\src\orxonox\Orxonox .h"545 RelativePath="..\..\src\orxonox\OrxonoxLibraryHeaders.h" 540 546 > 541 547 </File> … … 635 641 > 636 642 </File> 637 <Filter638 Name="weapon"639 >640 <File641 RelativePath="..\..\src\orxonox\objects\weapon\AmmunitionDump.h"642 >643 </File>644 <File645 RelativePath="..\..\src\orxonox\objects\weapon\BarrelGun.h"646 >647 </File>648 <File649 RelativePath="..\..\src\orxonox\objects\weapon\BaseWeapon.h"650 >651 </File>652 <File653 RelativePath="..\..\src\orxonox\objects\weapon\Bullet.h"654 >655 </File>656 <File657 RelativePath="..\..\src\orxonox\objects\weapon\BulletManager.h"658 >659 </File>660 <File661 RelativePath="..\..\src\orxonox\objects\weapon\WeaponStation.h"662 >663 </File>664 </Filter>665 643 </Filter> 666 644 <Filter … … 759 737 </File> 760 738 </Filter> 739 </Filter> 740 <Filter 741 Name="gui" 742 > 743 <File 744 RelativePath="..\..\src\orxonox\gui\GUIManager.h" 745 > 746 </File> 747 <File 748 RelativePath="..\..\src\orxonox\gui\OgreCEGUIRenderer.h" 749 > 750 </File> 751 <File 752 RelativePath="..\..\src\orxonox\gui\OgreCEGUIResourceProvider.h" 753 > 754 </File> 755 <File 756 RelativePath="..\..\src\orxonox\gui\OgreCEGUITexture.h" 757 > 758 </File> 759 </Filter> 760 <Filter 761 Name="gamestates" 762 > 763 <File 764 RelativePath="..\..\src\orxonox\gamestates\GSClient.h" 765 > 766 </File> 767 <File 768 RelativePath="..\..\src\orxonox\gamestates\GSDedicated.h" 769 > 770 </File> 771 <File 772 RelativePath="..\..\src\orxonox\gamestates\GSGraphics.h" 773 > 774 </File> 775 <File 776 RelativePath="..\..\src\orxonox\gamestates\GSGUI.h" 777 > 778 </File> 779 <File 780 RelativePath="..\..\src\orxonox\gamestates\GSIOConsole.h" 781 > 782 </File> 783 <File 784 RelativePath="..\..\src\orxonox\gamestates\GSLevel.h" 785 > 786 </File> 787 <File 788 RelativePath="..\..\src\orxonox\gamestates\GSRoot.h" 789 > 790 </File> 791 <File 792 RelativePath="..\..\src\orxonox\gamestates\GSServer.h" 793 > 794 </File> 795 <File 796 RelativePath="..\..\src\orxonox\gamestates\GSStandalone.h" 797 > 798 </File> 761 799 </Filter> 762 800 </Filter> -
code/trunk/visual_studio/vc8/tolua.vcproj
r1567 r1755 18 18 <Configuration 19 19 Name="Debug|Win32" 20 ConfigurationType=" 4"20 ConfigurationType="2" 21 21 InheritedPropertySheets="$(SolutionDir)base_properties_debug.vsprops;..\tolua_properties.vsprops" 22 22 CharacterSet="1" … … 50 50 /> 51 51 <Tool 52 Name="VCLi brarianTool"52 Name="VCLinkerTool" 53 53 /> 54 54 <Tool 55 55 Name="VCALinkTool" 56 /> 57 <Tool 58 Name="VCManifestTool" 56 59 /> 57 60 <Tool … … 65 68 /> 66 69 <Tool 70 Name="VCAppVerifierTool" 71 /> 72 <Tool 73 Name="VCWebDeploymentTool" 74 /> 75 <Tool 67 76 Name="VCPostBuildEventTool" 68 77 /> … … 70 79 <Configuration 71 80 Name="Release|Win32" 72 ConfigurationType=" 4"81 ConfigurationType="2" 73 82 InheritedPropertySheets="$(SolutionDir)base_properties_release.vsprops;..\tolua_properties.vsprops" 74 83 CharacterSet="1" … … 103 112 /> 104 113 <Tool 105 Name="VCLi brarianTool"114 Name="VCLinkerTool" 106 115 /> 107 116 <Tool 108 117 Name="VCALinkTool" 118 /> 119 <Tool 120 Name="VCManifestTool" 109 121 /> 110 122 <Tool … … 116 128 <Tool 117 129 Name="VCFxCopTool" 130 /> 131 <Tool 132 Name="VCAppVerifierTool" 133 /> 134 <Tool 135 Name="VCWebDeploymentTool" 118 136 /> 119 137 <Tool -
code/trunk/visual_studio/vc8/tolua_app.vcproj
r1631 r1755 153 153 </File> 154 154 <File 155 RelativePath="..\..\src\tolua\toluabind.c" 155 RelativePath="..\..\src\tolua\tolua-5.1.pkg" 156 > 157 <FileConfiguration 158 Name="Debug|Win32" 159 > 160 <Tool 161 Name="VCCustomBuildTool" 162 Description="Generating tolua bind files..." 163 CommandLine=""$(OutDir)\tolua_gen_d.exe" -n tolua -o ../../src/tolua/toluabind_orxonox.c -H ../../src/tolua/toluabind_orxonox.h ../../src/tolua/tolua-5.1.pkg
" 164 Outputs="$(RootDir)\src\tolua\toluabind_orxonox.c; $(RootDir)\src\tolua\toluabind_orxonox.h" 165 /> 166 </FileConfiguration> 167 <FileConfiguration 168 Name="Release|Win32" 169 > 170 <Tool 171 Name="VCCustomBuildTool" 172 Description="Generating tolua bind files..." 173 CommandLine=""$(OutDir)\tolua_gen.exe" -n tolua -o ../../src/tolua/toluabind_orxonox.c -H ../../src/tolua/toluabind_orxonox.h ../../src/tolua/tolua-5.1.pkg
" 174 Outputs="$(RootDir)\src\tolua\toluabind_orxonox.c; $(RootDir)\src\tolua\toluabind_orxonox.h" 175 /> 176 </FileConfiguration> 177 </File> 178 <File 179 RelativePath="..\..\src\tolua\toluabind_orxonox.c" 156 180 > 157 181 </File> … … 162 186 UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" 163 187 > 188 <File 189 RelativePath="..\..\src\tolua\tolua++.h" 190 > 191 </File> 192 <File 193 RelativePath="..\..\src\tolua\toluabind_orxonox.h" 194 > 195 </File> 164 196 </Filter> 165 197 </Files> -
code/trunk/visual_studio/vc8/util.vcproj
r1750 r1755 149 149 > 150 150 <File 151 RelativePath="..\..\src\util\ArgReader.cc"152 >153 </File>154 <File155 151 RelativePath="..\..\src\util\Clipboard.cc" 152 > 153 </File> 154 <File 155 RelativePath="..\..\src\util\CRC32.cc" 156 156 > 157 157 </File> … … 195 195 > 196 196 <File 197 RelativePath="..\..\src\util\ArgReader.h"198 >199 </File>200 <File201 197 RelativePath="..\..\src\util\Clipboard.h" 202 198 > … … 207 203 </File> 208 204 <File 205 RelativePath="..\..\src\util\CRC32.h" 206 > 207 </File> 208 <File 209 209 RelativePath="..\..\src\util\Debug.h" 210 210 > … … 216 216 <File 217 217 RelativePath="..\..\src\util\ExprParser.h" 218 > 219 </File> 220 <File 221 RelativePath="..\..\src\util\Integers.h" 218 222 > 219 223 </File>
Note: See TracChangeset
for help on using the changeset viewer.
