[Scummvm-cvs-logs] CVS: scummvm Makefile,1.70,1.71

Jonathan Gray khalek at users.sourceforge.net
Mon Mar 29 04:11:10 CEST 2004


Update of /cvsroot/scummvm/scummvm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4778

Modified Files:
	Makefile 
Log Message:
use a make variable for static os x package prefix so I don't have to change as many lines, it should probably be changeable via the configure script at some point

Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- Makefile	21 Mar 2004 00:26:23 -0000	1.70
+++ Makefile	29 Mar 2004 11:59:09 -0000	1.71
@@ -98,14 +98,19 @@
 	cp $(srcdir)/scummvm-static $(bundle_name)/Contents/MacOS/scummvm
 	strip $(bundle_name)/Contents/MacOS/scummvm
 
+# location of additional libs for OS X usually /sw/ for fink or
+# /opt/local/ for darwinports
+OSXOPT=/sw
 # Special target to create a static linked binary for Mac OS X
 scummvm-static: $(OBJS)
 	$(CXX) $(LDFLAGS) -o scummvm-static $(OBJS) \
 		`sdl-config --static-libs` \
-		/sw/lib/libmad.a \
-		/sw/lib/libvorbisfile.a /sw/lib/libvorbis.a /sw/lib/libogg.a \
-		/sw/lib/libmpeg2.a \
-		/sw/lib/libFLAC.a \
+		$(OSXOPT)/lib/libmad.a \
+		$(OSXOPT)/lib/libvorbisfile.a \
+		$(OSXOPT)/lib/libvorbis.a \
+		$(OSXOPT)/lib/libogg.a \
+		$(OSXOPT)/lib/libmpeg2.a \
+		$(OSXOPT)/lib/libFLAC.a \
 		-lz
 
 # Special target to create a win32 snapshot binary





More information about the Scummvm-git-logs mailing list