From 2e10193d27c23b40caa01d879250f652b27202e2 Mon Sep 17 00:00:00 2001 From: Lance Date: Sun, 19 Jul 2009 10:11:32 +0000 Subject: [PATCH] Enabled zlib, png & jpeg support in MacOSX. If GCC complains about missing headers for libjpeg and libpng: 1. Install Darwin Ports from darwinports.com. 2. export PATH=$PATH:/opt/local/bin 3. sudo port -d selfupdate 4. sudo port install libpng 5. sudo port install jpeg git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3316 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/Makefile | 4 ++-- engine/common/bothdefs.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/engine/Makefile b/engine/Makefile index f0bc79244..f2dc4bcf9 100644 --- a/engine/Makefile +++ b/engine/Makefile @@ -660,8 +660,8 @@ ifneq ($(shell echo $(FTE_TARGET)|grep macosx),) GLCL_DIR=glcl_macosx$(EXTENSION)$(BITS) MINGL_DIR=mingl_macosx$(EXTENSION)$(BITS) - GL_CFLAGS=$(GLCFLAGS) -D__MACOSX__ - GL_LDFLAGS=-framework AGL -framework OpenGL -framework Cocoa -framework AudioUnit + GL_CFLAGS=$(GLCFLAGS) -D__MACOSX__ -L/opt/local/lib -I/opt/local/include + 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 GL_EXE_NAME=../macosx_fteqw.gl$(EXTENSION)$(BITS) diff --git a/engine/common/bothdefs.h b/engine/common/bothdefs.h index 305519330..e5e0f2250 100644 --- a/engine/common/bothdefs.h +++ b/engine/common/bothdefs.h @@ -54,7 +54,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #endif #define AVAIL_MASM -#ifdef MINGW +#if defined(MINGW) || defined(MACOSX) #define AVAIL_PNGLIB #define AVAIL_ZLIB #define AVAIL_JPEGLIB