Merge branch 'master' of ssh://git.lan.raphnet.net/raphnet/gc_n64_usb-v3

This commit is contained in:
Raphael Assenat 2015-10-24 23:51:10 -04:00
commit ba6e9f9850
1 changed files with 10 additions and 5 deletions

View File

@ -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"