From 8391c83c1af484c41d819cec3ec58c26fca06864 Mon Sep 17 00:00:00 2001 From: damdoum Date: Tue, 30 Jan 2007 12:40:32 +0000 Subject: [PATCH] made Dev-cpp project for win32 users with gtk/glade fixed symbols for exports (glade ui signals) --- desmume/src/ctrlssdl.h | 4 +- desmume/src/gtk-glade/DeSmuME.dev | 689 ++++++++++++++++++ desmume/src/gtk-glade/callbacks.c | 4 +- desmume/src/gtk-glade/callbacks.h | 128 ++-- desmume/src/gtk-glade/callbacks_IO.h | 78 +- .../src/gtk-glade/dTools/callbacks_dtools.h | 48 +- desmume/src/gtk-glade/globals.h | 2 +- desmume/src/gtk-glade/main.c | 2 +- 8 files changed, 822 insertions(+), 133 deletions(-) create mode 100644 desmume/src/gtk-glade/DeSmuME.dev diff --git a/desmume/src/ctrlssdl.h b/desmume/src/ctrlssdl.h index d26faf85c..425623f76 100644 --- a/desmume/src/ctrlssdl.h +++ b/desmume/src/ctrlssdl.h @@ -26,8 +26,8 @@ #include #include #include -#include -#include "SDL.h" +//#include +#include #include "MMU.h" #include "types.h" diff --git a/desmume/src/gtk-glade/DeSmuME.dev b/desmume/src/gtk-glade/DeSmuME.dev new file mode 100644 index 000000000..28058422f --- /dev/null +++ b/desmume/src/gtk-glade/DeSmuME.dev @@ -0,0 +1,689 @@ +[Project] +FileName=DeSmuME.dev +Name=DeSmuME +UnitCount=64 +Type=1 +Ver=1 +ObjFiles= +Includes=Z:\Dev-Cpp\include\SDL;z:\GTK\INCLUDE;z:\GTK\INCLUDE\GTK-2.0;z:\GTK\INCLUDE\GLIB-2.0;z:\GTK\INCLUDE\PANGO-1.0;z:\GTK\INCLUDE\CAIRO;z:\GTK\INCLUDE\ATK-1.0;z:\GTK\INCLUDE\LIBGLADE-2.0;Z:\GTK\include\libglade-2.0\glade;z:\GTK\INCLUDE\LIBXML2;z:\GTK\LIB\GTK-2.0\INCLUDE;z:\GTK\LIB\GLIB-2.0\INCLUDE;Z:\GTK\include\gtkglext-1.0 +Libs=Z:\Dev-Cpp\lib;z:\GTK\LIB;Z:\GTK\lib\glib-2.0;Z:\GTK\lib\gtk-2.0;Z:\GTK\lib\libglade;Z:\GTK\lib\libglade\2.0;Z:\GTK\lib\gtkglext-1.0 +PrivateResource= +ResourceIncludes= +MakeIncludes= +Compiler=-DVERSION=\"0.5.0\"_@@_-DHAVE_LIBZ_@@_-mms-bitfields_@@_-rdynamic_@@_-shared_@@__@@_ +CppCompiler= +Linker=Z:/Dev-Cpp/dll/SDL.dll_@@_Z:/GTK/lib/z.lib_@@_Z:/GTK/lib/atk-1.0.lib_@@_Z:/GTK/lib/cairo.lib_@@_Z:/GTK/lib/gdk_pixbuf-2.0.lib_@@_Z:/GTK/lib/gdk-win32-2.0.lib_@@_Z:/GTK/lib/glade-2.0.lib_@@_Z:/GTK/lib/glib-2.0.lib_@@_Z:/GTK/lib/gmodule-2.0.lib_@@_Z:/GTK/lib/gobject-2.0.lib_@@_Z:/GTK/lib/gtk-win32-2.0.lib_@@_Z:/GTK/lib/pango-1.0.lib_@@_Z:/GTK/lib/pangocairo-1.0.lib_@@_Z:/GTK/lib/pangowin32-1.0.lib_@@_Z:/GTK/lib/xml2.lib_@@_ +IsCpp=0 +Icon= +ExeOutput= +ObjectOutput= +OverrideOutput=0 +OverrideOutputName=DeSmuME.exe +HostApplication= +Folders=gtk-glade,gtk-glade/dTools +CommandLine= +UseCustomMakefile=0 +CustomMakefile= +IncludeVersionInfo=0 +SupportXPThemes=0 +CompilerSet=0 +CompilerSettings=00000000010010010000ib + +[Unit1] +FileName=callbacks.c +CompileCpp=0 +Folder=gtk-glade +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit2] +FileName=callbacks.h +CompileCpp=0 +Folder=gtk-glade +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit3] +FileName=callbacks_IO.c +CompileCpp=0 +Folder=gtk-glade +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit4] +FileName=callbacks_IO.h +CompileCpp=0 +Folder=gtk-glade +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit5] +FileName=desmume.c +CompileCpp=0 +Folder=gtk-glade +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit6] +FileName=desmume.h +CompileCpp=0 +Folder=gtk-glade +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit7] +FileName=globals.h +CompileCpp=0 +Folder=gtk-glade +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit8] +FileName=keyval_names.c +CompileCpp=0 +Folder=gtk-glade +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit9] +FileName=main.c +CompileCpp=0 +Folder=gtk-glade +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit10] +FileName=printscreen.c +CompileCpp=0 +Folder=gtk-glade +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit11] +FileName=..\ARM9.c +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit12] +FileName=..\ARM9.h +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit13] +FileName=..\arm_instructions.c +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit14] +FileName=..\arm_instructions.h +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit15] +FileName=..\armcpu.c +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit16] +FileName=..\armcpu.h +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit17] +FileName=..\bios.c +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit18] +FileName=..\bios.h +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit19] +FileName=..\bits.h +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit20] +FileName=..\cflash.c +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit21] +FileName=..\cflash.h +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit22] +FileName=..\config.h +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit23] +FileName=..\cp15.c +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit24] +FileName=..\cp15.h +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit25] +FileName=..\ctrlssdl.c +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit26] +FileName=..\ctrlssdl.h +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit27] +FileName=..\debug.c +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit28] +FileName=..\debug.h +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit29] +FileName=..\Disassembler.c +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit30] +FileName=..\Disassembler.h +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit31] +FileName=..\dscard.h +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit32] +FileName=..\fat.h +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit33] +FileName=..\FIFO.c +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit34] +FileName=..\FIFO.h +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit35] +FileName=..\fs.h +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit36] +FileName=..\fs-windows.c +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit37] +FileName=..\GPU.c +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit38] +FileName=..\GPU.h +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit39] +FileName=..\mc.c +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit40] +FileName=..\mc.h +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit41] +FileName=..\mem.h +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit42] +FileName=..\MMU.c +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit43] +FileName=..\MMU.h +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit44] +FileName=..\NDSSystem.c +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit45] +FileName=..\NDSSystem.h +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit46] +FileName=..\registers.h +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit47] +FileName=..\ROMReader.c +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit48] +FileName=..\ROMReader.h +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit49] +FileName=..\saves.c +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit50] +FileName=..\saves.h +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit51] +FileName=..\sndsdl.c +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit52] +FileName=..\sndsdl.h +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit53] +FileName=..\SPU.c +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit54] +FileName=..\SPU.h +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit55] +FileName=..\thumb_instructions.c +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit56] +FileName=..\thumb_instructions.h +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit57] +FileName=..\types.h +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit58] +FileName=..\wifi.c +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit59] +FileName=..\wifi.h +CompileCpp=0 +Folder=DeSmuME +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit60] +FileName=dTools\callbacks_1_ioregs.c +CompileCpp=0 +Folder=gtk-glade/dTools +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit61] +FileName=dTools\callbacks_2_memview.c +CompileCpp=0 +Folder=gtk-glade/dTools +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit62] +FileName=dTools\callbacks_3_palview.c +CompileCpp=0 +Folder=gtk-glade/dTools +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit63] +FileName=dTools\callbacks_dtools.h +CompileCpp=0 +Folder=gtk-glade/dTools +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit64] +FileName=dTools\dTools_display.h +CompileCpp=0 +Folder=gtk-glade/dTools +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[VersionInfo] +Major=0 +Minor=1 +Release=1 +Build=1 +LanguageID=1033 +CharsetID=1252 +CompanyName= +FileVersion= +FileDescription=Developed using the Dev-C++ IDE +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion= +AutoIncBuildNr=0 + diff --git a/desmume/src/gtk-glade/callbacks.c b/desmume/src/gtk-glade/callbacks.c index c4f1bf29d..256b6def5 100755 --- a/desmume/src/gtk-glade/callbacks.c +++ b/desmume/src/gtk-glade/callbacks.c @@ -23,7 +23,7 @@ #include "callbacks.h" /* globals */ -uint Frameskip = 0; +int Frameskip = 0; gboolean ScreenRight=FALSE; gboolean ScreenGap=FALSE; @@ -123,7 +123,7 @@ void file_open() { } gtk_widget_destroy(pFileSelection); } - + void on_menu_ouvrir_activate (GtkMenuItem *menuitem, gpointer user_data) { file_open();} void on_menu_pscreen_activate (GtkMenuItem *menuitem, gpointer user_data) { WriteBMP("./test.bmp",GPU_screen); } void on_menu_quit_activate (GtkMenuItem *menuitem, gpointer user_data) { gtk_main_quit(); } diff --git a/desmume/src/gtk-glade/callbacks.h b/desmume/src/gtk-glade/callbacks.h index bc4dc209c..2c3c806f3 100755 --- a/desmume/src/gtk-glade/callbacks.h +++ b/desmume/src/gtk-glade/callbacks.h @@ -22,92 +22,92 @@ #include "globals.h" /* MENU FILE */ -void on_menu_ouvrir_activate (GtkMenuItem *menuitem, gpointer user_data); -void on_menu_pscreen_activate (GtkMenuItem *menuitem, gpointer user_data); -void on_menu_quit_activate (GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_menu_ouvrir_activate (GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_menu_pscreen_activate (GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_menu_quit_activate (GtkMenuItem *menuitem, gpointer user_data); /* MENU SAVES */ -void on_loadstate1_activate (GtkMenuItem *, gpointer ); -void on_loadstate2_activate (GtkMenuItem *, gpointer ); -void on_loadstate3_activate (GtkMenuItem *, gpointer ); -void on_loadstate4_activate (GtkMenuItem *, gpointer ); -void on_loadstate5_activate (GtkMenuItem *, gpointer ); -void on_loadstate6_activate (GtkMenuItem *, gpointer ); -void on_loadstate7_activate (GtkMenuItem *, gpointer ); -void on_loadstate8_activate (GtkMenuItem *, gpointer ); -void on_loadstate9_activate (GtkMenuItem *, gpointer ); -void on_loadstate10_activate(GtkMenuItem *, gpointer ); +G_MODULE_EXPORT void on_loadstate1_activate (GtkMenuItem *, gpointer ); +G_MODULE_EXPORT void on_loadstate2_activate (GtkMenuItem *, gpointer ); +G_MODULE_EXPORT void on_loadstate3_activate (GtkMenuItem *, gpointer ); +G_MODULE_EXPORT void on_loadstate4_activate (GtkMenuItem *, gpointer ); +G_MODULE_EXPORT void on_loadstate5_activate (GtkMenuItem *, gpointer ); +G_MODULE_EXPORT void on_loadstate6_activate (GtkMenuItem *, gpointer ); +G_MODULE_EXPORT void on_loadstate7_activate (GtkMenuItem *, gpointer ); +G_MODULE_EXPORT void on_loadstate8_activate (GtkMenuItem *, gpointer ); +G_MODULE_EXPORT void on_loadstate9_activate (GtkMenuItem *, gpointer ); +G_MODULE_EXPORT void on_loadstate10_activate(GtkMenuItem *, gpointer ); -void on_savestate1_activate (GtkMenuItem *, gpointer ); -void on_savestate2_activate (GtkMenuItem *, gpointer ); -void on_savestate3_activate (GtkMenuItem *, gpointer ); -void on_savestate4_activate (GtkMenuItem *, gpointer ); -void on_savestate5_activate (GtkMenuItem *, gpointer ); -void on_savestate6_activate (GtkMenuItem *, gpointer ); -void on_savestate7_activate (GtkMenuItem *, gpointer ); -void on_savestate8_activate (GtkMenuItem *, gpointer ); -void on_savestate9_activate (GtkMenuItem *, gpointer ); -void on_savestate10_activate(GtkMenuItem *, gpointer ); +G_MODULE_EXPORT void on_savestate1_activate (GtkMenuItem *, gpointer ); +G_MODULE_EXPORT void on_savestate2_activate (GtkMenuItem *, gpointer ); +G_MODULE_EXPORT void on_savestate3_activate (GtkMenuItem *, gpointer ); +G_MODULE_EXPORT void on_savestate4_activate (GtkMenuItem *, gpointer ); +G_MODULE_EXPORT void on_savestate5_activate (GtkMenuItem *, gpointer ); +G_MODULE_EXPORT void on_savestate6_activate (GtkMenuItem *, gpointer ); +G_MODULE_EXPORT void on_savestate7_activate (GtkMenuItem *, gpointer ); +G_MODULE_EXPORT void on_savestate8_activate (GtkMenuItem *, gpointer ); +G_MODULE_EXPORT void on_savestate9_activate (GtkMenuItem *, gpointer ); +G_MODULE_EXPORT void on_savestate10_activate(GtkMenuItem *, gpointer ); /* MENU EMULATION */ -void on_menu_exec_activate (GtkMenuItem *menuitem, gpointer user_data); -void on_menu_pause_activate (GtkMenuItem *menuitem, gpointer user_data); -void on_menu_reset_activate (GtkMenuItem *menuitem, gpointer user_data); -void on_menu_layers_activate (GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_menu_exec_activate (GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_menu_pause_activate (GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_menu_reset_activate (GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_menu_layers_activate (GtkMenuItem *menuitem, gpointer user_data); /* SUBMENU FRAMESKIP */ -void on_fsXX_activate (GtkMenuItem *menuitem, gpointer user_data); -void on_fs0_activate (GtkMenuItem *menuitem, gpointer user_data); -void on_fs1_activate (GtkMenuItem *menuitem, gpointer user_data); -void on_fs2_activate (GtkMenuItem *menuitem, gpointer user_data); -void on_fs3_activate (GtkMenuItem *menuitem, gpointer user_data); -void on_fs4_activate (GtkMenuItem *menuitem, gpointer user_data); -void on_fs5_activate (GtkMenuItem *menuitem, gpointer user_data); -void on_fs6_activate (GtkMenuItem *menuitem, gpointer user_data); -void on_fs7_activate (GtkMenuItem *menuitem, gpointer user_data); -void on_fs8_activate (GtkMenuItem *menuitem, gpointer user_data); -void on_fs9_activate (GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_fsXX_activate (GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_fs0_activate (GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_fs1_activate (GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_fs2_activate (GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_fs3_activate (GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_fs4_activate (GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_fs5_activate (GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_fs6_activate (GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_fs7_activate (GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_fs8_activate (GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_fs9_activate (GtkMenuItem *menuitem, gpointer user_data); /* SUBMENU SIZE */ -void on_size1x_activate (GtkMenuItem *menuitem, gpointer user_data); -void on_size2x_activate (GtkMenuItem *menuitem, gpointer user_data); -void on_size3x_activate (GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_size1x_activate (GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_size2x_activate (GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_size3x_activate (GtkMenuItem *menuitem, gpointer user_data); /* MENU CONFIG */ -void on_menu_controls_activate (GtkMenuItem *menuitem, gpointer user_data); -void on_menu_audio_on_activate (GtkMenuItem *menuitem, gpointer user_data); -void on_menu_gapscreen_activate (GtkMenuItem *menuitem, gpointer user_data); -void on_menu_rightscreen_activate (GtkMenuItem *menuitem, gpointer user_data); -void on_menu_rotatescreen_activate (GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_menu_controls_activate (GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_menu_audio_on_activate (GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_menu_gapscreen_activate (GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_menu_rightscreen_activate (GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_menu_rotatescreen_activate (GtkMenuItem *menuitem, gpointer user_data); /* MENU TOOLS */ -void on_menu_IO_regs_activate (GtkMenuItem *menuitem, gpointer user_data); -void on_menu_memview_activate (GtkMenuItem *menuitem, gpointer user_data); -void on_menu_palview_activate (GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_menu_IO_regs_activate (GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_menu_memview_activate (GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_menu_palview_activate (GtkMenuItem *menuitem, gpointer user_data); /* MENU ? */ -void on_menu_apropos_activate (GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_menu_apropos_activate (GtkMenuItem *menuitem, gpointer user_data); /* TOOLBAR */ -void on_wgt_Open_clicked (GtkToolButton *toolbutton, gpointer user_data); -void on_wgt_Exec_toggled (GtkToggleToolButton *toggletoolbutton, +G_MODULE_EXPORT void on_wgt_Open_clicked (GtkToolButton *toolbutton, gpointer user_data); +G_MODULE_EXPORT void on_wgt_Exec_toggled (GtkToggleToolButton *toggletoolbutton, gpointer user_data); -void on_wgt_Reset_clicked (GtkToolButton *toolbutton, gpointer user_data); -void on_wgt_Quit_clicked (GtkToolButton *toolbutton, gpointer user_data); +G_MODULE_EXPORT void on_wgt_Reset_clicked (GtkToolButton *toolbutton, gpointer user_data); +G_MODULE_EXPORT void on_wgt_Quit_clicked (GtkToolButton *toolbutton, gpointer user_data); /* LAYERS MAIN SCREEN */ -void on_wc_1_BG0_toggled (GtkToggleButton *togglebutton, gpointer user_data); -void on_wc_1_BG1_toggled (GtkToggleButton *togglebutton, gpointer user_data); -void on_wc_1_BG2_toggled (GtkToggleButton *togglebutton, gpointer user_data); -void on_wc_1_BG3_toggled (GtkToggleButton *togglebutton, gpointer user_data); -void on_wc_1_OBJ_toggled (GtkToggleButton *togglebutton, gpointer user_data); +G_MODULE_EXPORT void on_wc_1_BG0_toggled (GtkToggleButton *togglebutton, gpointer user_data); +G_MODULE_EXPORT void on_wc_1_BG1_toggled (GtkToggleButton *togglebutton, gpointer user_data); +G_MODULE_EXPORT void on_wc_1_BG2_toggled (GtkToggleButton *togglebutton, gpointer user_data); +G_MODULE_EXPORT void on_wc_1_BG3_toggled (GtkToggleButton *togglebutton, gpointer user_data); +G_MODULE_EXPORT void on_wc_1_OBJ_toggled (GtkToggleButton *togglebutton, gpointer user_data); /* LAYERS SECOND SCREEN */ -void on_wc_2b_BG0_toggled (GtkToggleButton *togglebutton, gpointer user_data); -void on_wc_2b_BG1_toggled (GtkToggleButton *togglebutton, gpointer user_data); -void on_wc_2b_BG2_toggled (GtkToggleButton *togglebutton, gpointer user_data); -void on_wc_2b_BG3_toggled (GtkToggleButton *togglebutton, gpointer user_data); -void on_wc_2b_OBJ_toggled (GtkToggleButton *togglebutton, gpointer user_data); +G_MODULE_EXPORT void on_wc_2b_BG0_toggled (GtkToggleButton *togglebutton, gpointer user_data); +G_MODULE_EXPORT void on_wc_2b_BG1_toggled (GtkToggleButton *togglebutton, gpointer user_data); +G_MODULE_EXPORT void on_wc_2b_BG2_toggled (GtkToggleButton *togglebutton, gpointer user_data); +G_MODULE_EXPORT void on_wc_2b_BG3_toggled (GtkToggleButton *togglebutton, gpointer user_data); +G_MODULE_EXPORT void on_wc_2b_OBJ_toggled (GtkToggleButton *togglebutton, gpointer user_data); diff --git a/desmume/src/gtk-glade/callbacks_IO.h b/desmume/src/gtk-glade/callbacks_IO.h index 774291681..c8cd5d698 100755 --- a/desmume/src/gtk-glade/callbacks_IO.h +++ b/desmume/src/gtk-glade/callbacks_IO.h @@ -23,60 +23,60 @@ #include "globals.h" /* INPUT BUTTONS / KEYBOARD */ -gboolean on_wMainW_key_press_event (GtkWidget *widget, GdkEventKey *event, gpointer user_data); -gboolean on_wMainW_key_release_event (GtkWidget *widget, GdkEventKey *event, gpointer user_data); +G_MODULE_EXPORT gboolean on_wMainW_key_press_event (GtkWidget *widget, GdkEventKey *event, gpointer user_data); +G_MODULE_EXPORT gboolean on_wMainW_key_release_event (GtkWidget *widget, GdkEventKey *event, gpointer user_data); /* OUTPUT UPPER SCREEN */ -void on_wDraw_Main_realize (GtkWidget *widget, gpointer user_data); -gboolean on_wDraw_Main_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data); +G_MODULE_EXPORT void on_wDraw_Main_realize (GtkWidget *widget, gpointer user_data); +G_MODULE_EXPORT gboolean on_wDraw_Main_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data); /* OUTPUT LOWER SCREEN */ -void on_wDraw_Sub_realize (GtkWidget *widget, gpointer user_data); -gboolean on_wDraw_Sub_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data); +G_MODULE_EXPORT void on_wDraw_Sub_realize (GtkWidget *widget, gpointer user_data); +G_MODULE_EXPORT gboolean on_wDraw_Sub_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data); /* INPUT STYLUS / MOUSE */ -gboolean on_wDraw_Sub_button_press_event (GtkWidget *widget, GdkEventButton *event, gpointer user_data); -gboolean on_wDraw_Sub_button_release_event (GtkWidget *widget, GdkEventButton *event, gpointer user_data); -gboolean on_wDraw_Sub_motion_notify_event (GtkWidget *widget, GdkEventMotion *event, gpointer user_data); +G_MODULE_EXPORT gboolean on_wDraw_Sub_button_press_event (GtkWidget *widget, GdkEventButton *event, gpointer user_data); +G_MODULE_EXPORT gboolean on_wDraw_Sub_button_release_event (GtkWidget *widget, GdkEventButton *event, gpointer user_data); +G_MODULE_EXPORT gboolean on_wDraw_Sub_motion_notify_event (GtkWidget *widget, GdkEventMotion *event, gpointer user_data); /* KEYBOARD CONFIG / KEY DEFINITION */ -gboolean on_wKeyDlg_key_press_event (GtkWidget *widget, GdkEventKey *event, gpointer user_data); -void on_wKeybConfDlg_response (GtkDialog *dialog, gint arg1, gpointer user_data); +G_MODULE_EXPORT gboolean on_wKeyDlg_key_press_event (GtkWidget *widget, GdkEventKey *event, gpointer user_data); +G_MODULE_EXPORT void on_wKeybConfDlg_response (GtkDialog *dialog, gint arg1, gpointer user_data); -void on_button_Left_clicked (GtkButton *button, gpointer user_data); -void on_button_Up_clicked (GtkButton *button, gpointer user_data); -void on_button_Right_clicked (GtkButton *button, gpointer user_data); -void on_button_Down_clicked (GtkButton *button, gpointer user_data); +G_MODULE_EXPORT void on_button_Left_clicked (GtkButton *button, gpointer user_data); +G_MODULE_EXPORT void on_button_Up_clicked (GtkButton *button, gpointer user_data); +G_MODULE_EXPORT void on_button_Right_clicked (GtkButton *button, gpointer user_data); +G_MODULE_EXPORT void on_button_Down_clicked (GtkButton *button, gpointer user_data); -void on_button_L_clicked (GtkButton *button, gpointer user_data); -void on_button_R_clicked (GtkButton *button, gpointer user_data); +G_MODULE_EXPORT void on_button_L_clicked (GtkButton *button, gpointer user_data); +G_MODULE_EXPORT void on_button_R_clicked (GtkButton *button, gpointer user_data); -void on_button_Y_clicked (GtkButton *button, gpointer user_data); -void on_button_X_clicked (GtkButton *button, gpointer user_data); -void on_button_A_clicked (GtkButton *button, gpointer user_data); -void on_button_B_clicked (GtkButton *button, gpointer user_data); +G_MODULE_EXPORT void on_button_Y_clicked (GtkButton *button, gpointer user_data); +G_MODULE_EXPORT void on_button_X_clicked (GtkButton *button, gpointer user_data); +G_MODULE_EXPORT void on_button_A_clicked (GtkButton *button, gpointer user_data); +G_MODULE_EXPORT void on_button_B_clicked (GtkButton *button, gpointer user_data); -void on_button_Start_clicked (GtkButton *button, gpointer user_data); -void on_button_Select_clicked (GtkButton *button, gpointer user_data); -void on_button_Debug_clicked (GtkButton *button, gpointer user_data); -void on_button_Boost_clicked (GtkButton *button, gpointer user_data); +G_MODULE_EXPORT void on_button_Start_clicked (GtkButton *button, gpointer user_data); +G_MODULE_EXPORT void on_button_Select_clicked (GtkButton *button, gpointer user_data); +G_MODULE_EXPORT void on_button_Debug_clicked (GtkButton *button, gpointer user_data); +G_MODULE_EXPORT void on_button_Boost_clicked (GtkButton *button, gpointer user_data); /* Joystick configuration / Key definition */ -void on_button_joy_Left_clicked (GtkButton *button, gpointer user_data); -void on_button_joy_Up_clicked (GtkButton *button, gpointer user_data); -void on_button_joy_Right_clicked (GtkButton *button, gpointer user_data); -void on_button_joy_Down_clicked (GtkButton *button, gpointer user_data); -void on_button_joy_Y_clicked (GtkButton *button, gpointer user_data); -void on_button_joy_X_clicked (GtkButton *button, gpointer user_data); -void on_button_joy_A_clicked (GtkButton *button, gpointer user_data); -void on_button_joy_B_clicked (GtkButton *button, gpointer user_data); -void on_button_joy_Select_clicked (GtkButton *button, gpointer user_data); -void on_button_joy_L_clicked (GtkButton *button, gpointer user_data); -void on_button_joy_R_clicked (GtkButton *button, gpointer user_data); -void on_button_joy_Debug_clicked (GtkButton *button, gpointer user_data); -void on_button_joy_Start_clicked (GtkButton *button, gpointer user_data); -void on_button_joy_Boost_clicked (GtkButton *button, gpointer user_data); +G_MODULE_EXPORT void on_button_joy_Left_clicked (GtkButton *button, gpointer user_data); +G_MODULE_EXPORT void on_button_joy_Up_clicked (GtkButton *button, gpointer user_data); +G_MODULE_EXPORT void on_button_joy_Right_clicked (GtkButton *button, gpointer user_data); +G_MODULE_EXPORT void on_button_joy_Down_clicked (GtkButton *button, gpointer user_data); +G_MODULE_EXPORT void on_button_joy_Y_clicked (GtkButton *button, gpointer user_data); +G_MODULE_EXPORT void on_button_joy_X_clicked (GtkButton *button, gpointer user_data); +G_MODULE_EXPORT void on_button_joy_A_clicked (GtkButton *button, gpointer user_data); +G_MODULE_EXPORT void on_button_joy_B_clicked (GtkButton *button, gpointer user_data); +G_MODULE_EXPORT void on_button_joy_Select_clicked (GtkButton *button, gpointer user_data); +G_MODULE_EXPORT void on_button_joy_L_clicked (GtkButton *button, gpointer user_data); +G_MODULE_EXPORT void on_button_joy_R_clicked (GtkButton *button, gpointer user_data); +G_MODULE_EXPORT void on_button_joy_Debug_clicked (GtkButton *button, gpointer user_data); +G_MODULE_EXPORT void on_button_joy_Start_clicked (GtkButton *button, gpointer user_data); +G_MODULE_EXPORT void on_button_joy_Boost_clicked (GtkButton *button, gpointer user_data); diff --git a/desmume/src/gtk-glade/dTools/callbacks_dtools.h b/desmume/src/gtk-glade/dTools/callbacks_dtools.h index 67d553be7..ee7bb8626 100755 --- a/desmume/src/gtk-glade/dTools/callbacks_dtools.h +++ b/desmume/src/gtk-glade/dTools/callbacks_dtools.h @@ -22,33 +22,33 @@ #include "../globals.h" /* ***** ***** IO REGISTERS ***** ***** */ -void on_wtools_1_combo_cpu_changed (GtkComboBox *, gpointer ); -void on_wtools_1_IOregs_show (GtkWidget *, gpointer ); -gboolean on_wtools_1_IOregs_close (GtkWidget *, ...); -gboolean on_wtools_1_draw_button_release_event(GtkWidget *, GdkEventButton *, gpointer ); -gboolean on_wtools_1_draw_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data); +G_MODULE_EXPORT void on_wtools_1_combo_cpu_changed (GtkComboBox *, gpointer ); +G_MODULE_EXPORT void on_wtools_1_IOregs_show (GtkWidget *, gpointer ); +G_MODULE_EXPORT gboolean on_wtools_1_IOregs_close (GtkWidget *, ...); +G_MODULE_EXPORT gboolean on_wtools_1_draw_button_release_event(GtkWidget *, GdkEventButton *, gpointer ); +G_MODULE_EXPORT gboolean on_wtools_1_draw_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data); /* ***** ***** MEMORY VIEWER ***** ***** */ -void on_wtools_2_MemView_show (GtkWidget *, gpointer ); -gboolean on_wtools_2_MemView_close (GtkWidget *, ...); +G_MODULE_EXPORT void on_wtools_2_MemView_show (GtkWidget *, gpointer ); +G_MODULE_EXPORT gboolean on_wtools_2_MemView_close (GtkWidget *, ...); -void on_wtools_2_cpu_changed (GtkComboBox *, gpointer ); -void on_wtools_2_r8_toggled (GtkToggleButton *, gpointer ); -void on_wtools_2_r16_toggled (GtkToggleButton *, gpointer ); -void on_wtools_2_r32_toggled (GtkToggleButton *, gpointer ); -void on_wtools_2_GotoAddress_activate (GtkEntry *, gpointer ); -void on_wtools_2_GotoAddress_changed (GtkEntry *, gpointer ); -void on_wtools_2_GotoButton_clicked (GtkButton *, gpointer ); -void on_wtools_2_scroll_value_changed (GtkRange *, gpointer ); -gboolean on_wtools_2_draw_button_release_event(GtkWidget *, GdkEventButton *, gpointer ); -gboolean on_wtools_2_draw_expose_event (GtkWidget *, GdkEventExpose *, gpointer ); -gboolean on_wtools_2_draw_scroll_event (GtkWidget *, GdkEventScroll *, gpointer ); +G_MODULE_EXPORT void on_wtools_2_cpu_changed (GtkComboBox *, gpointer ); +G_MODULE_EXPORT void on_wtools_2_r8_toggled (GtkToggleButton *, gpointer ); +G_MODULE_EXPORT void on_wtools_2_r16_toggled (GtkToggleButton *, gpointer ); +G_MODULE_EXPORT void on_wtools_2_r32_toggled (GtkToggleButton *, gpointer ); +G_MODULE_EXPORT void on_wtools_2_GotoAddress_activate (GtkEntry *, gpointer ); +G_MODULE_EXPORT void on_wtools_2_GotoAddress_changed (GtkEntry *, gpointer ); +G_MODULE_EXPORT void on_wtools_2_GotoButton_clicked (GtkButton *, gpointer ); +G_MODULE_EXPORT void on_wtools_2_scroll_value_changed (GtkRange *, gpointer ); +G_MODULE_EXPORT gboolean on_wtools_2_draw_button_release_event(GtkWidget *, GdkEventButton *, gpointer ); +G_MODULE_EXPORT gboolean on_wtools_2_draw_expose_event (GtkWidget *, GdkEventExpose *, gpointer ); +G_MODULE_EXPORT gboolean on_wtools_2_draw_scroll_event (GtkWidget *, GdkEventScroll *, gpointer ); /* ***** ***** PALETTE VIEWER ***** ***** */ -void on_wtools_3_PalView_show (GtkWidget *, gpointer ); -gboolean on_wtools_3_PalView_close (GtkWidget *, ...); +G_MODULE_EXPORT void on_wtools_3_PalView_show (GtkWidget *, gpointer ); +G_MODULE_EXPORT gboolean on_wtools_3_PalView_close (GtkWidget *, ...); -gboolean on_wtools_3_PalView_delete_event (GtkWidget *, GdkEvent *, gpointer ); -gboolean on_wtools_3_draw_expose_event (GtkWidget *, GdkEventExpose *, gpointer ); -void on_wtools_3_palette_changed (GtkComboBox *, gpointer ); -void on_wtools_3_palnum_value_changed (GtkSpinButton *, gpointer ); +G_MODULE_EXPORT gboolean on_wtools_3_PalView_delete_event (GtkWidget *, GdkEvent *, gpointer ); +G_MODULE_EXPORT gboolean on_wtools_3_draw_expose_event (GtkWidget *, GdkEventExpose *, gpointer ); +G_MODULE_EXPORT void on_wtools_3_palette_changed (GtkComboBox *, gpointer ); +G_MODULE_EXPORT void on_wtools_3_palnum_value_changed (GtkSpinButton *, gpointer ); diff --git a/desmume/src/gtk-glade/globals.h b/desmume/src/gtk-glade/globals.h index e6b94158d..c538f4894 100755 --- a/desmume/src/gtk-glade/globals.h +++ b/desmume/src/gtk-glade/globals.h @@ -48,7 +48,7 @@ #include "../saves.h" #include "desmume.h" -uint Frameskip; +int Frameskip; u16 Keypad_Temp[NB_KEYS]; /* main.c */ diff --git a/desmume/src/gtk-glade/main.c b/desmume/src/gtk-glade/main.c index ff8329744..9c4119249 100755 --- a/desmume/src/gtk-glade/main.c +++ b/desmume/src/gtk-glade/main.c @@ -193,7 +193,7 @@ void update_savestate(u8 num) #ifdef WIN32 -int WinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPSTR lpszArgument, int nFunsterStil) +int WinMain () { main(0,NULL); }