Windows: Updated to VS2013 and fixed building

ptitSeb · Jan 3, 2017 · 5d82485 · 5d82485
1 parent 89a713d
commit 5d82485
Show file tree

Hide file tree

Showing 13 changed files with 533 additions and 47 deletions.
diff --git a/3D_Engine.cpp b/3D_Engine.cpp
@@ -7,11 +7,7 @@
 /*	============= */
 /*	Include files */
 /*	============= */
-#ifdef linux
-#include "dx_linux.h"
-#else
 #include "dxstdafx.h"
-#endif
 
 #include "StuntCarRacer.h"
 #include "3D_Engine.h"

diff --git a/Backdrop.cpp b/Backdrop.cpp
@@ -7,11 +7,7 @@
 /*	============= */
 /*	Include files */
 /*	============= */
-#ifdef linux
-#include "dx_linux.h"
-#else
 #include "dxstdafx.h"
-#endif
 
 #include "StuntCarRacer.h"
 #include "Backdrop.h"

diff --git a/Car.cpp b/Car.cpp
@@ -7,11 +7,7 @@
 /*	============= */
 /*	Include files */
 /*	============= */
-#ifdef linux
-#include "dx_linux.h"
-#else
 #include "dxstdafx.h"
-#endif
 
 #include "Car.h"
 #include "StuntCarRacer.h"

diff --git a/Car_Behaviour.cpp b/Car_Behaviour.cpp
@@ -43,11 +43,7 @@
 /*	============= */
 /*	Include files */
 /*	============= */
-#ifdef linux
-#include "dx_linux.h"
-#else
 #include "dxstdafx.h"
-#endif
 
 #include <stdlib.h>
 

diff --git a/Common/dxstdafx.h b/Common/dxstdafx.h
@@ -6,6 +6,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 //--------------------------------------------------------------------------------------
 #pragma once
+#ifdef linux
+#include "dx_linux.h"
+#else
 #ifndef DXSDK_STDAFX_H
 #define DXSDK_STDAFX_H
 
@@ -132,3 +135,5 @@
 #endif
 
 #endif // !defined(DXSDK_STDAFX_H)
+
+#endif
diff --git a/Opponent_Behaviour.cpp b/Opponent_Behaviour.cpp
@@ -8,11 +8,7 @@
 /*	============= */
 /*	Include files */
 /*	============= */
-#ifdef linux
-#include "dx_linux.h"
-#else
 #include "dxstdafx.h"
-#endif
 
 #include <stdlib.h>
 

diff --git a/StuntCarRacer.cpp b/StuntCarRacer.cpp
@@ -7,11 +7,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 //--------------------------------------------------------------------------------------
 
-#ifdef linux
-#include "dx_linux.h"
-#else
 #include "dxstdafx.h"
-#endif
+
 #include "resource.h"
 
 #include "StuntCarRacer.h"
@@ -26,7 +23,7 @@
 #ifdef linux
 #define STRING "%S"
 #else
-#define STRING "%s"
+#define STRING L"%s"
 #endif
 
 
@@ -1096,7 +1093,7 @@ static void HandleTrackMenu( CDXUTTextHelper &txtHelper )
 	// output instructions
 	const D3DSURFACE_DESC *pd3dsdBackBuffer = DXUTGetBackBufferSurfaceDesc();
 	txtHelper.SetInsertionPos( 2, pd3dsdBackBuffer->Height-15*8 );
-	txtHelper.DrawFormattedTextLine( L"Current track - " STRING ".  Press 'S' to select, Escape to quit", (TrackID == NO_TRACK ? L"None" : GetTrackName(TrackID)));
+	txtHelper.DrawFormattedTextLine( L"Current track - " STRING L".  Press 'S' to select, Escape to quit", (TrackID == NO_TRACK ? L"None" : GetTrackName(TrackID)));
 
 	if ((keyPress >= firstMenuOption) && (keyPress <= lastMenuOption))
 		{
@@ -1147,7 +1144,7 @@ static void HandleTrackPreview( CDXUTTextHelper &txtHelper )
 	// output instructions
 	const D3DSURFACE_DESC *pd3dsdBackBuffer = DXUTGetBackBufferSurfaceDesc();
 	txtHelper.SetInsertionPos( 2, pd3dsdBackBuffer->Height-15*9 );
-	txtHelper.DrawFormattedTextLine( L"Selected track - " STRING ".  Press 'S' to start game, 'M' for track menu, Escape to quit", (TrackID == NO_TRACK ? L"None" : GetTrackName(TrackID)));
+	txtHelper.DrawFormattedTextLine( L"Selected track - " STRING L".  Press 'S' to start game, 'M' for track menu, Escape to quit", (TrackID == NO_TRACK ? L"None" : GetTrackName(TrackID)));
 	txtHelper.DrawTextLine( L"(Press F4 to change scenery, F9 / F10 to adjust frame rate)" );
 
 	txtHelper.SetInsertionPos( 2, pd3dsdBackBuffer->Height-15*6 );
@@ -1244,7 +1241,7 @@ void RenderText( double fTime )
 			txtHelper.SetInsertionPos( 2, pd3dsdBackBuffer->Height-15*2 );
 			if (lapNumber[PLAYER] > 0)
 				StringCchPrintf( lapText, 3, L"%d", lapNumber[PLAYER] );
-			txtHelper.DrawFormattedTextLine( L"Lap: " STRING "   Boost: %d", lapText, boostReserve );
+			txtHelper.DrawFormattedTextLine( L"Lap: " STRING L"   Boost: %d", lapText, boostReserve );
 			txtHelper.DrawFormattedTextLine( L"Opponent Distance: %d", CalculateOpponentsDistance() );
 			txtHelper.SetInsertionPos( 280, pd3dsdBackBuffer->Height-15*2 );
 			txtHelper.DrawFormattedTextLine( L"Speed: %d", CalculateDisplaySpeed() );

diff --git a/StuntCarRacer_2008.sln b/StuntCarRacer_2008.sln
@@ -1,6 +1,8 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StuntCarRacer", "StuntCarRacer_2008.vcproj", "{D3D09108-96D0-4629-88B8-122C0256058C}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.40629.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StuntCarRacer", "StuntCarRacer_2008.vcxproj", "{D3D09108-96D0-4629-88B8-122C0256058C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution