mirror
/
gc_n64_usb-v3
mirror of https://github.com/raphnet/gc_n64_usb-v3
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix gui compilation

This commit is contained in:
Raphael Assenat 2015-10-15 23:40:11 -04:00
parent e3c5feaf15
commit e988591eaf
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tool/gtk/Makefile
View File

@ -8,7 +8,7 @@ PREFIX=/usr/local
PROG=gcn64ctl_gui PROG=gcn64ctl_gui
OBJS=main.o ../gcn64.o ../mempak.o ../gcn64lib.o OBJS=main.o ../gcn64.o ../mempak.o ../gcn64lib.o ../hexdump.o
.PHONY : clean install .PHONY : clean install

16
tool/gtk/main.c
View File

@ -5,8 +5,8 @@
#include "../gcn64lib.h" #include "../gcn64lib.h"
#include "../../requests.h" #include "../../requests.h"
#define GET_UI_ELEMENT(TYPE, ELEMENT) TYPE *ELEMENT = (TYPE *) \ #define GET_ELEMENT(TYPE, ELEMENT) (TYPE *)gtk_builder_get_object(app->builder, #ELEMENT)
gtk_builder_get_object(app->builder, #ELEMENT); #define GET_UI_ELEMENT(TYPE, ELEMENT) TYPE *ELEMENT = GET_ELEMENT(TYPE, ELEMENT)
struct application { struct application {
GtkBuilder *builder; GtkBuilder *builder;
@ -50,11 +50,11 @@ G_MODULE_EXPORT void config_checkbox_changed(GtkWidget *win, gpointer data)
unsigned char cfg_param; unsigned char cfg_param;
GtkCheckButton *chkbtn; GtkCheckButton *chkbtn;
} configurable_bits[] = { } configurable_bits[] = {
{ CFG_PARAM_N64_SQUARE, GET_UI_ELEMENT(GtkCheckButton, chkbtn_n64_square) }, { CFG_PARAM_N64_SQUARE, GET_ELEMENT(GtkCheckButton, chkbtn_n64_square) },
{ CFG_PARAM_GC_MAIN_SQUARE, GET_UI_ELEMENT(GtkCheckButton, chkbtn_gc_main_square) }, { CFG_PARAM_GC_MAIN_SQUARE, GET_ELEMENT(GtkCheckButton, chkbtn_gc_main_square) },
{ CFG_PARAM_GC_CSTICK_SQUARE, GET_UI_ELEMENT(GtkCheckButton, chkbtn_gc_cstick_square) }, { CFG_PARAM_GC_CSTICK_SQUARE, GET_ELEMENT(GtkCheckButton, chkbtn_gc_cstick_square) },
{ CFG_PARAM_FULL_SLIDERS, GET_UI_ELEMENT(GtkCheckButton, chkbtn_gc_full_sliders) }, { CFG_PARAM_FULL_SLIDERS, GET_ELEMENT(GtkCheckButton, chkbtn_gc_full_sliders) },
{ CFG_PARAM_INVERT_TRIG, GET_UI_ELEMENT(GtkCheckButton, chkbtn_gc_invert_trig) }, { CFG_PARAM_INVERT_TRIG, GET_ELEMENT(GtkCheckButton, chkbtn_gc_invert_trig) },
{ }, { },
}; };
int i; int i;
@ -62,7 +62,7 @@ G_MODULE_EXPORT void config_checkbox_changed(GtkWidget *win, gpointer data)
for (i=0; configurable_bits[i].chkbtn; i++) { for (i=0; configurable_bits[i].chkbtn; i++) {
buf = gtk_toggle_button_get_active(configurable_bits[i].chkbtn); buf = gtk_toggle_button_get_active(configurable_bits[i].chkbtn);
gcn64lib_setConfig(app->current_adapter_handle, configurable_bits[i], &buf, 1); gcn64lib_setConfig(app->current_adapter_handle, configurable_bits[i].cfg_param, &buf, 1);
} }
} }