summarylogtreecommitdiffstats
path: root/makefile.patch
diff options
context:
space:
mode:
authorMatti Niemenmaa2018-02-27 09:22:16 +0200
committerMatti Niemenmaa2018-02-27 09:23:51 +0200
commit8f90e358ed4fce9ccf3b587aea40ee343d0ee6ea (patch)
tree14267725e78b85d0e86102e2823cabc4f88d5bf5 /makefile.patch
parentec566288f516926a93626eb72c95f49ffa77c488 (diff)
downloadaur-8f90e358ed4fce9ccf3b587aea40ee343d0ee6ea.tar.gz
Fix build for new Makefile
Diffstat (limited to 'makefile.patch')
-rw-r--r--makefile.patch30
1 files changed, 10 insertions, 20 deletions
diff --git a/makefile.patch b/makefile.patch
index b3b317a2b9a..b3e0e575793 100644
--- a/makefile.patch
+++ b/makefile.patch
@@ -1,23 +1,13 @@
-diff --git i/Makefile w/Makefile
---- i/Makefile
-+++ w/Makefile
-@@ -7,14 +7,17 @@ OBJS_RECOMPILER_64 = r4300/x86_64/assemble.o r4300/x86_64/gbc.o r4300/x86_64/gco
-
- OBJS = ai/ai_controller.o api/callbacks.o main/main.o main/rom.o main/savestates.o main/util.o memory/memory.o pi/cart_rom.o pi/pi_controller.o r4300/cached_interp.o r4300/cp0.o r4300/cp1.o r4300/exception.o r4300/interupt.o r4300/mi_controller.o r4300/pure_interp.o r4300/r4300.o r4300/r4300_core.o r4300/recomp.o r4300/reset.o r4300/tlb.o rdp/rdp_core.o ri/rdram.o ri/rdram_detection_hack.o ri/ri_controller.o rsp/rsp_core.o rsp_hle/alist.o rsp_hle/alist_audio.o rsp_hle/alist_naudio.o rsp_hle/alist_nead.o rsp_hle/audio.o rsp_hle/cicx105.o rsp_hle/hle.o rsp_hle/jpeg.o rsp_hle/memory.o rsp_hle/mp3.o rsp_hle/musyx.o rsp_hle/plugin.o rsp_lle/rsp.o si/cic.o si/game_controller.o si/n64_cic_nus_6105.o si/pif.o si/si_controller.o usf/usf.o usf/barray.o usf/resampler.o vi/vi_controller.o $(OBJS_RECOMPILER_64)
-
--OPTS = -O3 -DDYNAREC -I.
--ROPTS = -O3 -DARCH_MIN_SSE2 -I.
-+OPTS = -c -O3 -DDYNAREC -I.
-+ROPTS = -c -O3 -DARCH_MIN_SSE2 -I.
-
- all: liblazyusf.a bench dumpresampled
-
- liblazyusf.a : $(OBJS)
+diff --git Makefile Makefile
+index 4baf9e5..2b5e2e8 100755
+--- Makefile
++++ Makefile
+@@ -21,7 +21,7 @@ liblazyusf.a : $(OBJS)
$(AR) rcs $@ $^
-+liblazyusf.so : $(OBJS)
-+ $(CC) $(CFLAGS) -Wl,-Bsymbolic -shared -lm -lz -o $@ $^
-+
- bench : test/bench.o liblazyusf.a
- $(CC) -o $@ $^ ../psflib/libpsflib.a -lz
+ liblazyusf.so: $(OBJS)
+- $(CC) $^ -shared -Wl,-soname -Wl,$@.2 -o $@.2.0
++ $(CC) $(LDFLAGS) $^ -shared -Wl,-soname -Wl,$@.2 -o $@.2.0
+ bench : test/bench.o liblazyusf.a
+ $(CC) -o $@ $^ ../psflib/libpsflib.a -lz -lm