From ea4b0d0df23ae4981b4d4585f043bd04a8a137ad Mon Sep 17 00:00:00 2001 From: havoc Date: Mon, 4 Apr 2016 22:18:51 +0000 Subject: [PATCH] Change makefile.inc to use SDL2 by default rather than SDL1.2 - removed sdl2-* targets since they are not needed now. git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12253 d7cf8633-e32d-0410-b094-e92efae38249 ::stable-branch::merge=786493a91d61c3bf939a0fc36642dae16a9c7a6b --- makefile.inc | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/makefile.inc b/makefile.inc index f6d3838c..547844ab 100644 --- a/makefile.inc +++ b/makefile.inc @@ -25,17 +25,16 @@ CC?=gcc CPUOPTIMIZATIONS?=-fno-math-errno -ffinite-math-only -fno-rounding-math -fno-signaling-nans -fno-trapping-math # NOTE: *never* *ever* use the -ffast-math or -funsafe-math-optimizations flag -SDL_CONFIG?=sdl-config -SDL2_CONFIG?=sdl2-config +SDL_CONFIG?=sdl2-config SDLCONFIG_UNIXCFLAGS?=`$(SDL_CONFIG) --cflags` SDLCONFIG_UNIXCFLAGS_X11?= SDLCONFIG_UNIXLIBS?=`$(SDL_CONFIG) --libs` SDLCONFIG_UNIXLIBS_X11?=-lX11 SDLCONFIG_UNIXSTATICLIBS?=`$(SDL_CONFIG) --static-libs` SDLCONFIG_UNIXSTATICLIBS_X11?=-lX11 -SDLCONFIG_MACOSXCFLAGS=-I/Library/Frameworks/SDL.framework/Headers -I$(HOME)/Library/Frameworks/SDL.framework/Headers -SDLCONFIG_MACOSXLIBS=-F$(HOME)/Library/Frameworks/ -framework SDL -framework Cocoa $(SDLCONFIG_MACOSXCFLAGS) -SDLCONFIG_MACOSXSTATICLIBS=-F$(HOME)/Library/Frameworks/ -framework SDL -framework Cocoa $(SDLCONFIG_MACOSXCFLAGS) +SDLCONFIG_MACOSXCFLAGS=-I/Library/Frameworks/SDL2.framework/Headers -I$(HOME)/Library/Frameworks/SDL2.framework/Headers +SDLCONFIG_MACOSXLIBS=-F$(HOME)/Library/Frameworks/ -framework SDL2 -framework Cocoa $(SDLCONFIG_MACOSXCFLAGS) +SDLCONFIG_MACOSXSTATICLIBS=-F$(HOME)/Library/Frameworks/ -framework SDL2 -framework Cocoa $(SDLCONFIG_MACOSXCFLAGS) STRIP?=strip @@ -331,11 +330,6 @@ help: @echo "* $(MAKE) sdl-release-profile : make SDL client (release version)" @echo "* $(MAKE) sdl-release : make SDL client (release version)" @echo "* $(MAKE) sdl-nexuiz : make SDL client with nexuiz icon (release version)" - @echo "* $(MAKE) sdl2-debug : make SDL2 client (debug version)" - @echo "* $(MAKE) sdl2-profile : make SDL2 client (profile version)" - @echo "* $(MAKE) sdl2-release-profile : make SDL2 client (release profile version)" - @echo "* $(MAKE) sdl2-release : make SDL2 client (release version)" - @echo "* $(MAKE) sdl2-nexuiz : make SDL2 client with nexuiz icon (release version)" @echo debug : @@ -428,21 +422,6 @@ sdl-nexuiz : DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ EXE='$(EXE_SDLNEXUIZ)' CFLAGS_FEATURES='$(CFLAGS_CLIENT)' LDFLAGS_COMMON='$(LDFLAGS_SDL)' LEVEL=1 -sdl2-debug : - $(MAKE) SDL_CONFIG=$(SDL2_CONFIG) sdl-debug - -sdl2-profile : - $(MAKE) SDL_CONFIG=$(SDL2_CONFIG) sdl-profile - -sdl2-release : - $(MAKE) SDL_CONFIG=$(SDL2_CONFIG) sdl-release - -sdl2-release-profile : - $(MAKE) SDL_CONFIG=$(SDL2_CONFIG) sdl-release-profile - -sdl2-nexuiz : - $(MAKE) SDL_CONFIG=$(SDL2_CONFIG) sdl-nexuiz - bin-debug : $(CHECKLEVEL1) @echo -- 2.39.2