From 35f753d9e4b9d85cc712262a751729688e32aad6 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Fri, 16 Oct 2009 18:35:19 +0000
Subject: Fix compile under MSVC (thanks entryway).

Subversion-branch: /branches/raven-branch
Subversion-revision: 1718
---
 msvc/doom.vcproj    | 10 +++++++++-
 msvc/heretic.vcproj |  6 +++++-
 msvc/hexen.vcproj   |  2 ++
 msvc/server.vcproj  | 10 +++++++++-
 msvc/setup.vcproj   | 10 +++++++++-
 5 files changed, 34 insertions(+), 4 deletions(-)

(limited to 'msvc')

diff --git a/msvc/doom.vcproj b/msvc/doom.vcproj
index 2c3eb38e..c5714eea 100644
--- a/msvc/doom.vcproj
+++ b/msvc/doom.vcproj
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".;..\src;..\src\doom;..\textscreen;..\pcsound"
-				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROGRAM_PREFIX="\"chocolate-\"""
+				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROGRAM_PREFIX="\"chocolate-\"""
 				MinimalRebuild="true"
 				ExceptionHandling="0"
 				BasicRuntimeChecks="3"
@@ -220,6 +220,10 @@
 				RelativePath="..\src\i_cdmus.h"
 				>
 			</File>
+			<File
+				RelativePath="..\src\i_endoom.h"
+				>
+			</File>
 			<File
 				RelativePath="..\src\i_joystick.h"
 				>
@@ -592,6 +596,10 @@
 				RelativePath="..\src\i_cdmus.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\i_endoom.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\i_joystick.c"
 				>
diff --git a/msvc/heretic.vcproj b/msvc/heretic.vcproj
index c005da49..e9dbb0dd 100644
--- a/msvc/heretic.vcproj
+++ b/msvc/heretic.vcproj
@@ -41,7 +41,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".;..\src;..\src\doom;..\src\heretic;..\textscreen;..\pcsound"
-				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROGRAM_PREFIX=&quot;\&quot;chocolate-\&quot;&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROGRAM_PREFIX=&quot;\&quot;chocolate-\&quot;&quot;"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -195,6 +195,10 @@
 				RelativePath="..\src\i_cdmus.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\i_endoom.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\i_joystick.c"
 				>
diff --git a/msvc/hexen.vcproj b/msvc/hexen.vcproj
index c12e799e..12d247d1 100644
--- a/msvc/hexen.vcproj
+++ b/msvc/hexen.vcproj
@@ -41,6 +41,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".;..\src;..\src\doom;..\src\heretic;..\textscreen;..\pcsound"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROGRAM_PREFIX=&quot;\&quot;chocolate-\&quot;&quot;"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -59,6 +60,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="SDL.lib SDL_mixer.lib SDL_net.lib SDLmain.lib"
 				OutputFile="$(OutDir)\chocolate-hexen-dbg.exe"
 				GenerateDebugInformation="true"
 				SubSystem="1"
diff --git a/msvc/server.vcproj b/msvc/server.vcproj
index 2ba219a6..d692267f 100644
--- a/msvc/server.vcproj
+++ b/msvc/server.vcproj
@@ -41,7 +41,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".;..\src;..\textscreen"
-				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;DEDICATEDSERVER"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;DEDICATEDSERVER"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -189,6 +189,10 @@
 				RelativePath="..\src\i_main.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\i_system.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\i_timer.c"
 				>
@@ -243,6 +247,10 @@
 				RelativePath="..\src\d_mode.h"
 				>
 			</File>
+			<File
+				RelativePath="..\src\i_system.h"
+				>
+			</File>
 			<File
 				RelativePath="..\src\i_timer.h"
 				>
diff --git a/msvc/setup.vcproj b/msvc/setup.vcproj
index cff08ff4..5e2a2efe 100644
--- a/msvc/setup.vcproj
+++ b/msvc/setup.vcproj
@@ -41,7 +41,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".;..\src;..\src\doom;..\textscreen"
-				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;CHOCOLATESETUP"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;CHOCOLATESETUP"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -237,6 +237,10 @@
 				RelativePath="..\setup\txt_mouseinput.c"
 				>
 			</File>
+			<File
+				RelativePath="..\textscreen\txt_scrollpane.c"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -295,6 +299,10 @@
 				RelativePath="..\setup\txt_mouseinput.h"
 				>
 			</File>
+			<File
+				RelativePath="..\textscreen\txt_scrollpane.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
-- 
cgit v1.2.3