stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-21 12:01:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add libopenmpt to VC10 project

Browse source
This commit is contained in:
Marco Z 2019-01-03 18:46:30 -05:00
parent d1534257dd
commit 6d2ef74b21
5 changed files with 33 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libs/libopenmpt.props Normal file
View file

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<IncludePath>$(SolutionDir)libs\libopenmpt\inc;$(IncludePath)</IncludePath>
<LibraryPath Condition="'$(Platform)' == 'Win32'">$(SolutionDir)libs\libopenmpt\lib\x86;$(LibraryPath)</LibraryPath>
<LibraryPath Condition="'$(Platform)' == 'x64'">$(SolutionDir)libs\libopenmpt\lib\x86_64;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup>
<Link>
<AdditionalDependencies>libopenmpt.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup />
</Project>

7
src/doomtype.h
View file

@ -29,6 +29,12 @@
/* 7.18.1.1 Exact-width integer types */ /* 7.18.1.1 Exact-width integer types */
#ifdef _MSC_VER #ifdef _MSC_VER
// libopenmpt.h will include stdint.h later;
// include it now so that INT8_MAX etc. don't get redefined
#ifdef HAVE_OPENMPT
#include <stdint.h>
#endif
#define UINT8 unsigned __int8 #define UINT8 unsigned __int8
#define SINT8 signed __int8 #define SINT8 signed __int8
@ -206,6 +212,7 @@ size_t strlcpy(char *dst, const char *src, size_t siz);
#endif // __BYTEBOOL__ #endif // __BYTEBOOL__
/* 7.18.2.1 Limits of exact-width integer types */ /* 7.18.2.1 Limits of exact-width integer types */
#ifndef INT8_MIN #ifndef INT8_MIN
#define INT8_MIN (-128) #define INT8_MIN (-128)
#endif #endif

3
src/sdl/Srb2SDL-vc10.vcxproj
View file

@ -93,6 +93,7 @@
<Import Project="..\..\libs\libpng.props" /> <Import Project="..\..\libs\libpng.props" />
<Import Project="..\..\libs\SDL2.props" /> <Import Project="..\..\libs\SDL2.props" />
<Import Project="..\..\libs\SDL_mixer.props" /> <Import Project="..\..\libs\SDL_mixer.props" />
<Import Project="..\..\libs\libopenmpt.props" />
<Import Project="Srb2SDL.props" /> <Import Project="Srb2SDL.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@ -291,6 +292,7 @@
<ClInclude Include="endtxt.h" /> <ClInclude Include="endtxt.h" />
<ClInclude Include="hwsym_sdl.h" /> <ClInclude Include="hwsym_sdl.h" />
<ClInclude Include="i_ttf.h" /> <ClInclude Include="i_ttf.h" />
<ClInclude Include="load_libraries.h" />
<ClInclude Include="ogl_sdl.h" /> <ClInclude Include="ogl_sdl.h" />
<ClInclude Include="sdlmain.h" /> <ClInclude Include="sdlmain.h" />
</ItemGroup> </ItemGroup>
@ -465,6 +467,7 @@
<ClCompile Include="i_system.c" /> <ClCompile Include="i_system.c" />
<ClCompile Include="i_ttf.c" /> <ClCompile Include="i_ttf.c" />
<ClCompile Include="i_video.c" /> <ClCompile Include="i_video.c" />
<ClCompile Include="load_libraries.c" />
<ClCompile Include="mixer_sound.c" /> <ClCompile Include="mixer_sound.c" />
<ClCompile Include="ogl_sdl.c" /> <ClCompile Include="ogl_sdl.c" />
<ClCompile Include="SDL_main\SDL_windows_main.c" /> <ClCompile Include="SDL_main\SDL_windows_main.c" />

6
src/sdl/Srb2SDL-vc10.vcxproj.filters
View file

@ -447,6 +447,9 @@
<ClInclude Include="sdlmain.h"> <ClInclude Include="sdlmain.h">
<Filter>SDLApp</Filter> <Filter>SDLApp</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="load_libraries.h">
<Filter>SDLApp</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<CustomBuild Include="..\tmap.nas"> <CustomBuild Include="..\tmap.nas">
@ -885,6 +888,9 @@
<ClCompile Include="SDL_main\SDL_windows_main.c"> <ClCompile Include="SDL_main\SDL_windows_main.c">
<Filter>SDLApp</Filter> <Filter>SDLApp</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="load_libraries.c">
<Filter>SDLApp</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Image Include="Srb2SDL.ico"> <Image Include="Srb2SDL.ico">

2
src/sdl/Srb2SDL.props
View file

@ -5,7 +5,7 @@
<PropertyGroup /> <PropertyGroup />
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile> <ClCompile>
<PreprocessorDefinitions>USE_WGL_SWAP;DIRECTFULLSCREEN;HAVE_SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;SDLMAIN;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>USE_WGL_SWAP;DIRECTFULLSCREEN;HAVE_SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;HAVE_OPENMPT;SDLMAIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup /> <ItemGroup />