summaryrefslogtreecommitdiff
path: root/emulators/mupen64plus-base/files/patch-Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'emulators/mupen64plus-base/files/patch-Makefile')
-rw-r--r--emulators/mupen64plus-base/files/patch-Makefile33
1 files changed, 14 insertions, 19 deletions
diff --git a/emulators/mupen64plus-base/files/patch-Makefile b/emulators/mupen64plus-base/files/patch-Makefile
index 6becc5b95fe9..31700c2b363d 100644
--- a/emulators/mupen64plus-base/files/patch-Makefile
+++ b/emulators/mupen64plus-base/files/patch-Makefile
@@ -1,25 +1,20 @@
---- Makefile 2008-03-29 14:41:03.000000000 -0500
-+++ Makefile 2008-05-20 10:56:58.000000000 -0500
-@@ -83,7 +83,7 @@
- r4300/tlb.o
-
- ifeq ($(CPU), X86)
-- ifeq ($(ARCH), 64BITS)
-+ ifeq ($(ARCH_DETECTED), 64BITS)
- DYNAREC = x86_64
- else
- DYNAREC = x86
-@@ -205,11 +205,11 @@
+--- Makefile.orig 2008-12-13 14:53:49.000000000 -0500
++++ Makefile 2008-12-14 23:40:23.000000000 -0500
+@@ -97,7 +97,7 @@
+ # handle dynamic recompiler objects
+ ifneq ($(NO_ASM), 1)
+ ifeq ($(CPU), X86)
+- ifeq ($(ARCH), 64BITS)
++ ifeq ($(ARCH_DETECTED), 64BITS)
+ DYNAREC = x86_64
+ else
+ DYNAREC = x86
+@@ -274,7 +274,7 @@
all: $(ALL)
mupen64plus: $(OBJECTS)
-- $(CC) $^ $(LDFLAGS) $(LIBS) -Wl,-export-dynamic -lpthread -ldl -o $@
-+ $(CC) $^ $(LDFLAGS) $(LIBS) -Wl,-export-dynamic ${PTHREAD_LIBS} -o $@
+- $(MUPENCC) $^ $(LDFLAGS) $(LIBS) -Wl,-export-dynamic -lpthread -ldl -o $@
++ $(MUPENCC) $^ $(LDFLAGS) $(LIBS) -Wl,-export-dynamic ${PTHREAD_LIBS} -o $@
$(STRIP) $@
- mupen64plus_dbg: $(OBJECTS) main/main_gtk.o
-- $(CC) $^ $(LDFLAGS) $(LIBS) -Wl,-export-dynamic -lpthread -ldl -o $@
-+ $(CC) $^ $(LDFLAGS) $(LIBS) -Wl,-export-dynamic ${PTHREAD_LIBS} -o $@
-
install:
- ./install.sh $(PREFIX)