From af45b9f4614d7018146e68832de3bccb1c73f7e7 Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Thu, 17 Jan 2013 13:31:30 +0000 Subject: Use SDL 2 instead of SDL 1.2 --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d43ead79..d23a27d2 100644 --- a/Makefile +++ b/Makefile @@ -258,15 +258,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 -- cgit