Use SDL 2 instead of SDL 1.2
This commit is contained in:
1 parent
4432a80a3c
commit
f478761e07
13 files changed
+404
-540
No files matched your search
@@ -254,15 +254,15 @@ ifneq ($(BUILD_CLIENT),0)
|
||||
CURL_LIBS=$(shell pkg-config --silence-errors --libs libcurl)
|
||||
OPENAL_CFLAGS=$(shell pkg-config --silence-errors --cflags openal)
|
||||
OPENAL_LIBS=$(shell pkg-config --silence-errors --libs openal)
|
||||
SDL_CFLAGS=$(shell pkg-config --silence-errors --cflags sdl|sed 's/-Dmain=SDL_main//')
|
||||
SDL_LIBS=$(shell pkg-config --silence-errors --libs sdl)
|
||||
SDL_CFLAGS=$(shell pkg-config --silence-errors --cflags sdl2|sed 's/-Dmain=SDL_main//')
|
||||
SDL_LIBS=$(shell pkg-config --silence-errors --libs sdl2)
|
||||
FREETYPE_CFLAGS=$(shell pkg-config --silence-errors --cflags freetype2)
|
||||
endif
|
||||
# Use sdl-config if all else fails
|
||||
ifeq ($(SDL_CFLAGS),)
|
||||
ifneq ($(call bin_path, sdl-config),)
|
||||
SDL_CFLAGS=$(shell sdl-config --cflags)
|
||||
SDL_LIBS=$(shell sdl-config --libs)
|
||||
ifneq ($(call bin_path, sdl2-config),)
|
||||
SDL_CFLAGS=$(shell sdl2-config --cflags)
|
||||
SDL_LIBS=$(shell sdl2-config --libs)
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
Reference in new issue
Block a user