From 4e50e2e24d70484642cb5d9a8d3efcf1e3b3b09b Mon Sep 17 00:00:00 2001 From: terminx Date: Fri, 22 Aug 2008 05:39:13 +0000 Subject: [PATCH] Mac fixes git-svn-id: https://svn.eduke32.com/eduke32@998 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/build/Makefile | 1 + polymer/eduke32/Makefile | 10 ++++------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/polymer/build/Makefile b/polymer/build/Makefile index 1754d20c7..e6606466c 100644 --- a/polymer/build/Makefile +++ b/polymer/build/Makefile @@ -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) diff --git a/polymer/eduke32/Makefile b/polymer/eduke32/Makefile index 28007ae26..8343176b0 100644 --- a/polymer/eduke32/Makefile +++ b/polymer/eduke32/Makefile @@ -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)