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

View File

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

View File

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

View File

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

File diff suppressed because it is too large Load Diff