fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2024-11-13 00:34:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

reverted the previous NO_WINSDKVER_H patch - not needed after latest SDL

Browse source
This commit is contained in:
Ozkan Sezer 2021-11-06 12:00:00 +03:00
parent 2492689d9e
commit 6cf4bbc198
5 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Quake/Makefile.w32
View file

@ -68,8 +68,6 @@ endif
ifeq ($(USE_SDL2),1) ifeq ($(USE_SDL2),1)
CFLAGS += -DUSE_SDL2 CFLAGS += -DUSE_SDL2
# for compatibility with old sdks
CFLAGS += -DNO_WINSDKVER_H
endif endif
# default to our local SDL[2] for build # default to our local SDL[2] for build

2
Quake/Makefile.w64
View file

@ -66,8 +66,6 @@ endif
ifeq ($(USE_SDL2),1) ifeq ($(USE_SDL2),1)
CFLAGS += -DUSE_SDL2 CFLAGS += -DUSE_SDL2
# for compatibility with old sdks
CFLAGS += -DNO_WINSDKVER_H
endif endif
# default to our local SDL[2] for build # default to our local SDL[2] for build

3
Quake/Makefile.wat
View file

@ -38,7 +38,6 @@ SDL_LIBS = ../Windows/SDL/watcom/SDL.lib
SDL_CFLAGS = -I../Windows/SDL2/include SDL_CFLAGS = -I../Windows/SDL2/include
SDL_LIBS = ../Windows/SDL2/watcom/SDL2.lib SDL_LIBS = ../Windows/SDL2/watcom/SDL2.lib
CFLAGS += -DUSE_SDL2 CFLAGS += -DUSE_SDL2
CFLAGS += -DNO_WINSDKVER_H
!endif !endif
!ifeq WINSOCK2 1 !ifeq WINSOCK2 1
@ -129,7 +128,7 @@ all: quakespasm.exe
SDL_win32_main.obj: ../Windows/SDL/main/SDL_win32_main.c SDL_win32_main.obj: ../Windows/SDL/main/SDL_win32_main.c
wcc386 $(CFLAGS_BASE) $(SDL_CFLAGS) -fo=$^@ $< wcc386 $(CFLAGS_BASE) $(SDL_CFLAGS) -fo=$^@ $<
SDL_windows_main.obj: ../Windows/SDL2/main/SDL_windows_main.c SDL_windows_main.obj: ../Windows/SDL2/main/SDL_windows_main.c
wcc386 $(CFLAGS_BASE) $(SDL_CFLAGS) -DNO_WINSDKVER_H -I../Windows/SDL2/main -fo=$^@ $< wcc386 $(CFLAGS_BASE) $(SDL_CFLAGS) -I../Windows/SDL2/main -fo=$^@ $<
quakespasm.res: ../Windows/QuakeSpasm.rc quakespasm.res: ../Windows/QuakeSpasm.rc
wrc -q -r -bt=nt -I../Windows -fo=$^@ $< wrc -q -r -bt=nt -I../Windows -fo=$^@ $<

1
Windows/CodeBlocks/QuakeSpasm-SDL2.cbp
View file

@ -33,7 +33,6 @@
<Compiler> <Compiler>
<Add option="-Wall" /> <Add option="-Wall" />
<Add option="-DUSE_SDL2" /> <Add option="-DUSE_SDL2" />
<Add option="-DNO_WINSDKVER_H" />
<Add option="-DUSE_CODEC_MP3" /> <Add option="-DUSE_CODEC_MP3" />
<Add option="-DUSE_CODEC_VORBIS" /> <Add option="-DUSE_CODEC_VORBIS" />
<Add option="-DUSE_CODEC_WAVE" /> <Add option="-DUSE_CODEC_WAVE" />

8
Windows/VisualStudio/quakespasm-sdl2.vcproj
View file

@ -41,7 +41,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\SDL2\include;..\codecs\include;..\misc\include;..\..\Quake" AdditionalIncludeDirectories="..\SDL2\include;..\codecs\include;..\misc\include;..\..\Quake"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_SDL2;NO_WINSDKVER_H;USE_CODEC_MP3;USE_CODEC_VORBIS;USE_CODEC_WAVE;USE_CODEC_FLAC;USE_CODEC_OPUS;USE_CODEC_MIKMOD;USE_CODEC_UMX" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_SDL2;USE_CODEC_MP3;USE_CODEC_VORBIS;USE_CODEC_WAVE;USE_CODEC_FLAC;USE_CODEC_OPUS;USE_CODEC_MIKMOD;USE_CODEC_UMX"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -117,7 +117,7 @@
Optimization="2" Optimization="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\SDL2\include;..\codecs\include;..\misc\include;..\..\Quake" AdditionalIncludeDirectories="..\SDL2\include;..\codecs\include;..\misc\include;..\..\Quake"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_SDL2;NO_WINSDKVER_H;USE_CODEC_MP3;USE_CODEC_VORBIS;USE_CODEC_WAVE;USE_CODEC_FLAC;USE_CODEC_OPUS;USE_CODEC_MIKMOD;USE_CODEC_UMX" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_SDL2;USE_CODEC_MP3;USE_CODEC_VORBIS;USE_CODEC_WAVE;USE_CODEC_FLAC;USE_CODEC_OPUS;USE_CODEC_MIKMOD;USE_CODEC_UMX"
RuntimeLibrary="2" RuntimeLibrary="2"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
@ -192,7 +192,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\SDL2\include;..\codecs\include;..\misc\include;..\..\Quake" AdditionalIncludeDirectories="..\SDL2\include;..\codecs\include;..\misc\include;..\..\Quake"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USE_WINSOCK2;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_SDL2;NO_WINSDKVER_H;USE_CODEC_MP3;USE_CODEC_VORBIS;USE_CODEC_WAVE;USE_CODEC_FLAC;USE_CODEC_OPUS;USE_CODEC_MIKMOD;USE_CODEC_UMX" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USE_WINSOCK2;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_SDL2;USE_CODEC_MP3;USE_CODEC_VORBIS;USE_CODEC_WAVE;USE_CODEC_FLAC;USE_CODEC_OPUS;USE_CODEC_MIKMOD;USE_CODEC_UMX"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -269,7 +269,7 @@
Optimization="2" Optimization="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\SDL2\include;..\codecs\include;..\misc\include;..\..\Quake" AdditionalIncludeDirectories="..\SDL2\include;..\codecs\include;..\misc\include;..\..\Quake"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USE_WINSOCK2;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_SDL2;NO_WINSDKVER_H;USE_CODEC_MP3;USE_CODEC_VORBIS;USE_CODEC_WAVE;USE_CODEC_FLAC;USE_CODEC_OPUS;USE_CODEC_MIKMOD;USE_CODEC_UMX" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USE_WINSOCK2;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_SDL2;USE_CODEC_MP3;USE_CODEC_VORBIS;USE_CODEC_WAVE;USE_CODEC_FLAC;USE_CODEC_OPUS;USE_CODEC_MIKMOD;USE_CODEC_UMX"
RuntimeLibrary="2" RuntimeLibrary="2"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"