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

GTK/Glade/Qt Ports: 

- Fix compiling issues. (Regression from r5196.)
- On Qt port, use -Ofast and -ffast-math optimizations.
This commit is contained in:
rogerman 2015-06-13 20:54:47 +00:00
parent d2a0307431
commit 11a8221856
5 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
desmume/src/Makefile.am
View File

@ -93,7 +93,9 @@ libdesmume_a_SOURCES = \
texcache.cpp texcache.h rasterize.cpp rasterize.h \ texcache.cpp texcache.h rasterize.cpp rasterize.h \
metaspu/metaspu.cpp metaspu/metaspu.h \ metaspu/metaspu.cpp metaspu/metaspu.h \
filter/2xsai.cpp filter/bilinear.cpp filter/epx.cpp filter/filter.h \ filter/2xsai.cpp filter/bilinear.cpp filter/epx.cpp filter/filter.h \
filter/hq2x.cpp filter/hq2x.h filter/hq4x.cpp filter/hq4x.dat filter/hq4x.h \ filter/hq2x.cpp filter/hq2x.h \
filter/hq3x.cpp filter/hq3x.dat \
filter/hq4x.cpp filter/hq4x.dat \
filter/interp.h filter/lq2x.cpp filter/lq2x.h filter/scanline.cpp \ filter/interp.h filter/lq2x.cpp filter/lq2x.h filter/scanline.cpp \
filter/videofilter.cpp filter/videofilter.h \ filter/videofilter.cpp filter/videofilter.h \
filter/xbrz.cpp filter/xbrz.h \ filter/xbrz.cpp filter/xbrz.h \

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

@ -33,7 +33,7 @@
#ifdef GDB_STUB #ifdef GDB_STUB
#include "../armcpu.h" #include "../armcpu.h"
#include "../gdbstub.h" #include "../gdbstub/gdbstub.h"
#endif #endif
#ifdef GTKGLEXT_AVAILABLE #ifdef GTKGLEXT_AVAILABLE

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

