diff options
| author | James Haley | 2010-01-26 00:59:02 +0000 |
|---|---|---|
| committer | James Haley | 2010-01-26 00:59:02 +0000 |
| commit | b80409202d07732ec201c9816887262b505b81d4 (patch) | |
| tree | 364dcb86f2c22411a720447bfa21c4de9191ff6f /msvc | |
| parent | 66e8dc63bd0b384c99f0d0ff60b3d75c42d441b1 (diff) | |
| parent | 8f6edc1f7402215c5e38d1f03939ce6b5ff5e3ae (diff) | |
| download | chocolate-doom-b80409202d07732ec201c9816887262b505b81d4.tar.gz chocolate-doom-b80409202d07732ec201c9816887262b505b81d4.tar.bz2 chocolate-doom-b80409202d07732ec201c9816887262b505b81d4.zip | |
Merge from raven-branch
Subversion-branch: /branches/strife-branch
Subversion-revision: 1825
Diffstat (limited to 'msvc')
| -rw-r--r-- | msvc/doom.vcproj | 10 | ||||
| -rw-r--r-- | msvc/heretic.vcproj | 6 | ||||
| -rw-r--r-- | msvc/hexen.vcproj | 2 | ||||
| -rw-r--r-- | msvc/server.vcproj | 10 | ||||
| -rw-r--r-- | msvc/setup.vcproj | 10 |
5 files changed, 34 insertions, 4 deletions
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"
@@ -221,6 +221,10 @@ >
</File>
<File
+ RelativePath="..\src\i_endoom.h"
+ >
+ </File>
+ <File
RelativePath="..\src\i_joystick.h"
>
</File>
@@ -593,6 +597,10 @@ >
</File>
<File
+ RelativePath="..\src\i_endoom.c"
+ >
+ </File>
+ <File
RelativePath="..\src\i_joystick.c"
>
</File>
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="\"chocolate-\"""
+ PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROGRAM_PREFIX="\"chocolate-\"""
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -196,6 +196,10 @@ >
</File>
<File
+ RelativePath="..\src\i_endoom.c"
+ >
+ </File>
+ <File
RelativePath="..\src\i_joystick.c"
>
</File>
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="\"chocolate-\"""
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"
@@ -190,6 +190,10 @@ >
</File>
<File
+ RelativePath="..\src\i_system.c"
+ >
+ </File>
+ <File
RelativePath="..\src\i_timer.c"
>
</File>
@@ -244,6 +248,10 @@ >
</File>
<File
+ RelativePath="..\src\i_system.h"
+ >
+ </File>
+ <File
RelativePath="..\src\i_timer.h"
>
</File>
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"
|