mirror of
https://github.com/nzp-team/fteqw.git
synced 2024-11-29 23:22:01 +00:00
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
This commit is contained in:
parent
47c305e852
commit
67ea2a8fa6
1 changed files with 3 additions and 3 deletions
|
@ -599,7 +599,7 @@ ifeq ($(FTE_TARGET),macosx)
|
||||||
M_EXE_NAME=../fteqw
|
M_EXE_NAME=../fteqw
|
||||||
MCL_EXE_NAME=../fteqwcl
|
MCL_EXE_NAME=../fteqwcl
|
||||||
MINGL_EXE_NAME=../fteqw.mingl
|
MINGL_EXE_NAME=../fteqw.mingl
|
||||||
MINGL_DIR=mingl_morphos
|
MINGL_DIR=mingl_maxosx
|
||||||
|
|
||||||
|
|
||||||
#seems, macosx has a more limited version of strip
|
#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
|
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
|
GL_EXE_NAME=../fteqw.gl
|
||||||
GLCL_EXE_NAME=../fteqwcl.gl
|
GLCL_EXE_NAME=../fteqwcl.gl
|
||||||
GL_LDFLAGS=$(GLLDFLAGS) -ldl -lsyscall $(IMAGELDFLAGS) -lz
|
GL_LDFLAGS=$(GLLDFLAGS) -ldl $(IMAGELDFLAGS) -lz
|
||||||
GL_CFLAGS=$(GLCFLAGS) -noixemul
|
GL_CFLAGS=$(GLCFLAGS) -noixemul
|
||||||
GLB_DIR=gl_morphos
|
GLB_DIR=gl_morphos
|
||||||
GLCL_DIR=glcl_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
|
SWCL_OBJS=$(SOFTWARE_OBJS) vid_morphos.o in_morphos.o snd_morphos.o cd_null.o sys_morphos.o
|
||||||
SW_EXE_NAME=../fteqw.sw
|
SW_EXE_NAME=../fteqw.sw
|
||||||
SWCL_EXE_NAME=../fteqwcl.sw
|
SWCL_EXE_NAME=../fteqwcl.sw
|
||||||
SW_LDFLAGS=$(SWLDFLAGS) -ldl -lsyscall
|
SW_LDFLAGS=$(SWLDFLAGS) -ldl $(IMAGELDFLAGS) -lz
|
||||||
SW_CFLAGS=$(SWCFLAGS) -noixemul
|
SW_CFLAGS=$(SWCFLAGS) -noixemul
|
||||||
SWB_DIR=sw_morphos
|
SWB_DIR=sw_morphos
|
||||||
SWCL_DIR=swcl_morphos
|
SWCL_DIR=swcl_morphos
|
||||||
|
|
Loading…
Reference in a new issue