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

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

This commit is contained in:
Raphael Assenat 2015-11-03 20:30:16 -05:00
parent d8890e2982 96462574fd
commit 14dab7d12d
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tool/Makefile
View File

@ -20,11 +20,12 @@ GTK_LDFLAGS=`pkg-config --libs gtk+-3.0 gmodule-2.0`
PREFIX=/usr/local
PROGS=gcn64ctl mempak_ls mempak_format mempak_extract_note mempak_insert_note mempak_rm mempak_convert gcn64ctl_gui
MEMPAKLIB_OBJS=mempak.o mempak_fs.o
.PHONY : clean install
all: gcn64ctl mempak_ls mempak_format mempak_extract_note mempak_insert_note mempak_rm mempak_convert gcn64ctl_gui
all: $(PROGS)
gcn64ctl_gui: gcn64ctl_gui.o gcn64ctl_gui_mpkedit.o gcn64.o gcn64lib.o hexdump.o ihex.o mempak_gcn64usb.o $(COMPAT_OBJS) $(MEMPAKLIB_OBJS)
$(LD) $^ $(LDFLAGS) $(GTK_LDFLAGS) -o $@
@ -61,7 +62,7 @@ mempak_format: mempak_format.o $(MEMPAKLIB_OBJS)
$(CC) $(CFLAGS) -c $<
clean:
rm -f *.o gcn64ctl gcn64ctl_gui gcn64ctl.exe gcn64ctl_gui.exe
rm -f *.o *.exe $(PROGS)
install:
@echo "Install not done yet. Sorry"

2
tool/gcn64ctl_gui_mpkedit.c
View File

@ -138,7 +138,7 @@ void mpke_syncModel(struct application *app)
gtk_list_store_set(n64_notes, &iter, 0, i, 1, "!!ERROR!!", 2, 0, -1);
} else {
if (note_data.valid) {
gtk_list_store_set(n64_notes, &iter, 0, i, 1, note_data.name, 2, note_data.blocks, -1);
gtk_list_store_set(n64_notes, &iter, 0, i, 1, note_data.name, 2, note_data.blocks, 3, app->mpke->mpk->note_comments[i], -1);
} else {
gtk_list_store_set(n64_notes, &iter, 0, i, -1);
}