Changeset 1638 for code/branches/gui/visual_studio/vc8
- Timestamp:
- Jul 20, 2008, 7:49:26 PM (16 years ago)
- Location:
- code/branches/gui
- Files:
-
- 1 added
- 6 edited
-
. (modified) (1 prop)
-
visual_studio/vc8/core.vcproj (modified) (9 diffs)
-
visual_studio/vc8/ois.vcproj (modified) (2 diffs)
-
visual_studio/vc8/orxonox.vcproj (modified) (5 diffs)
-
visual_studio/vc8/tolua.vcproj (modified) (6 diffs)
-
visual_studio/vc8/tolua_app.vcproj (modified) (2 diffs)
-
visual_studio/vc8/tolua_gen.vcproj (added)
Legend:
- Unmodified
- Added
- Removed
-
code/branches/gui
-
Property
svn:mergeinfo
set to
/code/branches/input merged eligible
-
Property
svn:mergeinfo
set to
-
code/branches/gui/visual_studio/vc8/core.vcproj
r1631 r1638 165 165 </File> 166 166 <File 167 RelativePath="..\..\src\core\Exception.cc" 168 > 169 </File> 170 <File 167 171 RelativePath="..\..\src\core\Language.cc" 168 172 > … … 194 198 RelativePath="..\..\src\core\tolua\tolua.pkg" 195 199 > 200 <FileConfiguration 201 Name="Debug|Win32" 202 > 203 <Tool 204 Name="VCCustomBuildTool" 205 Description="Generating tolua bind files..." 206 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
" 207 Outputs="$(RootDir)\src\core\tolua\tolua_bind.cc; $(RootDir)\src\core\tolua\tolua_bind.h" 208 /> 209 </FileConfiguration> 196 210 <FileConfiguration 197 211 Name="Release|Win32" … … 200 214 Name="VCCustomBuildTool" 201 215 Description="Generating tolua bind files..." 202 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"216 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
" 203 217 Outputs="$(RootDir)\src\core\tolua\tolua_bind.cc; $(RootDir)\src\core\tolua\tolua_bind.h" 204 218 /> … … 294 308 </File> 295 309 <File 310 RelativePath="..\..\src\core\input\ExtendedInputState.cc" 311 > 312 </File> 313 <File 296 314 RelativePath="..\..\src\core\input\HalfAxis.cc" 297 315 > … … 315 333 <File 316 334 RelativePath="..\..\src\core\input\KeyDetector.cc" 335 > 336 </File> 337 <File 338 RelativePath="..\..\src\core\input\SimpleInputState.cc" 317 339 > 318 340 </File> … … 373 395 </File> 374 396 <File 397 RelativePath="..\..\src\core\Exception.h" 398 > 399 </File> 400 <File 375 401 RelativePath="..\..\src\core\Language.h" 376 402 > … … 412 438 </File> 413 439 <File 440 RelativePath="..\..\src\core\input\ExtendedInputState.h" 441 > 442 </File> 443 <File 414 444 RelativePath="..\..\src\core\input\HalfAxis.h" 415 445 > … … 432 462 </File> 433 463 <File 464 RelativePath="..\..\src\core\input\InputState.h" 465 > 466 </File> 467 <File 434 468 RelativePath="..\..\src\core\input\KeyBinder.h" 435 469 > … … 437 471 <File 438 472 RelativePath="..\..\src\core\input\KeyDetector.h" 473 > 474 </File> 475 <File 476 RelativePath="..\..\src\core\input\SimpleInputState.h" 439 477 > 440 478 </File> -
code/branches/gui/visual_studio/vc8/ois.vcproj
r1625 r1638 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/branches/gui/visual_studio/vc8/orxonox.vcproj
r1625 r1638 285 285 > 286 286 </File> 287 <Filter288 Name="weapon"289 >290 <File291 RelativePath="..\..\src\orxonox\objects\weapon\AmmunitionDump.cc"292 >293 <FileConfiguration294 Name="Debug|Win32"295 ExcludedFromBuild="true"296 >297 <Tool298 Name="VCCLCompilerTool"299 />300 </FileConfiguration>301 <FileConfiguration302 Name="Release|Win32"303 ExcludedFromBuild="true"304 >305 <Tool306 Name="VCCLCompilerTool"307 />308 </FileConfiguration>309 </File>310 <File311 RelativePath="..\..\src\orxonox\objects\weapon\BarrelGun.cc"312 >313 <FileConfiguration314 Name="Debug|Win32"315 ExcludedFromBuild="true"316 >317 <Tool318 Name="VCCLCompilerTool"319 />320 </FileConfiguration>321 <FileConfiguration322 Name="Release|Win32"323 ExcludedFromBuild="true"324 >325 <Tool326 Name="VCCLCompilerTool"327 />328 </FileConfiguration>329 </File>330 <File331 RelativePath="..\..\src\orxonox\objects\weapon\BaseWeapon.cc"332 >333 <FileConfiguration334 Name="Debug|Win32"335 ExcludedFromBuild="true"336 >337 <Tool338 Name="VCCLCompilerTool"339 />340 </FileConfiguration>341 <FileConfiguration342 Name="Release|Win32"343 ExcludedFromBuild="true"344 >345 <Tool346 Name="VCCLCompilerTool"347 />348 </FileConfiguration>349 </File>350 <File351 RelativePath="..\..\src\orxonox\objects\weapon\Bullet.cc"352 >353 <FileConfiguration354 Name="Debug|Win32"355 ExcludedFromBuild="true"356 >357 <Tool358 Name="VCCLCompilerTool"359 />360 </FileConfiguration>361 <FileConfiguration362 Name="Release|Win32"363 ExcludedFromBuild="true"364 >365 <Tool366 Name="VCCLCompilerTool"367 />368 </FileConfiguration>369 </File>370 <File371 RelativePath="..\..\src\orxonox\objects\weapon\BulletManager.cc"372 >373 <FileConfiguration374 Name="Debug|Win32"375 ExcludedFromBuild="true"376 >377 <Tool378 Name="VCCLCompilerTool"379 />380 </FileConfiguration>381 <FileConfiguration382 Name="Release|Win32"383 ExcludedFromBuild="true"384 >385 <Tool386 Name="VCCLCompilerTool"387 />388 </FileConfiguration>389 </File>390 <File391 RelativePath="..\..\src\orxonox\objects\weapon\WeaponStation.cc"392 >393 <FileConfiguration394 Name="Debug|Win32"395 ExcludedFromBuild="true"396 >397 <Tool398 Name="VCCLCompilerTool"399 />400 </FileConfiguration>401 <FileConfiguration402 Name="Release|Win32"403 ExcludedFromBuild="true"404 >405 <Tool406 Name="VCCLCompilerTool"407 />408 </FileConfiguration>409 </File>410 </Filter>411 287 </Filter> 412 288 <Filter … … 445 321 Name="tolua" 446 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> 447 349 <File 448 350 RelativePath="..\..\src\orxonox\tolua\tolua_bind.cc" … … 521 423 </File> 522 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> 523 493 </Filter> 524 494 </Filter> … … 627 597 > 628 598 </File> 629 <Filter630 Name="weapon"631 >632 <File633 RelativePath="..\..\src\orxonox\objects\weapon\AmmunitionDump.h"634 >635 </File>636 <File637 RelativePath="..\..\src\orxonox\objects\weapon\BarrelGun.h"638 >639 </File>640 <File641 RelativePath="..\..\src\orxonox\objects\weapon\BaseWeapon.h"642 >643 </File>644 <File645 RelativePath="..\..\src\orxonox\objects\weapon\Bullet.h"646 >647 </File>648 <File649 RelativePath="..\..\src\orxonox\objects\weapon\BulletManager.h"650 >651 </File>652 <File653 RelativePath="..\..\src\orxonox\objects\weapon\WeaponStation.h"654 >655 </File>656 </Filter>657 599 </Filter> 658 600 <Filter … … 751 693 </File> 752 694 </Filter> 695 </Filter> 696 <Filter 697 Name="gui" 698 > 699 <File 700 RelativePath="..\..\src\orxonox\gui\GUIManager.h" 701 > 702 </File> 703 <File 704 RelativePath="..\..\src\orxonox\gui\OgreCEGUIRenderer.h" 705 > 706 </File> 707 <File 708 RelativePath="..\..\src\orxonox\gui\OgreCEGUIResourceProvider.h" 709 > 710 </File> 711 <File 712 RelativePath="..\..\src\orxonox\gui\OgreCEGUITexture.h" 713 > 714 </File> 753 715 </Filter> 754 716 </Filter> -
code/branches/gui/visual_studio/vc8/tolua.vcproj
r1567 r1638 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/branches/gui/visual_studio/vc8/tolua_app.vcproj
r1631 r1638 153 153 </File> 154 154 <File 155 RelativePath="..\..\src\tolua\toluabind.c" 155 RelativePath="..\..\src\tolua\tolua.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.cc -H ../../src/tolua/toluabind_orxonox.h ../../src/tolua/tolua.pkg" 164 Outputs="$(RootDir)\src\tolua\toluabind_orxonox.cc; $(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.cc -H ../../src/tolua/toluabind_orxonox.h ../../src/tolua/tolua.pkg" 174 Outputs="$(RootDir)\src\tolua\toluabind_orxonox.cc; $(RootDir)\src\tolua\toluabind_orxonox.h" 175 /> 176 </FileConfiguration> 177 </File> 178 <File 179 RelativePath="..\..\src\tolua\toluabind_orxonox.cc" 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>
Note: See TracChangeset
for help on using the changeset viewer.
