ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Code cleanup by riccardom (patch 2155179) 

Fixed the compilation for gtk-glade port.
This commit is contained in:
yabause 2008-10-09 19:57:28 +00:00
parent dc4ffd3119
commit efe749182a
4 changed files with 344 additions and 400 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
desmume/src/gtk-glade/desmume.cpp
View File

@ -63,7 +63,7 @@ void desmume_free()
int desmume_open(const char *filename) int desmume_open(const char *filename)
{ {
int i; int i;
noticed_3D=attempted_3D_op=FALSE; noticed_3D=FALSE;
clear_savestates(); clear_savestates();
i = NDS_LoadROM(filename, savetype, savesize, NULL); i = NDS_LoadROM(filename, savetype, savesize, NULL);
return i; return i;
@ -91,7 +91,7 @@ void desmume_resume()
void desmume_reset() void desmume_reset()
{ {
noticed_3D=attempted_3D_op=FALSE; noticed_3D=FALSE;
NDS_Reset(); NDS_Reset();
desmume_resume(); desmume_resume();
} }
@ -130,7 +130,7 @@ static void Draw()
gboolean EmuLoop(gpointer data) gboolean EmuLoop(gpointer data)
{ {
int i; int i;
if (!noticed_3D && attempted_3D_op) { if (!noticed_3D) {
GtkWidget * dlg = glade_xml_get_widget(xml, "w3Dop"); GtkWidget * dlg = glade_xml_get_widget(xml, "w3Dop");
gtk_widget_show(dlg); gtk_widget_show(dlg);
noticed_3D=TRUE; noticed_3D=TRUE;

1
desmume/src/gtk-glade/globals.h
View File

@ -94,7 +94,6 @@ typedef union _callback_arg{
#include "../ctrlssdl.h" #include "../ctrlssdl.h"
#include "../types.h" #include "../types.h"
#include "../saves.h" #include "../saves.h"
#include "../gl_vertex.h"
#include "../render3D.h" #include "../render3D.h"
#include "desmume.h" #include "desmume.h"
#include "gdk_gl.h" #include "gdk_gl.h"

2
desmume/src/gtk/gdk_3Demu.cpp
View File

@ -188,7 +188,7 @@ init_opengl_gdk_3Demu( void) {
return 0; return 0;
} }
oglrender_init = _oglrender_init; oglrender_init = _oglrender_init;
oglrender_beginOpenGL = _oglrender_beginOpenGL; oglrender_beginOpenGL = _oglrender_beginOpenGL;
oglrender_endOpenGL = _oglrender_endOpenGL; oglrender_endOpenGL = _oglrender_endOpenGL;

735
desmume/src/gtk/main.cpp
View File

File diff suppressed because it is too large Load Diff