diff options
| author | wiz <wiz@pkgsrc.org> | 2015-02-28 11:58:53 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2015-02-28 11:58:53 +0000 |
| commit | e896dec7e98da8bbf9e9c65e87d80b5bae7bce2f (patch) | |
| tree | 7e78201b740a8c39631a3746064db2242511ffcc /emulators/mame/patches/patch-makefile | |
| parent | 479455ee332516419958894e85727d55d53eab1a (diff) | |
| download | pkgsrc-e896dec7e98da8bbf9e9c65e87d80b5bae7bce2f.tar.gz | |
Update mame and mess to 0.159. The usual changes.
Three patches were accepted upstream.
Diffstat (limited to 'emulators/mame/patches/patch-makefile')
| -rw-r--r-- | emulators/mame/patches/patch-makefile | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/emulators/mame/patches/patch-makefile b/emulators/mame/patches/patch-makefile index e082f7f5e61..0c43c3983b7 100644 --- a/emulators/mame/patches/patch-makefile +++ b/emulators/mame/patches/patch-makefile @@ -1,12 +1,9 @@ -$NetBSD: patch-makefile,v 1.9 2015/01/29 21:48:15 wiz Exp $ +$NetBSD: patch-makefile,v 1.10 2015/02/28 11:58:53 wiz Exp $ Link against pkgsrc versions of expat, zlib, flac, jpeg, and sqlite3, and add appropriate linker search paths. -*nix: Fixed linking tools against system libraries -https://github.com/mamedev/mame/commit/b55b45a5a99b8bce694b7ed3cd2d4a00d790f6ae - ---- makefile.orig 2015-01-29 21:11:10.000000000 +0000 +--- makefile.orig 2015-02-28 10:39:06.000000000 +0000 +++ makefile @@ -227,19 +227,19 @@ endif # BIGENDIAN = 1 @@ -33,7 +30,7 @@ https://github.com/mamedev/mame/commit/b55b45a5a99b8bce694b7ed3cd2d4a00d790f6ae # uncomment next line to build PortMidi as part of MAME/MESS build BUILD_MIDILIB = 1 -@@ -739,7 +739,7 @@ DRIVLISTOBJ = $(OBJ)/$(TARGET)/$(SUBTARG +@@ -742,7 +742,7 @@ DRIVLISTOBJ = $(OBJ)/$(TARGET)/$(SUBTARG #------------------------------------------------- # start with an empty set of libs @@ -42,19 +39,3 @@ https://github.com/mamedev/mame/commit/b55b45a5a99b8bce694b7ed3cd2d4a00d790f6ae # add expat XML library ifeq ($(BUILD_EXPAT),1) -@@ -756,6 +756,7 @@ INCPATH += -I$(3RDPARTY)/zlib - ZLIB = $(OBJ)/libz.a - else - LIBS += -lz -+BASELIBS += -lz - ZLIB = - endif - -@@ -766,6 +767,7 @@ FLAC_LIB = $(OBJ)/libflac.a - # $(OBJ)/libflac++.a - else - LIBS += -lFLAC -+BASELIBS += -lFLAC - FLAC_LIB = - endif - |