From 11a8221856cefcc1995ff326457c56a9dfc385cd Mon Sep 17 00:00:00 2001 From: rogerman Date: Sat, 13 Jun 2015 20:54:47 +0000 Subject: [PATCH] GTK/Glade/Qt Ports: - Fix compiling issues. (Regression from r5196.) - On Qt port, use -Ofast and -ffast-math optimizations. --- desmume/src/Makefile.am | 4 +++- desmume/src/gtk-glade/main.cpp | 2 +- desmume/src/gtk/main.cpp | 4 ++++ desmume/src/qt/project/core/core.pro | 7 ++++--- desmume/src/qt/project/frontend/frontend.pro | 5 +++-- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/desmume/src/Makefile.am b/desmume/src/Makefile.am index 7b9e26317..db36ea256 100644 --- a/desmume/src/Makefile.am +++ b/desmume/src/Makefile.am @@ -93,7 +93,9 @@ libdesmume_a_SOURCES = \ texcache.cpp texcache.h rasterize.cpp rasterize.h \ metaspu/metaspu.cpp metaspu/metaspu.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/videofilter.cpp filter/videofilter.h \ filter/xbrz.cpp filter/xbrz.h \ diff --git a/desmume/src/gtk-glade/main.cpp b/desmume/src/gtk-glade/main.cpp index b12893802..4a52d9f56 100755 --- a/desmume/src/gtk-glade/main.cpp +++ b/desmume/src/gtk-glade/main.cpp @@ -33,7 +33,7 @@ #ifdef GDB_STUB #include "../armcpu.h" -#include "../gdbstub.h" +#include "../gdbstub/gdbstub.h" #endif #ifdef GTKGLEXT_AVAILABLE diff --git a/desmume/src/gtk/main.cpp b/desmume/src/gtk/main.cpp index 76c7d0dae..373dc2304 100644 --- a/desmume/src/gtk/main.cpp +++ b/desmume/src/gtk/main.cpp @@ -247,6 +247,8 @@ static const char *ui_description = " " " " " " +" " +" " " " " " " " @@ -445,6 +447,8 @@ static const GtkRadioActionEntry pri_interpolation_entries[] = { { "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_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_hq4xs", NULL, VideoFilterAttributesList[VideoFilterTypeID_HQ4XS].typeString, NULL, NULL, VideoFilterTypeID_HQ4XS}, { "pri_interp_2xsai", NULL, VideoFilterAttributesList[VideoFilterTypeID_2xSaI].typeString, NULL, NULL, VideoFilterTypeID_2xSaI}, diff --git a/desmume/src/qt/project/core/core.pro b/desmume/src/qt/project/core/core.pro index 89fb9e85e..aca060426 100644 --- a/desmume/src/qt/project/core/core.pro +++ b/desmume/src/qt/project/core/core.pro @@ -76,8 +76,9 @@ win32 { QMAKE_CXXFLAGS += -pthread # 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_LFLAGS_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_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) { message("Build target decided as x86_64") @@ -186,6 +187,7 @@ SOURCES += \ ../../../filter/bilinear.cpp \ ../../../filter/epx.cpp \ ../../../filter/hq2x.cpp \ + ../../../filter/hq3x.cpp \ ../../../filter/hq4x.cpp \ ../../../filter/lq2x.cpp \ ../../../filter/scanline.cpp \ @@ -323,7 +325,6 @@ HEADERS += \ ../../../metaspu/metaspu.h \ ../../../filter/filter.h \ ../../../filter/hq2x.h \ - ../../../filter/hq4x.h \ ../../../filter/interp.h \ ../../../filter/lq2x.h \ ../../../filter/videofilter.h \ diff --git a/desmume/src/qt/project/frontend/frontend.pro b/desmume/src/qt/project/frontend/frontend.pro index 18b323aa4..39b01c696 100644 --- a/desmume/src/qt/project/frontend/frontend.pro +++ b/desmume/src/qt/project/frontend/frontend.pro @@ -58,8 +58,9 @@ win32 { linux-*-32: DESMUME_ARCH = x86 # 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_LFLAGS_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_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 { error("Mac OS X not supported") }