zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-12 03:00:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add APPLE_FRAMEWORKS Makefile variable which can be passed to the make invocation.

Browse source 
ex: make APPLE_FRAMEWORKS=~/Library/Frameworks

git-svn-id: https://svn.eduke32.com/eduke32@2398 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2012-03-04 09:31:37 +00:00
parent 1927df852d
commit 56c002d3a1
4 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
polymer/eduke32/Makefile
View file

@ -192,8 +192,8 @@ endif
ifeq ($(PLATFORM),DARWIN) ifeq ($(PLATFORM),DARWIN)
OURCFLAGS += -fno-pic -I$(abspath Apple) -I$(abspath Apple/include) OURCFLAGS += -fno-pic -I$(abspath Apple) -I$(abspath Apple/include)
ifeq (1,$(SDL_FRAMEWORK)) ifeq (1,$(SDL_FRAMEWORK))
OURCFLAGS += -I/Library/Frameworks/SDL.framework/Headers \ OURCFLAGS += -I$(APPLE_FRAMEWORKS)/SDL.framework/Headers \
-I/Library/Frameworks/SDL_mixer.framework/Headers -I$(APPLE_FRAMEWORKS)/SDL_mixer.framework/Headers
LIBS += -read_only_relocs suppress -LApple/lib -lvorbisfile -lvorbis -logg -lm \ LIBS += -read_only_relocs suppress -LApple/lib -lvorbisfile -lvorbis -logg -lm \
-Wl,-framework,SDL -Wl,-framework,SDL_mixer Apple/lib/libSDLmain.a \ -Wl,-framework,SDL -Wl,-framework,SDL_mixer Apple/lib/libSDLmain.a \
-Wl,-framework,Cocoa -Wl,-framework,Carbon -Wl,-framework,OpenGL \ -Wl,-framework,Cocoa -Wl,-framework,Carbon -Wl,-framework,OpenGL \

4
polymer/eduke32/Makefile.common
View file

@ -10,6 +10,10 @@ PRETTY_OUTPUT ?= 1
# at different directory levels # at different directory levels
DXROOT_OVERRIDE:= DXROOT_OVERRIDE:=
# Mac OS X Frameworks location
# Like above, use absolute paths.
APPLE_FRAMEWORKS ?=/Library/Frameworks
# Engine options # Engine options
# USE_OPENGL - enables basic OpenGL Polymost renderer # USE_OPENGL - enables basic OpenGL Polymost renderer
# POLYMER - enables fancy Polymer renderer # POLYMER - enables fancy Polymer renderer

2
polymer/eduke32/build/Makefile.shared
View file

@ -161,7 +161,7 @@ endif
ifeq ($(RENDERTYPE),SDL) ifeq ($(RENDERTYPE),SDL)
ifeq ($(SDL_FRAMEWORK),1) ifeq ($(SDL_FRAMEWORK),1)
LIBS += -Wl,-framework,SDL LIBS += -Wl,-framework,SDL
SDLCONFIG_CFLAGS+= -I/Library/Frameworks/SDL.framework/Headers SDLCONFIG_CFLAGS+= -I$(APPLE_FRAMEWORKS)/SDL.framework/Headers
else else
ifneq ($(SDLCONFIG),) ifneq ($(SDLCONFIG),)
LIBS+= $(shell $(SDLCONFIG) --libs) LIBS+= $(shell $(SDLCONFIG) --libs)

4
polymer/eduke32/source/jaudiolib/Makefile
View file

@ -21,8 +21,8 @@ CPPFLAGS=-I$(INC) -I$(SRC) -DHAVE_VORBIS
ifeq ($(PLATFORM),DARWIN) ifeq ($(PLATFORM),DARWIN)
ifeq (1,$(SDL_FRAMEWORK)) ifeq (1,$(SDL_FRAMEWORK))
APPLE_INCLUDE_DIR:=../../Apple/include APPLE_INCLUDE_DIR:=../../Apple/include
OURCFLAGS += -DSDL_FRAMEWORK -I$(APPLE_INCLUDE_DIR) -I/Library/Frameworks/SDL.framework/Headers \ OURCFLAGS += -DSDL_FRAMEWORK -I$(APPLE_INCLUDE_DIR) -I$(APPLE_FRAMEWORKS)/SDL.framework/Headers \
-I/Library/Frameworks/SDL_mixer.framework/Headers -I$(APPLE_FRAMEWORKS)/SDL_mixer.framework/Headers
endif endif
endif endif