diff options
author | Andre Susano Pinto <andresusanopinto@gmail.com> | 2008-08-18 18:33:26 +0400 |
---|---|---|
committer | Andre Susano Pinto <andresusanopinto@gmail.com> | 2008-08-18 18:33:26 +0400 |
commit | 2ce338f7e80094ad50cf1b30cc47ad6b85ae55b3 (patch) | |
tree | 5929445c89798ab71f55fcd9e64b734caf761b14 /projectfiles_vc7 | |
parent | a88eb64f70750de50fe153c147382261867ae1be (diff) |
svn merge -r 16077:16174 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'projectfiles_vc7')
-rw-r--r-- | projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj | 6 | ||||
-rw-r--r-- | projectfiles_vc7/kernel/system/SYS_system.vcproj | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj b/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj index 7e2db4f564f..5f14b5a09a1 100644 --- a/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj +++ b/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj @@ -348,6 +348,9 @@ RelativePath="..\..\..\source\gameengine\GameLogic\SCA_ANDController.cpp"> </File> <File + RelativePath="..\..\..\source\gameengine\GameLogic\SCA_DelaySensor.cpp"> + </File> + <File RelativePath="..\..\..\source\gameengine\GameLogic\SCA_EventManager.cpp"> </File> <File @@ -466,6 +469,9 @@ RelativePath="..\..\..\source\gameengine\GameLogic\SCA_ANDController.h"> </File> <File + RelativePath="..\..\..\source\gameengine\GameLogic\SCA_DelaySensor.h"> + </File> + <File RelativePath="..\..\..\source\gameengine\GameLogic\SCA_EventManager.h"> </File> <File diff --git a/projectfiles_vc7/kernel/system/SYS_system.vcproj b/projectfiles_vc7/kernel/system/SYS_system.vcproj index 50ffc1fbb99..3b239d9088b 100644 --- a/projectfiles_vc7/kernel/system/SYS_system.vcproj +++ b/projectfiles_vc7/kernel/system/SYS_system.vcproj @@ -125,7 +125,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include" + AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include" PreprocessorDefinitions="_DEBUG,WIN32,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -177,7 +177,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include" + AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include" PreprocessorDefinitions="NDEBUG,WIN32,_LIB" StringPooling="TRUE" RuntimeLibrary="0" @@ -229,7 +229,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include" + AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include" PreprocessorDefinitions="_DEBUG,WIN32,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -281,7 +281,7 @@ <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include" + AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include" PreprocessorDefinitions="NDEBUG,WIN32,_LIB" StringPooling="TRUE" RuntimeLibrary="0" |