From 610e66b431e3e28e5b7aee3d00b76a5099040b7e Mon Sep 17 00:00:00 2001 From: Lance Date: Thu, 16 Dec 2010 03:25:37 +0000 Subject: [PATCH] MacOSX and MorphOS header sources added git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3699 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/engine/Makefile b/engine/Makefile index 03856011e..69b32e1f8 100644 --- a/engine/Makefile +++ b/engine/Makefile @@ -873,7 +873,11 @@ ifneq ($(shell echo $(FTE_TARGET)|grep macosx),) GLCL_DIR=glcl_macosx$(EXTENSION)$(BITS) MINGL_DIR=mingl_macosx$(EXTENSION)$(BITS) - GL_CFLAGS=$(GLCFLAGS) -D__MACOSX__ -L/sw/lib -I/sw/include -L/opt/local/lib -I/opt/local/include + GL_CFLAGS=$(GLCFLAGS) -D__MACOSX__ -L/sw/lib -I/sw/include -L/opt/local/lib -I/opt/local/include -I/home/moodles/mac/include/ -L/home/moodles/mac/lib -I./libs/ + ifeq ($(FTE_TARGET),macosx_x86) + GL_CFLAGS=$(GLCFLAGS) -D__MACOSX__ -L/sw/lib -I/sw/include -L/opt/local/lib -I/opt/local/include -I/home/moodles/mac/x86/include/ -L/home/moodles/mac/x86/lib -I./libs/ + endif + GL_LDFLAGS=-framework AGL -framework OpenGL -framework Cocoa -framework AudioUnit -lz -lpng -ljpeg GLCL_OBJS=$(GL_OBJS) $(GLQUAKE_OBJS) gl_vidcocoa.mo gl_vidmacos.o sys_linux.o in_macos.o cd_null.o snd_macos.o @@ -921,7 +925,7 @@ ifeq ($(FTE_TARGET),morphos) #morphos dedicated server doesnt compile: alloca.h: No such file or directory SV_OBJS=$(COMMON_OBJS) $(SERVER_OBJS) $(PROGS_OBJS) $(SERVERONLY_OBJS) SV_EXE_NAME=../morphos_fteqw.sv$(BITS) - SV_CFLAGS=$(SERVER_ONLY_CFLAGS) + SV_CFLAGS=$(SERVER_ONLY_CFLAGS) -I/home/moodles/zlib/zlib-1.2.5 -L/home/moodles/zlib/zlib-1.2.5 -I/home/moodles/wip/wip/engine/libs endif