@ -247,6 +247,8 @@ static const char *ui_description =
" <menuitem action='pri_interp_lq2xs'/>" " <menuitem action='pri_interp_lq2xs'/>"
" <menuitem action='pri_interp_hq2x'/>" " <menuitem action='pri_interp_hq2x'/>"
" <menuitem action='pri_interp_hq2xs'/>" " <menuitem action='pri_interp_hq2xs'/>"
" <menuitem action='pri_interp_hq3x'/>"
" <menuitem action='pri_interp_hq3xs'/>"
" <menuitem action='pri_interp_hq4x'/>" " <menuitem action='pri_interp_hq4x'/>"
" <menuitem action='pri_interp_hq4xs'/>" " <menuitem action='pri_interp_hq4xs'/>"
" <menuitem action='pri_interp_2xsai'/>" " <menuitem action='pri_interp_2xsai'/>"
@ -445,6 +447,8 @@ static const GtkRadioActionEntry pri_interpolation_entries[] = {
{ "pri_interp_lq2xs", NULL, VideoFilterAttributesList[VideoFilterTypeID_LQ2XS].typeString, NULL, NULL, VideoFilterTypeID_LQ2XS}, { "pri_interp_lq2xs", NULL, VideoFilterAttributesList[VideoFilterTypeID_LQ2XS].typeString, NULL, NULL, VideoFilterTypeID_LQ2XS},
{ "pri_interp_hq2x", NULL, VideoFilterAttributesList[VideoFilterTypeID_HQ2X].typeString, NULL, NULL, VideoFilterTypeID_HQ2X}, { "pri_interp_hq2x", NULL, VideoFilterAttributesList[VideoFilterTypeID_HQ2X].typeString, NULL, NULL, VideoFilterTypeID_HQ2X},
{ "pri_interp_hq2xs", NULL, VideoFilterAttributesList[VideoFilterTypeID_HQ2XS].typeString, NULL, NULL, VideoFilterTypeID_HQ2XS}, { "pri_interp_hq2xs", NULL, VideoFilterAttributesList[VideoFilterTypeID_HQ2XS].typeString, NULL, NULL, VideoFilterTypeID_HQ2XS},
{ "pri_interp_hq3x", NULL, VideoFilterAttributesList[VideoFilterTypeID_HQ3X].typeString, NULL, NULL, VideoFilterTypeID_HQ3X},
{ "pri_interp_hq3xs", NULL, VideoFilterAttributesList[VideoFilterTypeID_HQ3XS].typeString, NULL, NULL, VideoFilterTypeID_HQ3XS},
{ "pri_interp_hq4x", NULL, VideoFilterAttributesList[VideoFilterTypeID_HQ4X].typeString, NULL, NULL, VideoFilterTypeID_HQ4X}, { "pri_interp_hq4x", NULL, VideoFilterAttributesList[VideoFilterTypeID_HQ4X].typeString, NULL, NULL, VideoFilterTypeID_HQ4X},
{ "pri_interp_hq4xs", NULL, VideoFilterAttributesList[VideoFilterTypeID_HQ4XS].typeString, NULL, NULL, VideoFilterTypeID_HQ4XS}, { "pri_interp_hq4xs", NULL, VideoFilterAttributesList[VideoFilterTypeID_HQ4XS].typeString, NULL, NULL, VideoFilterTypeID_HQ4XS},
{ "pri_interp_2xsai", NULL, VideoFilterAttributesList[VideoFilterTypeID_2xSaI].typeString, NULL, NULL, VideoFilterTypeID_2xSaI}, { "pri_interp_2xsai", NULL, VideoFilterAttributesList[VideoFilterTypeID_2xSaI].typeString, NULL, NULL, VideoFilterTypeID_2xSaI},

7
desmume/src/qt/project/core/core.pro
View File

@ -76,8 +76,9 @@ win32 {
QMAKE_CXXFLAGS += -pthread QMAKE_CXXFLAGS += -pthread
# Note: If you plan to distribute the binary, remove -march=native # Note: If you plan to distribute the binary, remove -march=native
QMAKE_CXXFLAGS_RELEASE += -O3 -flto=4 -fuse-linker-plugin -funroll-loops -march=native -minline-all-stringops QMAKE_CFLAGS_RELEASE += -Ofast -flto=4 -fuse-linker-plugin -funroll-loops -march=native -minline-all-stringops -ffast-math
QMAKE_LFLAGS_RELEASE += -O3 -flto=4 -fuse-linker-plugin -funroll-loops -march=native -minline-all-stringops QMAKE_CXXFLAGS_RELEASE += -Ofast -flto=4 -fuse-linker-plugin -funroll-loops -march=native -minline-all-stringops -ffast-math
QMAKE_LFLAGS_RELEASE += -Ofast -flto=4 -fuse-linker-plugin -funroll-loops -march=native -minline-all-stringops -ffast-math
contains(DESMUME_ARCH, x86_64) { contains(DESMUME_ARCH, x86_64) {
message("Build target decided as x86_64") message("Build target decided as x86_64")
@ -186,6 +187,7 @@ SOURCES += \
../../../filter/bilinear.cpp \ ../../../filter/bilinear.cpp \
../../../filter/epx.cpp \ ../../../filter/epx.cpp \
../../../filter/hq2x.cpp \ ../../../filter/hq2x.cpp \
../../../filter/hq3x.cpp \
../../../filter/hq4x.cpp \ ../../../filter/hq4x.cpp \
../../../filter/lq2x.cpp \ ../../../filter/lq2x.cpp \
../../../filter/scanline.cpp \ ../../../filter/scanline.cpp \
@ -323,7 +325,6 @@ HEADERS += \
../../../metaspu/metaspu.h \ ../../../metaspu/metaspu.h \
../../../filter/filter.h \ ../../../filter/filter.h \
../../../filter/hq2x.h \ ../../../filter/hq2x.h \
../../../filter/hq4x.h \
../../../filter/interp.h \ ../../../filter/interp.h \
../../../filter/lq2x.h \ ../../../filter/lq2x.h \
../../../filter/videofilter.h \ ../../../filter/videofilter.h \

5
desmume/src/qt/project/frontend/frontend.pro
View File

@ -58,8 +58,9 @@ win32 {
linux-*-32: DESMUME_ARCH = x86 linux-*-32: DESMUME_ARCH = x86
# Note: If you plan to distribute the binary, remove -march=native # Note: If you plan to distribute the binary, remove -march=native
QMAKE_CXXFLAGS_RELEASE += -O3 -flto=4 -fuse-linker-plugin -funroll-loops -march=native -minline-all-stringops QMAKE_CFLAGS_RELEASE += -Ofast -flto=4 -fuse-linker-plugin -funroll-loops -march=native -minline-all-stringops -ffast-math
QMAKE_LFLAGS_RELEASE += -O3 -flto=4 -fuse-linker-plugin -funroll-loops -march=native -minline-all-stringops QMAKE_CXXFLAGS_RELEASE += -Ofast -flto=4 -fuse-linker-plugin -funroll-loops -march=native -minline-all-stringops -ffast-math
QMAKE_LFLAGS_RELEASE += -Ofast -flto=4 -fuse-linker-plugin -funroll-loops -march=native -minline-all-stringops -ffast-math
} else:macx { } else:macx {
error("Mac OS X not supported") error("Mac OS X not supported")
} }