diff options
| author | James Haley | 2010-09-10 01:53:57 +0000 |
|---|---|---|
| committer | James Haley | 2010-09-10 01:53:57 +0000 |
| commit | 9f4c5a6ed4e490fb51aa207c2def75fcb2622584 (patch) | |
| tree | 3f12bb085abcd77e071091bcd431e6c376288397 /msvc/strife.vcproj | |
| parent | 120d90c67b2a4aa0a8883c4897241dee2222acd2 (diff) | |
| download | chocolate-doom-9f4c5a6ed4e490fb51aa207c2def75fcb2622584.tar.gz chocolate-doom-9f4c5a6ed4e490fb51aa207c2def75fcb2622584.tar.bz2 chocolate-doom-9f4c5a6ed4e490fb51aa207c2def75fcb2622584.zip | |
Post-merge fixes: Created project for OPL library. Fixed OPL library to
not use GNU C-isms such as inline keyword, declaration/statement mixing,
and strange calling convention syntax for import function pointers.
Fixed critical buffer overflow in M_BindChatControls - should be
back-merged immediately. Added autogenerated directories *back* to
ignore list.
Subversion-branch: /branches/strife-branch
Subversion-revision: 2052
Diffstat (limited to 'msvc/strife.vcproj')
| -rw-r--r-- | msvc/strife.vcproj | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/msvc/strife.vcproj b/msvc/strife.vcproj index a78a52e6..63778125 100644 --- a/msvc/strife.vcproj +++ b/msvc/strife.vcproj @@ -41,7 +41,7 @@ <Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=".;..\src;..\src\strife;..\src\doom;..\textscreen;..\pcsound"
+ AdditionalIncludeDirectories=".;..\src;..\src\strife;..\src\doom;..\textscreen;..\pcsound;..\opl"
PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROGRAM_PREFIX="\"chocolate-\"""
MinimalRebuild="true"
ExceptionHandling="0"
@@ -66,7 +66,7 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="SDL.lib SDL_mixer.lib SDL_net.lib SDLmain.lib ..\lib\libpcsound.lib ..\lib\libtextscreen.lib"
+ AdditionalDependencies="SDL.lib SDL_mixer.lib SDL_net.lib SDLmain.lib ..\lib\libpcsound.lib ..\lib\libtextscreen.lib ..\lib\libopl.lib"
OutputFile="$(OutDir)\chocolate-strife-dbg.exe"
LinkIncremental="2"
IgnoreDefaultLibraryNames="msvcrtd.lib"
@@ -302,6 +302,10 @@ >
</File>
<File
+ RelativePath="..\src\midifile.h"
+ >
+ </File>
+ <File
RelativePath="..\src\mus2mid.h"
>
</File>
@@ -374,6 +378,10 @@ >
</File>
<File
+ RelativePath="..\src\w_main.h"
+ >
+ </File>
+ <File
RelativePath="..\src\w_merge.h"
>
</File>
@@ -642,6 +650,10 @@ >
</File>
<File
+ RelativePath="..\src\i_oplmusic.c"
+ >
+ </File>
+ <File
RelativePath="..\src\i_pcsound.c"
>
</File>
@@ -714,6 +726,10 @@ >
</File>
<File
+ RelativePath="..\src\midifile.c"
+ >
+ </File>
+ <File
RelativePath="..\src\mus2mid.c"
>
</File>
@@ -774,6 +790,10 @@ >
</File>
<File
+ RelativePath="..\src\w_main.c"
+ >
+ </File>
+ <File
RelativePath="..\src\w_merge.c"
>
</File>
|