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

Linux Port (CLI / GTK / Glade): 

- Fix builds that were broken due to new libretro-common API additions. (Regression from r5398.)
- KNOWN REGRESSION: In order to hasten the process of restoring the ability to build the Linux ports, the additional command-line options that are available in the Linux ports have been disabled. Maybe someone else can restore their functionality.
This commit is contained in:
rogerman 2016-07-02 20:23:56 +00:00
parent 3c5461e786
commit 2953799788
5 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
desmume/src/Makefile.am
View File

@ -2,7 +2,7 @@ include $(top_srcdir)/src/desmume.mk
AM_CPPFLAGS += $(SDL_CFLAGS) $(GTHREAD_CFLAGS) $(X_CFLAGS) $(ALSA_CFLAGS) $(LIBAGG_CFLAGS) $(LIBSOUNDTOUCH_CFLAGS) AM_CPPFLAGS += $(SDL_CFLAGS) $(GTHREAD_CFLAGS) $(X_CFLAGS) $(ALSA_CFLAGS) $(LIBAGG_CFLAGS) $(LIBSOUNDTOUCH_CFLAGS)
EXTRA_DIST = build.bat instruction_tabdef.inc thumb_tabdef.inc fs-linux.cpp fs-windows.cpp cocoa EXTRA_DIST = build.bat instruction_tabdef.inc thumb_tabdef.inc cocoa
if HAVE_GDB_STUB if HAVE_GDB_STUB
SUBDIRS = . gdbstub $(UI_DIR) SUBDIRS = . gdbstub $(UI_DIR)
else else
@ -21,7 +21,6 @@ libdesmume_a_SOURCES = \
Disassembler.cpp Disassembler.h \ Disassembler.cpp Disassembler.h \
emufile.h emufile.cpp emufile_types.h encrypt.h encrypt.cpp FIFO.cpp FIFO.h \ emufile.h emufile.cpp emufile_types.h encrypt.h encrypt.cpp FIFO.cpp FIFO.h \
firmware.cpp firmware.h GPU.cpp GPU.h \ firmware.cpp firmware.h GPU.cpp GPU.h \
fs.h \
GPU_osd.h \ GPU_osd.h \
instructions.h \ instructions.h \
mem.h mc.cpp mc.h \ mem.h mc.cpp mc.h \
@ -100,7 +99,14 @@ libdesmume_a_SOURCES = \
filter/videofilter.cpp filter/videofilter.h \ filter/videofilter.cpp filter/videofilter.h \
filter/xbrz.cpp filter/xbrz.h \ filter/xbrz.cpp filter/xbrz.h \
version.cpp version.h \ version.cpp version.h \
desmume_config.cpp desmume_config.h desmume_config.cpp desmume_config.h \
libretro-common/compat/compat_getopt.c \
libretro-common/file/file_path.c \
libretro-common/file/retro_dirent.c \
libretro-common/file/retro_stat.c \
libretro-common/rthreads/async_job.c \
libretro-common/rthreads/rsemaphore.c \
libretro-common/rthreads/rthreads.c
if HAVE_JIT if HAVE_JIT
libdesmume_a_SOURCES += \ libdesmume_a_SOURCES += \
@ -205,4 +211,3 @@ endif
if HAVE_GDB_STUB if HAVE_GDB_STUB
libdesmume_a_SOURCES += gdbstub.h libdesmume_a_SOURCES += gdbstub.h
endif endif
libdesmume_a_LIBADD = fs-$(desmume_arch).$(OBJEXT)

3
desmume/src/cli/main.cpp
View File

@ -198,8 +198,7 @@ fill_config( class configured_features *config,
{ NULL } { NULL }
}; };
config->loadCommonOptions(); //g_option_context_add_main_entries (config->ctx, options, "options");
g_option_context_add_main_entries (config->ctx, options, "options");
config->parse(argc,argv); config->parse(argc,argv);
if(!config->validate()) if(!config->validate())

4
desmume/src/desmume.mk
View File

@ -1,3 +1,3 @@
AM_CFLAGS = AM_CFLAGS =
AM_CPPFLAGS = -I$(top_srcdir)/src AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/libretro-common/include
AM_LDFLAGS = AM_LDFLAGS =

2
desmume/src/gtk-glade/gdk_gl.cpp
View File

@ -237,7 +237,7 @@ static void my_gl_Texture2D() {
static void static void
my_gl_ScreenTex( int software_convert) { my_gl_ScreenTex( int software_convert) {
u16 *gpuFramebuffer = GPU->GetDisplayInfo().masterNativeBuffer; u16 *gpuFramebuffer = (u16 *)GPU->GetDisplayInfo().masterNativeBuffer;
if ( software_convert) { if ( software_convert) {
u8 converted[256 * 384 * 3]; u8 converted[256 * 384 * 3];

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

@ -694,9 +694,8 @@ fill_configured_features( class configured_features *config,
{ NULL } { NULL }
}; };
config->loadCommonOptions(); //g_option_context_add_main_entries (config->ctx, options, "options");
g_option_context_add_main_entries (config->ctx, options, "options"); //g_option_context_add_group (config->ctx, gtk_get_option_group (TRUE));
g_option_context_add_group (config->ctx, gtk_get_option_group (TRUE));
config->parse(argc,argv); config->parse(argc,argv);
if(!config->validate()) if(!config->validate())