MINGW fix

vampirefrog · Nov 12, 2024 · 36b8af3 · 36b8af3
1 parent 79fee67
commit 36b8af3
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -18,19 +18,17 @@ $(patsubst %.c,musashi/%.c,$(MUSASHIGENCFILES)): musashi/m68kmake musashi/m68k_i
 musashi/m68kmake: musashi/m68kmake.o
 	gcc $^ -o $@
 
-CFLAGS=-ggdb -Wall -DHAVE_MEMCPY -Ix68ksjis
+CFLAGS=-ggdb -Wall -DHAVE_MEMCPY -Ix68ksjis $(shell pkg-config portaudio-2.0 --cflags)
+LDFLAGS=-lz $(shell pkg-config portaudio-2.0 --libs)
 ifneq (,$(findstring MINGW,$(shell uname -s)))
-CFLAGS+=-I../portaudio/include -static-libgcc
-LDFLAGS=-lz -liconv -lws2_32 -static-libgcc
+CFLAGS+=-static-libgcc
+LDFLAGS=-liconv -lws2_32 -static-libgcc
 else
-CFLAGS+=$(shell pkg-config portaudio-2.0 --cflags)
-LDFLAGS=-lz -lm
+LDFLAGS=-lm
 endif
 
 ifneq (,$(findstring MINGW,$(shell uname -s)))
-LDFLAGS+=../portaudio/lib/.libs/libportaudio.a -lwinmm
-else
-LDFLAGS+=$(shell pkg-config portaudio-2.0 --libs)
+LDFLAGS+=-lwinmm
 endif
 
 v68: main.o tools.o v68.o v68io.o v68human.o v68doscall.o v68iocscall.o v68fecall.o x68ksjis/sjis.o x68ksjis/sjis_unicode.o x68ksjis/utf8.o ym2151.o dmac.o okim6258.o vgm.o v68periph.o v68ipl.o $(MUSASHIOBJS) $(MUSASHIGENOBJS)