From 67ea2a8fa6f6b7a038202050f96ae84958f6ffde Mon Sep 17 00:00:00 2001 From: Mark Olsen Date: Sat, 20 Oct 2007 14:23:41 +0000 Subject: [PATCH] MacOS X is not MorphOS. Don't link with libsyscall on MorphOS anymore. Do use IMAGELDFLAGS when linking the MorphOS software renderer too. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2751 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/engine/Makefile b/engine/Makefile index 072e20b3c..537262345 100644 --- a/engine/Makefile +++ b/engine/Makefile @@ -599,7 +599,7 @@ ifeq ($(FTE_TARGET),macosx) M_EXE_NAME=../fteqw MCL_EXE_NAME=../fteqwcl MINGL_EXE_NAME=../fteqw.mingl - MINGL_DIR=mingl_morphos + MINGL_DIR=mingl_maxosx #seems, macosx has a more limited version of strip @@ -613,7 +613,7 @@ ifeq ($(FTE_TARGET),morphos) GLCL_OBJS=$(GL_OBJS) $(GLQUAKE_OBJS) gl_vidmorphos.o in_morphos.o snd_morphos.o cd_null.o sys_morphos.o GL_EXE_NAME=../fteqw.gl GLCL_EXE_NAME=../fteqwcl.gl - GL_LDFLAGS=$(GLLDFLAGS) -ldl -lsyscall $(IMAGELDFLAGS) -lz + GL_LDFLAGS=$(GLLDFLAGS) -ldl $(IMAGELDFLAGS) -lz GL_CFLAGS=$(GLCFLAGS) -noixemul GLB_DIR=gl_morphos GLCL_DIR=glcl_morphos @@ -621,7 +621,7 @@ ifeq ($(FTE_TARGET),morphos) SWCL_OBJS=$(SOFTWARE_OBJS) vid_morphos.o in_morphos.o snd_morphos.o cd_null.o sys_morphos.o SW_EXE_NAME=../fteqw.sw SWCL_EXE_NAME=../fteqwcl.sw - SW_LDFLAGS=$(SWLDFLAGS) -ldl -lsyscall + SW_LDFLAGS=$(SWLDFLAGS) -ldl $(IMAGELDFLAGS) -lz SW_CFLAGS=$(SWCFLAGS) -noixemul SWB_DIR=sw_morphos SWCL_DIR=swcl_morphos