# HG changeset patch # User Michael Pavone # Date 1587276883 25200 # Node ID f23e70fb6607b457fcd75ab8b2a7b1dc4c2e8abe # Parent 253c62b7144ebd7245ef195734d8e45be11c810c Allow override of SDL2 include path for "portable" builds diff -r 253c62b7144e -r f23e70fb6607 Makefile --- a/Makefile Sat Apr 18 23:07:44 2020 -0700 +++ b/Makefile Sat Apr 18 23:14:43 2020 -0700 @@ -96,16 +96,17 @@ endif ifeq ($(OS),Darwin) -CFLAGS+= -IFrameworks/SDL2.framework/Headers +SDL_INCLUDE_PATH:=Frameworks/SDL2.framework/Headers LDFLAGS+= -FFrameworks -framework SDL2 -framework OpenGL -framework AppKit FIXUP:=install_name_tool -change @rpath/SDL2.framework/Versions/A/SDL2 @executable_path/Frameworks/SDL2.framework/Versions/A/SDL2 else -CFLAGS+= -Isdl/include +SDL_INCLUDE_PATH:=sdl/include LDFLAGS+= -Wl,-rpath='$$ORIGIN/lib' -Llib -lSDL2 ifndef USE_GLES LDFLAGS+= $(shell pkg-config --libs gl) endif endif #Darwin +CFLAGS+= -I$(SDL_INCLUDE_PATH) else ifeq ($(MAKECMDGOALS),libblastem.$(SO))