1
0
mirror of https://github.com/raphnet/gc_n64_usb-v3 synced 2024-12-21 23:08:53 -05:00

Move gui stuff to main tool directory

This commit is contained in:
Raphael Assenat 2015-10-24 22:16:25 -04:00
parent 177668a42c
commit 467f3ab3a5
4 changed files with 17 additions and 36 deletions

View File

@ -3,23 +3,30 @@ LD=$(CC)
CFLAGS=-Wall -g `pkg-config hidapi-hidraw --cflags`
LDFLAGS=`pkg-config hidapi-hidraw --libs` -g
GTK_CFLAGS=`pkg-config --cflags gtk+-3.0 gmodule-2.0`
GTK_LDFLAGS=`pkg-config --libs gtk+-3.0 gmodule-2.0`
PREFIX=/usr/local
PROG=gcn64ctl
OBJS=main.o gcn64.o mempak.o gcn64lib.o hexdump.o gc2n64_adapter.o ihex.o delay.o
.PHONY : clean install
all: $(OBJS)
$(LD) $(LDFLAGS) $(OBJS) -o $(PROG)
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: main.o gcn64.o mempak.o gcn64lib.o hexdump.o gc2n64_adapter.o ihex.o delay.o
$(LD) $(LDFLAGS) $^ -o $@
gcn64ctl_gui.o: gcn64ctl_gui.c
$(CC) $(CFLAGS) $(GTK_CFLAGS) -c $<
%.o: %.c %.h
$(CC) $(CFLAGS) -c $<
clean:
rm -f *.o $(PROG)
rm -f *.o gcn64ctl gcn64ctl_gui
install:
@echo "Install not done yet. Sorry"

View File

@ -4,10 +4,10 @@
#include <string.h>
#include <glib.h>
#include <gtk/gtk.h>
#include "../gcn64.h"
#include "../gcn64lib.h"
#include "../../requests.h"
#include "../ihex.h"
#include "gcn64.h"
#include "gcn64lib.h"
#include "../requests.h"
#include "ihex.h"
#define GET_ELEMENT(TYPE, ELEMENT) (TYPE *)gtk_builder_get_object(app->builder, #ELEMENT)
#define GET_UI_ELEMENT(TYPE, ELEMENT) TYPE *ELEMENT = GET_ELEMENT(TYPE, ELEMENT)

View File

@ -1,26 +0,0 @@
CC=gcc
LD=$(CC)
CFLAGS=-Wall -g `pkg-config --cflags hidapi-hidraw gtk+-3.0 gmodule-2.0`
LDFLAGS=`pkg-config --libs hidapi-hidraw gtk+-3.0 gmodule-2.0`
PREFIX=/usr/local
PROG=gcn64ctl_gui
OBJS=main.o ../gcn64.o ../mempak.o ../gcn64lib.o ../hexdump.o ../ihex.o
.PHONY : clean install
all: $(OBJS)
$(LD) $(LDFLAGS) $(OBJS) -o $(PROG)
%.o: %.c %.h
$(CC) $(CFLAGS) -c $<
clean:
rm -f *.o $(PROG)
install:
@echo "Install not done yet. Sorry"