diff options
author | acm <acm@FreeBSD.org> | 2009-01-14 10:03:05 +0800 |
---|---|---|
committer | acm <acm@FreeBSD.org> | 2009-01-14 10:03:05 +0800 |
commit | 002ffc4e275fe09dde64bd0b26ff8fcde2b66f46 (patch) | |
tree | a5ade165fd43455cb88592c85bd3fab470e7ce33 /emulators/mupen64plus-glide | |
parent | c0ab14081b8d5d886cf7980a0a65ec76956c98cc (diff) | |
download | freebsd-ports-gnome-002ffc4e275fe09dde64bd0b26ff8fcde2b66f46.tar.gz freebsd-ports-gnome-002ffc4e275fe09dde64bd0b26ff8fcde2b66f46.tar.zst freebsd-ports-gnome-002ffc4e275fe09dde64bd0b26ff8fcde2b66f46.zip |
- Update to 1.5
Diffstat (limited to 'emulators/mupen64plus-glide')
-rw-r--r-- | emulators/mupen64plus-glide/files/patch-glide64_Makefile | 61 |
1 files changed, 9 insertions, 52 deletions
diff --git a/emulators/mupen64plus-glide/files/patch-glide64_Makefile b/emulators/mupen64plus-glide/files/patch-glide64_Makefile index 6937a95debca..a4042e9fbc89 100644 --- a/emulators/mupen64plus-glide/files/patch-glide64_Makefile +++ b/emulators/mupen64plus-glide/files/patch-glide64_Makefile @@ -1,58 +1,15 @@ ---- glide64/Makefile 2008-10-13 21:31:47.000000000 -0500 -+++ glide64/Makefile 2008-12-15 01:10:56.000000000 -0500 -@@ -4,7 +4,7 @@ - include ../pre.mk - - # set BITS --ifeq ("$(ARCH)","64BITS") -+ifeq ("$(ARCH_DETECTED)","64BITS") - BITS=64 - MOPT=-m amd64 - else -@@ -13,15 +13,15 @@ - endif - - # local CFLAGS, LIBS, and LDFLAGS --CFLAGS = -O3 -Wall -g -DGCC -DUSE_GTK $(SDL_CFLAGS) $(GTK_FLAGS) -Iwrapper/ -ffast-math -funroll-loops --LDFLAGS = -shared -Wl,-Bsymbolic -lGL -lGLU -L/usr/X11R6/lib $(SDL_LIBS) -+CFLAGS += -DGCC -DUSE_GTK $(SDL_CFLAGS) $(GTK_FLAGS) -Iwrapper/ -ffast-math -funroll-loops -+LDFLAGS += -shared -Wl,-Bsymbolic -lGL -lGLU -L${LOCALBASE}/lib $(SDL_LIBS) - - # set special flags per-system - ifeq ($(CPU), X86) -- ifeq ($(ARCH), 64BITS) -- CFLAGS += -march=athlon64 -fPIC -+ ifeq ($(ARCH_DETECTED), 64BITS) -+ CFLAGS += -fPIC - else -- CFLAGS += -march=i686 -mtune=pentium-m -mmmx -msse -+ CFLAGS += -mmmx -msse - ifneq ($(PROFILE), 1) - ifneq ($(VPDEBUG), 1) - CFLAGS += -fomit-frame-pointer -@@ -29,9 +29,9 @@ - endif - endif - # tweak flags for 32-bit build on 64-bit system -- ifeq ($(ARCH), 64BITS_32) -- CFLAGS += -m32 -- LDFLAGS += -m32 -m elf_i386 -+ ifeq ($(ARCH_DETECTED), 64BITS_32) -+ CFLAGS += -+ LDFLAGS += - endif - endif - ifeq ($(CPU), PPC) -@@ -122,7 +122,7 @@ +--- glide64/Makefile 2009-01-13 00:45:38.000000000 -0500 ++++ glide64/Makefile 2009-01-13 00:46:46.000000000 -0500 +@@ -114,7 +114,7 @@ all: $(TARGET) - $(TARGET): $(OBJECTS) -- $(LD) $(OBJECTS) $(GTK_LIBS) $(LDFLAGS) -o $@ -+ $(CC) $(OBJECTS) $(LDFLAGS) $(GTK_LIBS) -o $@ - $(STRIP) --strip-all $@ + $(TARGET): $(QT_EXTRA) $(OBJECTS) +- $(LD) $(OBJECTS) $(LDFLAGS) -o $@ ++ $(CC) $(OBJECTS) $(LDFLAGS) -o $@ + $(STRIP) $@ - Main.o: font.h cursor.h -@@ -135,7 +135,7 @@ + ui_glide64config.h: glide64config.ui +@@ -133,7 +133,7 @@ compiletex: compiletex.c @rm -f compiletex compiletex.o $(CC) -o compiletex.o -c $< |