mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-24 10:40:46 +00:00
Mac fixes
git-svn-id: https://svn.eduke32.com/eduke32@998 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
39b87128d6
commit
4e50e2e24d
2 changed files with 5 additions and 6 deletions
|
@ -116,6 +116,7 @@ ifeq ($(PLATFORM),DARWIN)
|
|||
ENGINEOBJS += $(OBJ)/StartupWinController.editor.$o \
|
||||
$(OBJ)//osxbits.$o
|
||||
ASFLAGS += -f Mach-O
|
||||
OURCFLAGS += -fno-pic
|
||||
TARGETOPTS += -DNOASM
|
||||
endif
|
||||
ifeq ($(PLATFORM),BSD)
|
||||
|
|
|
@ -143,9 +143,9 @@ endif
|
|||
ifeq ($(PLATFORM),DARWIN)
|
||||
ALROOT = Apple
|
||||
ifeq (1,$(SDL_FRAMEWORK))
|
||||
OURCFLAGS += -I$(ALROOT)/include -I/Library/Frameworks/SDL.framework/Headers \
|
||||
OURCFLAGS += -fno-pic -I$(ALROOT)/include -I/Library/Frameworks/SDL.framework/Headers \
|
||||
-I-I/Library/Frameworks/SDL_mixer.framework/Headers
|
||||
LIBS += -L$(ALROOT)/lib -lvorbisfile -lvorbis -logg -lm \
|
||||
LIBS += -read_only_relocs suppress -L$(ALROOT)/lib -lvorbisfile -lvorbis -logg -lm \
|
||||
-Wl,-framework,SDL -Wl,-framework,SDL_mixer $(ALROOT)/lib/libSDLmain.a \
|
||||
-Wl,-framework,Cocoa -Wl,-framework,Carbon -Wl,-framework,OpenGL \
|
||||
-Wl,-framework,CoreMidi -Wl,-framework,AudioUnit \
|
||||
|
@ -153,16 +153,14 @@ ifeq ($(PLATFORM),DARWIN)
|
|||
-Wl,-framework,QuickTime -lm
|
||||
|
||||
else
|
||||
OURCFLAGS += -I$(ALROOT)/include -I$(SDLROOT)/include -I$(SDLROOT)/include/SDL
|
||||
LIBS += -L$(ALROOT)/lib -lvorbisfile -lvorbis -logg -lm -lSDL_mixer \
|
||||
OURCFLAGS += -fno-pic -I$(ALROOT)/include -I$(SDLROOT)/include -I$(SDLROOT)/include/SDL
|
||||
LIBS += -read_only_relocs suppress -L$(ALROOT)/lib -lvorbisfile -lvorbis -logg -lm -lSDL_mixer \
|
||||
-Wl,-framework,Cocoa -Wl,-framework,Carbon -Wl,-framework,OpenGL \
|
||||
-Wl,-framework,CoreMidi -Wl,-framework,AudioUnit \
|
||||
-Wl,-framework,AudioToolbox -Wl,-framework,IOKit -Wl,-framework,AGL \
|
||||
-Wl,-framework,QuickTime -lm
|
||||
endif
|
||||
NASMFLAGS += -f Mach-O
|
||||
GAMEOBJS += $(OBJ)/startdummy.game.$o
|
||||
EDITOROBJS += $(OBJ)/startdummy.game.$o
|
||||
endif
|
||||
|
||||
ifeq ($(PLATFORM),WINDOWS)
|
||||
|
|
Loading…
Reference in a new issue