diff --git a/polymer/eduke32/Makefile b/polymer/eduke32/Makefile index 7d8a16ba8..300f4d508 100644 --- a/polymer/eduke32/Makefile +++ b/polymer/eduke32/Makefile @@ -192,8 +192,8 @@ endif ifeq ($(PLATFORM),DARWIN) OURCFLAGS += -fno-pic -I$(abspath Apple) -I$(abspath Apple/include) ifeq (1,$(SDL_FRAMEWORK)) - OURCFLAGS += -I/Library/Frameworks/SDL.framework/Headers \ - -I/Library/Frameworks/SDL_mixer.framework/Headers + OURCFLAGS += -I$(APPLE_FRAMEWORKS)/SDL.framework/Headers \ + -I$(APPLE_FRAMEWORKS)/SDL_mixer.framework/Headers LIBS += -read_only_relocs suppress -LApple/lib -lvorbisfile -lvorbis -logg -lm \ -Wl,-framework,SDL -Wl,-framework,SDL_mixer Apple/lib/libSDLmain.a \ -Wl,-framework,Cocoa -Wl,-framework,Carbon -Wl,-framework,OpenGL \ diff --git a/polymer/eduke32/Makefile.common b/polymer/eduke32/Makefile.common index d68b68216..93dddf3b5 100644 --- a/polymer/eduke32/Makefile.common +++ b/polymer/eduke32/Makefile.common @@ -10,6 +10,10 @@ PRETTY_OUTPUT ?= 1 # at different directory levels DXROOT_OVERRIDE:= +# Mac OS X Frameworks location +# Like above, use absolute paths. +APPLE_FRAMEWORKS ?=/Library/Frameworks + # Engine options # USE_OPENGL - enables basic OpenGL Polymost renderer # POLYMER - enables fancy Polymer renderer diff --git a/polymer/eduke32/build/Makefile.shared b/polymer/eduke32/build/Makefile.shared index 1e84f102c..b6e53e6f6 100644 --- a/polymer/eduke32/build/Makefile.shared +++ b/polymer/eduke32/build/Makefile.shared @@ -161,7 +161,7 @@ endif ifeq ($(RENDERTYPE),SDL) ifeq ($(SDL_FRAMEWORK),1) LIBS += -Wl,-framework,SDL - SDLCONFIG_CFLAGS+= -I/Library/Frameworks/SDL.framework/Headers + SDLCONFIG_CFLAGS+= -I$(APPLE_FRAMEWORKS)/SDL.framework/Headers else ifneq ($(SDLCONFIG),) LIBS+= $(shell $(SDLCONFIG) --libs) diff --git a/polymer/eduke32/source/jaudiolib/Makefile b/polymer/eduke32/source/jaudiolib/Makefile index aeb29280d..c359f1361 100644 --- a/polymer/eduke32/source/jaudiolib/Makefile +++ b/polymer/eduke32/source/jaudiolib/Makefile @@ -21,8 +21,8 @@ CPPFLAGS=-I$(INC) -I$(SRC) -DHAVE_VORBIS ifeq ($(PLATFORM),DARWIN) ifeq (1,$(SDL_FRAMEWORK)) APPLE_INCLUDE_DIR:=../../Apple/include - OURCFLAGS += -DSDL_FRAMEWORK -I$(APPLE_INCLUDE_DIR) -I/Library/Frameworks/SDL.framework/Headers \ - -I/Library/Frameworks/SDL_mixer.framework/Headers + OURCFLAGS += -DSDL_FRAMEWORK -I$(APPLE_INCLUDE_DIR) -I$(APPLE_FRAMEWORKS)/SDL.framework/Headers \ + -I$(APPLE_FRAMEWORKS)/SDL_mixer.framework/Headers endif endif