Fix mingw32 build

alvarofe · May 9, 2017 · 69b4c61 · 69b4c61
1 parent a24dc27
commit 69b4c61
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/libr/core/p/Makefile b/libr/core/p/Makefile
@@ -13,8 +13,8 @@ CFLAGS+=-L../../syscall -lr_syscall -L../../socket -lr_socket -L../../search -lr
 CFLAGS+= -L../../lang -lr_lang -L../../debug -lr_debug
 CFLAGS+=-L../../bp -lr_bp -L../../reg -lr_reg -L../../asm -lr_asm
 CFLAGS+=../../../shlr/sdb/src/libsdb.a
-CFLAGS+=../../../shlr/gdb/lib/libgdbr.a
-CFLAGS+=../../../shlr/wind/libr_wind.a
+include $(STOP)/gdb/deps.mk
+include $(STOP)/wind/deps.mk
 #CFLAGS+=-L../../anal -lr_anal -L../../core -lr_core
 LDFLAGS+=${LINK}
 

diff --git a/libr/debug/p/wind.mk b/libr/debug/p/wind.mk
@@ -14,7 +14,7 @@ LDFLAGS+=-L$(LTOP)/reg -lr_reg
 LDFLAGS+=-L$(LTOP)/bp -lr_bp
 LDFLAGS+=-L$(LTOP)/io -lr_io
 
-LDFLAGS+=-L$(SHLR)/wind -lr_wind
+include $(STOP)/wind/deps.mk
 
 OBJ_WIND=debug_wind.o 
 

diff --git a/libr/parse/p/m68k_pseudo.mk b/libr/parse/p/m68k_pseudo.mk
@@ -6,13 +6,13 @@ STATIC_OBJ+=${OBJ_M68KPSEUDO}
 ifeq ($(CC),cccl)
 LIBDEPS=-L../../util -llibr_util
 LIBDEPS+=-L../../flag -llibr_flag
-LIBDEPS+=$(STOP)/zip/librz.lib
 else
 LIBDEPS=-L../../util -lr_util
 LIBDEPS+=-L../../flag -lr_flag
-LIBDEPS+=$(STOP)/zip/librz.a
 endif
 
+include $(STOP)/zip/deps.mk
+
 ${TARGET_M68KPSEUDO}: ${OBJ_M68KPSEUDO}
 	${CC} $(call libname,parse_m68k_pseudo) ${LIBDEPS} \
 		${LDFLAGS_SHARED} ${CFLAGS} -o ${TARGET_M68KPSEUDO} ${OBJ_M68KPSEUDO}
diff --git a/shlr/bochs/deps.mk b/shlr/bochs/deps.mk
@@ -1 +1 @@
-LINK+=../../shlr/bochs/lib/libbochs.a
+LINK+=../../shlr/bochs/lib/libbochs.$(EXT_AR)
diff --git a/shlr/wind/deps.mk b/shlr/wind/deps.mk
@@ -1 +1 @@
-LINK+=../../shlr/gdb/lib/libr_wind.a
+LINK+=$(STOP)/wind/libr_wind.${EXT_AR}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		LINK+=../../shlr/bochs/lib/libbochs.a
		LINK+=../../shlr/bochs/lib/libbochs.$(EXT_AR)
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		LINK+=../../shlr/gdb/lib/libr_wind.a
		LINK+=$(STOP)/wind/libr_wind.${EXT_AR}