From 3784261e2a2b2e5734d196948cc523de87c8fe66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20DEL=20NERO?= Date: Fri, 14 Feb 2020 09:36:43 +0000 Subject: [PATCH] mingw32/64 : now compile and link the dll resources. git-svn-id: svn://svn.code.sf.net/p/hxcfloppyemu/code/HxCFloppyEmulator/libusbhxcfe/trunk@1956 63fa2f70-6a9b-4bc4-b855-9c6a949b1d69 --- libusbhxcfe/build/Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/libusbhxcfe/build/Makefile b/libusbhxcfe/build/Makefile index e83d3db7..9a844d0d 100644 --- a/libusbhxcfe/build/Makefile +++ b/libusbhxcfe/build/Makefile @@ -26,12 +26,14 @@ endif ifeq ($(TARGET), mingw32) CC=i686-w64-mingw32-gcc +RESC=i686-w64-mingw32-windres LDFLAGS += -static-libgcc ../sources/win32/libusbhxcfe.def -s EXEC=libusbhxcfe.dll endif ifeq ($(TARGET), mingw64) CC=x86_64-w64-mingw32-gcc +RESC=x86_64-w64-mingw32-windres LDFLAGS += -static-libgcc ../sources/win32/libusbhxcfe.def -s EXEC=libusbhxcfe.dll endif @@ -48,22 +50,25 @@ endif all: $(EXEC) -libusbhxcfe.dll: usb_hxcfloppyemulator.o variablebitrate.o ftdi.o ../../../build/libhxcadaptor.a +libusbhxcfe.dll: win32_libusbhxcfe_res.o usb_hxcfloppyemulator.o variablebitrate.o ftdi.o ../../../build/libhxcadaptor.a $(CC) -o $@ $^ $(LDFLAGS) cp $@ ../../../build libusbhxcfe.dylib: usb_hxcfloppyemulator.o variablebitrate.o ftdi.o - $(AR) r $@ $^ + $(AR) r $@ $^ cp $@ ../../../build libusbhxcfe.a: usb_hxcfloppyemulator.o variablebitrate.o ftdi.o - $(AR) r $@ $^ + $(AR) r $@ $^ cp $@ ../../../build libusbhxcfe.so: usb_hxcfloppyemulator.o variablebitrate.o ftdi.o $(CC) -o $@ $^ $(LDFLAGS) cp $@ ../../../build +win32_libusbhxcfe_res.o: $(BASEDIR)/win32/libusbhxcfe.rc + $(RESC) $< $@ + usb_hxcfloppyemulator.o: $(BASEDIR)/usb_hxcfloppyemulator.c $(CC) -o $@ -c $< $(CFLAGS)