Skip to content

Commit

Permalink
Post-merge fixes: Created project for OPL library. Fixed OPL library to
Browse files Browse the repository at this point in the history
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
haleyjd committed Sep 10, 2010
1 parent 120d90c commit 9f4c5a6
Showing 9 changed files with 419 additions and 103 deletions.
19 changes: 11 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
Makefile.in
Makefile
INSTALL
CMDLINE
autotools
INSTALL
Makefile
Makefile.in
TAGS
aclocal.m4
configure
autom4te.cache
autotools
bin
config.h
config.hin
config.log
config.status
config.h
autom4te.cache
configure
lib
obj
rpm.spec
stamp-h
stamp-h.in
stamp-h1
tags
TAGS

# These are the default patterns globally ignored by Subversion:
*.o
6 changes: 6 additions & 0 deletions msvc/chocolate.sln
Original file line number Diff line number Diff line change
@@ -32,6 +32,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtextscreen", "libtextscr
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Strife", "strife.vcproj", "{FC4DACBA-2A3E-4AF0-804A-AF5FFFD13B08}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libopl", "libopl.vcproj", "{FC8D0610-1507-4F36-99BC-6F5A422B6AD3}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -70,6 +72,10 @@ Global
{FC4DACBA-2A3E-4AF0-804A-AF5FFFD13B08}.Debug|Win32.Build.0 = Debug|Win32
{FC4DACBA-2A3E-4AF0-804A-AF5FFFD13B08}.Release|Win32.ActiveCfg = Release|Win32
{FC4DACBA-2A3E-4AF0-804A-AF5FFFD13B08}.Release|Win32.Build.0 = Release|Win32
{FC8D0610-1507-4F36-99BC-6F5A422B6AD3}.Debug|Win32.ActiveCfg = Debug|Win32
{FC8D0610-1507-4F36-99BC-6F5A422B6AD3}.Debug|Win32.Build.0 = Debug|Win32
{FC8D0610-1507-4F36-99BC-6F5A422B6AD3}.Release|Win32.ActiveCfg = Release|Win32
{FC8D0610-1507-4F36-99BC-6F5A422B6AD3}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
232 changes: 232 additions & 0 deletions msvc/libopl.vcproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,232 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
Name="libopl"
ProjectGUID="{FC8D0610-1507-4F36-99BC-6F5A422B6AD3}"
RootNamespace="libopl"
TargetFrameworkVersion="196613"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="..\lib"
IntermediateDirectory="..\obj\libopl\$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".;..\src"
PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
WarningLevel="3"
DebugInformationFormat="4"
CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="..\lib"
IntermediateDirectory="..\obj\libopl\$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="0"
AdditionalIncludeDirectories=".;..\src"
PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
StringPooling="true"
MinimalRebuild="false"
ExceptionHandling="0"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
WarningLevel="3"
DebugInformationFormat="0"
CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath="..\opl\dbopl.c"
>
</File>
<File
RelativePath="..\opl\ioperm_sys.c"
>
</File>
<File
RelativePath="..\opl\opl.c"
>
</File>
<File
RelativePath="..\opl\opl_linux.c"
>
</File>
<File
RelativePath="..\opl\opl_obsd.c"
>
</File>
<File
RelativePath="..\opl\opl_queue.c"
>
</File>
<File
RelativePath="..\opl\opl_sdl.c"
>
</File>
<File
RelativePath="..\opl\opl_timer.c"
>
</File>
<File
RelativePath="..\opl\opl_win32.c"
>
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath="..\opl\dbopl.h"
>
</File>
<File
RelativePath="..\opl\ioperm_sys.h"
>
</File>
<File
RelativePath="..\opl\opl.h"
>
</File>
<File
RelativePath="..\opl\opl_internal.h"
>
</File>
<File
RelativePath="..\opl\opl_queue.h"
>
</File>
<File
RelativePath="..\opl\opl_timer.h"
>
</File>
</Filter>
<Filter
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
24 changes: 22 additions & 2 deletions msvc/strife.vcproj
Original file line number Diff line number Diff line change
@@ -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=&quot;\&quot;chocolate-\&quot;&quot;"
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"
@@ -301,6 +301,10 @@
RelativePath="..\src\memio.h"
>
</File>
<File
RelativePath="..\src\midifile.h"
>
</File>
<File
RelativePath="..\src\mus2mid.h"
>
@@ -373,6 +377,10 @@
RelativePath="..\src\w_file.h"
>
</File>
<File
RelativePath="..\src\w_main.h"
>
</File>
<File
RelativePath="..\src\w_merge.h"
>
@@ -641,6 +649,10 @@
RelativePath="..\src\i_main.c"
>
</File>
<File
RelativePath="..\src\i_oplmusic.c"
>
</File>
<File
RelativePath="..\src\i_pcsound.c"
>
@@ -713,6 +725,10 @@
RelativePath="..\src\memio.c"
>
</File>
<File
RelativePath="..\src\midifile.c"
>
</File>
<File
RelativePath="..\src\mus2mid.c"
>
@@ -773,6 +789,10 @@
RelativePath="..\src\w_file_win32.c"
>
</File>
<File
RelativePath="..\src\w_main.c"
>
</File>
<File
RelativePath="..\src\w_merge.c"
>
Loading
Oops, something went wrong.

0 comments on commit 9f4c5a6

Please sign in to comment.