Commited patch by Orphis so gtk port build again.
This commit is contained in:
parent
08e135804b
commit
21d4d4abd1
|
@ -2,7 +2,7 @@ Installation Instructions
|
|||
*************************
|
||||
|
||||
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
|
||||
2006 Free Software Foundation, Inc.
|
||||
2006, 2007 Free Software Foundation, Inc.
|
||||
|
||||
This file is free documentation; the Free Software Foundation gives
|
||||
unlimited permission to copy, distribute and modify it.
|
||||
|
@ -67,6 +67,9 @@ The simplest way to compile this package is:
|
|||
all sorts of other programs in order to regenerate files that came
|
||||
with the distribution.
|
||||
|
||||
6. Often, you can also type `make uninstall' to remove the installed
|
||||
files again.
|
||||
|
||||
Compilers and Options
|
||||
=====================
|
||||
|
||||
|
|
|
@ -11,14 +11,14 @@ EXTRA_DIST = DeSmuME.xpm dev-cpp/desmume.dev dev-cpp/desmume.layout \
|
|||
dev-cpp/semaphore.h desmume.desktop
|
||||
bin_PROGRAMS = desmume
|
||||
desmume_SOURCES = \
|
||||
gtk-compat.c gtk-compat.h \
|
||||
desmume.h desmume.c \
|
||||
dTool.h dToolsList.c \
|
||||
tools/ioregsView.c tools/ioregsView.h \
|
||||
gtk-compat.cpp gtk-compat.h \
|
||||
desmume.h desmume.cpp \
|
||||
dTool.h dToolsList.cpp \
|
||||
tools/ioregsView.cpp tools/ioregsView.h \
|
||||
globals.h \
|
||||
../sndsdl.c \
|
||||
../ctrlssdl.h ../ctrlssdl.c \
|
||||
gdk_3Demu.c gdk_3Demu.h \
|
||||
main.c
|
||||
../sndsdl.cpp \
|
||||
../ctrlssdl.h ../ctrlssdl.cpp \
|
||||
gdk_3Demu.cpp gdk_3Demu.h \
|
||||
main.cpp
|
||||
desmume_LDADD = ../libdesmume.a ../gdbstub/libgdbstub.a \
|
||||
$(SDL_LIBS) $(GTK_LIBS) $(GTKGLEXT_LIBS) $(GTHREAD_LIBS)
|
||||
|
|
|
@ -155,10 +155,10 @@ init_opengl_gdk_3Demu( void) {
|
|||
return 0;
|
||||
}
|
||||
|
||||
glconfig = gdk_gl_config_new_by_mode (GDK_GL_MODE_RGBA |
|
||||
glconfig = gdk_gl_config_new_by_mode ((GdkGLConfigMode)(GDK_GL_MODE_RGBA |
|
||||
GDK_GL_MODE_DEPTH |
|
||||
GDK_GL_MODE_STENCIL |
|
||||
GDK_GL_MODE_SINGLE);
|
||||
GDK_GL_MODE_SINGLE));
|
||||
if (glconfig == NULL)
|
||||
{
|
||||
g_print ("*** No appropriate OpenGL-capable visual found.\n");
|
|
@ -286,7 +286,7 @@ createThread_gdb( void (*thread_function)( void *data),
|
|||
|
||||
void
|
||||
joinThread_gdb( void *thread_handle) {
|
||||
g_thread_join( thread_handle);
|
||||
g_thread_join( (GThread *)thread_handle);
|
||||
}
|
||||
|
||||
|
||||
|
@ -1552,7 +1552,7 @@ static Uint32 fps_limiter_fn(Uint32 interval, void *param) {
|
|||
}
|
||||
|
||||
static void dui_set_accel_group(gpointer action, gpointer group) {
|
||||
gtk_action_set_accel_group(action, group);
|
||||
gtk_action_set_accel_group((GtkAction *)action, (GtkAccelGroup *)group);
|
||||
}
|
||||
|
||||
/////////////////////////////// MAIN ///////////////////////////////
|
||||
|
@ -1621,17 +1621,17 @@ common_gtk_main( struct configured_features *my_config) {
|
|||
|
||||
#ifdef GTKGLEXT_AVAILABLE
|
||||
/* Try double-buffered visual */
|
||||
glconfig = gdk_gl_config_new_by_mode (GDK_GL_MODE_RGB |
|
||||
glconfig = gdk_gl_config_new_by_mode ((GdkGLConfigMode)(GDK_GL_MODE_RGB |
|
||||
GDK_GL_MODE_DEPTH |
|
||||
GDK_GL_MODE_DOUBLE);
|
||||
GDK_GL_MODE_DOUBLE));
|
||||
if (glconfig == NULL)
|
||||
{
|
||||
g_print ("*** Cannot find the double-buffered visual.\n");
|
||||
g_print ("*** Trying single-buffered visual.\n");
|
||||
|
||||
/* Try single-buffered visual */
|
||||
glconfig = gdk_gl_config_new_by_mode (GDK_GL_MODE_RGB |
|
||||
GDK_GL_MODE_DEPTH);
|
||||
glconfig = gdk_gl_config_new_by_mode ((GdkGLConfigMode)(GDK_GL_MODE_RGB |
|
||||
GDK_GL_MODE_DEPTH));
|
||||
if (glconfig == NULL) {
|
||||
g_print ("*** No appropriate OpenGL-capable visual found.\n");
|
||||
exit (1);
|
Loading…
Reference in New Issue