[mr1708] Fix build under VC9 x64 configuration.

mangosR2 · Feb 10, 2012 · 457d272 · 457d272
1 parent b910f42
commit 457d272
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/dep/recastnavigation/Detour/win/VC90/Detour.vcproj b/dep/recastnavigation/Detour/win/VC90/Detour.vcproj
@@ -143,8 +143,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="$(ProjectDir)\..\..\..\..\lib\$(PlatformName)_$(ConfigurationName)\"
+			IntermediateDirectory=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>
@@ -205,8 +205,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="$(ProjectDir)\..\..\..\..\lib\$(PlatformName)_$(ConfigurationName)\"
+			IntermediateDirectory=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\"
 			ConfigurationType="4"
 			CharacterSet="2"
 			WholeProgramOptimization="1"

diff --git a/src/shared/revision_R2.h b/src/shared/revision_R2.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_R2_H__
 #define __REVISION_R2_H__
- #define REVISION_R2 "1707"
+ #define REVISION_R2 "1708"
 #endif // __REVISION_R2_H__
diff --git a/win/mangosdVC90.sln b/win/mangosdVC90.sln
@@ -55,7 +55,8 @@ Global
 		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|Win32
 		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug|Win32.ActiveCfg = Debug|Win32
 		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug|Win32.Build.0 = Debug|Win32
-		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug|x64.ActiveCfg = Debug|Win32
+		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug|x64.ActiveCfg = Debug|x64
+		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Debug|x64.Build.0 = Debug|x64
 		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Release|Win32.ActiveCfg = Release|Win32
 		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Release|Win32.Build.0 = Release|Win32
 		{1DC6C4DA-A028-41F3-877D-D5400C594F88}.Release|x64.ActiveCfg = Release|Win32