diff --git a/makefile b/makefile index e1234641..57099fe7 100644 --- a/makefile +++ b/makefile @@ -313,22 +313,21 @@ ifeq ($(WIN32),) #*nix Environments (&& cygwin) OS_CCDEFS += -DHAVE_FNMATCH endif endif - ifneq (,$(call find_include,SDL/SDL)) - SDL_VERSION = $(shell grep SDL_MAJOR_VERSION $(call find_include,SDL/SDL_version) | awk '{ print $$3 }') - ifeq (2,$(SDL_VERSION)) - ifneq (,$(call find_lib,SDL2)) - OS_CCDEFS += -DHAVE_LIBSDL -I$(dir $(call find_include,SDL/SDL)) - OS_LDFLAGS += -lSDL2 - $(info using libSDL2: $(call find_lib,SDL2) $(call find_include,SDL/SDL)) - ifeq (Darwin,$(OSTYPE)) - OS_LDFLAGS += -lobjc -framework cocoa - endif + ifneq (,$(call find_include,SDL2/SDL)) + ifneq (,$(call find_lib,SDL2)) + OS_CCDEFS += -DHAVE_LIBSDL -I$(dir $(call find_include,SDL2/SDL)) + OS_LDFLAGS += -lSDL2 + $(info using libSDL2: $(call find_lib,SDL2) $(call find_include,SDL2/SDL)) + ifeq (Darwin,$(OSTYPE)) + OS_LDFLAGS += -lobjc -framework cocoa endif - else + endif + else + ifneq (,$(call find_include,SDL/SDL)) ifneq (,$(call find_lib,SDL)) OS_CCDEFS += -DHAVE_LIBSDL -I$(dir $(call find_include,SDL/SDL)) OS_LDFLAGS += -lSDL - $(info using libSDL: $(call find_lib,SDL) $(call find_include,SDL/SDL)) + $(info using libSDL: $(call find_lib,SDL) $(call find_include,SDL/SDL)) ifeq (Darwin,$(OSTYPE)) OS_LDFLAGS += -lobjc -framework cocoa endif