zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 08:51:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

- moved compression utilities to a 'thirdparty' folder to get them out of the way.

Browse source 
# Conflicts:
#	platform/Windows/build.vcxproj
#	platform/Windows/props/build_common.props
This commit is contained in:
Christoph Oelckers 2019-09-09 21:54:07 +02:00
parent 129cf2c76f
commit f3d01e8244
11 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
platform/Windows/build.vcxproj
View file

@ -229,13 +229,7 @@
<ClCompile Include="..\..\source\build\src\hightile.cpp" />
<ClCompile Include="..\..\source\build\src\klzw.cpp" />
<ClCompile Include="..\..\source\build\src\kplib.cpp" />
<ClCompile Include="..\..\source\build\src\lunatic.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\source\build\src\lz4.c" />
<ClCompile Include="..\..\source\thirdparty\src\lz4.c" />
<ClCompile Include="..\..\source\build\src\md4.cpp" />
<ClCompile Include="..\..\source\build\src\mdsprite.cpp" />
<ClCompile Include="..\..\source\build\src\mhk.cpp" />
@ -245,14 +239,14 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\source\build\src\miniz.c">
<ClCompile Include="..\..\source\thirdparty\src\miniz.c">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\source\build\src\miniz_tdef.c" />
<ClCompile Include="..\..\source\build\src\miniz_tinfl.c" />
<ClCompile Include="..\..\source\thirdparty\src\miniz_tdef.c" />
<ClCompile Include="..\..\source\thirdparty\src\miniz_tinfl.c" />
<ClCompile Include="..\..\source\build\src\mmulti_null.cpp" />
<ClCompile Include="..\..\source\build\src\mutex.cpp" />
<ClCompile Include="..\..\source\build\src\osd.cpp" />

2
platform/Windows/props/build_common.props
View file

@ -6,7 +6,7 @@
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;RENDERTYPESDL=1;MIXERTYPEWIN=1;SDL_USEFOLDER;SDL_TARGET=2;USE_OPENGL=1;STARTUP_WINDOW;USE_LIBVPX;HAVE_VORBIS;HAVE_XMP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>./include;./include/vpx/;./include/sdl2/;../../source/build/include;../../source/mact/include;../../source/audiolib/include;../../source/enet/include;../../source/glad/include;../../source/libxmp-lite/include;../../source/libxmp-lite/include/libxmp-lite;../../source/libsmackerdec/include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>./include;./include/vpx/;./include/sdl2/;../../source/build/include;../../source/mact/include;../../source/audiolib/include;../../source/enet/include;../../source/glad/include;../../source/libxmp-lite/include;../../source/libxmp-lite/include/libxmp-lite;../../source/libsmackerdec/include;../../source/thirdparty/include</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4996;4244;4018;4267</DisableSpecificWarnings>
<AdditionalOptions>/J %(AdditionalOptions)</AdditionalOptions>
</ClCompile>

0
source/build/include/lz4.h → source/thirdparty/include/lz4.h vendored
View file

0
source/build/include/miniz.h → source/thirdparty/include/miniz.h vendored
View file

0
source/build/include/miniz_common.h → source/thirdparty/include/miniz_common.h vendored
View file

0
source/build/include/miniz_tdef.h → source/thirdparty/include/miniz_tdef.h vendored
View file

0
source/build/include/miniz_tinfl.h → source/thirdparty/include/miniz_tinfl.h vendored
View file

0
source/build/src/lz4.c → source/thirdparty/src/lz4.c vendored
View file

0
source/build/src/miniz.c → source/thirdparty/src/miniz.c vendored
View file

0
source/build/src/miniz_tdef.c → source/thirdparty/src/miniz_tdef.c vendored
View file

0
source/build/src/miniz_tinfl.c → source/thirdparty/src/miniz_tinfl.c vendored
View file