From 771be5679b0da354e6f60c713e49aaa1e1d614f9 Mon Sep 17 00:00:00 2001 From: Raphael Assenat Date: Sat, 24 Oct 2015 22:54:34 -0400 Subject: [PATCH] Fixes for win32 --- tool/Makefile | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/tool/Makefile b/tool/Makefile index aa35bee..235e484 100644 --- a/tool/Makefile +++ b/tool/Makefile @@ -8,6 +8,11 @@ else HIDAPI_NAME=hidapi endif + +ifeq ($(shell uname -o), Msys) +COMPAT_OBJS=sleep.o memmem.o +endif + CFLAGS=-Wall -g `pkg-config $(HIDAPI_NAME) --cflags` LDFLAGS=`pkg-config $(HIDAPI_NAME) --libs` -g GTK_CFLAGS=`pkg-config --cflags gtk+-3.0 gmodule-2.0` @@ -20,11 +25,11 @@ PREFIX=/usr/local all: gcn64ctl gcn64ctl_gui -gcn64ctl_gui: gcn64ctl_gui.o gcn64.o gcn64lib.o mempak.o hexdump.o ihex.o - $(LD) $(LDFLAGS) $(GTK_LDFLAGS) $^ -o $@ +gcn64ctl_gui: gcn64ctl_gui.o gcn64.o gcn64lib.o mempak.o hexdump.o ihex.o $(COMPAT_OBJS) + $(LD) $^ $(LDFLAGS) $(GTK_LDFLAGS) -o $@ -gcn64ctl: main.o gcn64.o mempak.o gcn64lib.o hexdump.o gc2n64_adapter.o ihex.o delay.o - $(LD) $(LDFLAGS) $^ -o $@ +gcn64ctl: main.o gcn64.o mempak.o gcn64lib.o hexdump.o gc2n64_adapter.o ihex.o delay.o $(COMPAT_OBJS) + $(LD) $^ $(LDFLAGS) -o $@ gcn64ctl_gui.o: gcn64ctl_gui.c $(CC) $(CFLAGS) $(GTK_CFLAGS) -c $< @@ -33,7 +38,7 @@ gcn64ctl_gui.o: gcn64ctl_gui.c $(CC) $(CFLAGS) -c $< clean: - rm -f *.o gcn64ctl gcn64ctl_gui + rm -f *.o gcn64ctl gcn64ctl_gui gcn64ctl.exe gcn64ctl_gui.exe install: @echo "Install not done yet. Sorry"