From dfc2dc84e392cd8bf15f6b562c575861fc041dbd Mon Sep 17 00:00:00 2001 From: punkrockguy318 Date: Wed, 19 Oct 2011 06:23:40 +0000 Subject: [PATCH] move cmake to attic (if anyone has any objections to this; let me know and i'll put it back. AFAIK cmake is broken and it's confusing that its in the tarball clean up some docuemntation in the tree --- KNOWN-ISSUES | 2 -- SConstruct | 15 +-------------- .../cmake-stuff/CMakeLists.txt | 0 .../cmake}/cross-mingw32/CMakeLists.txt | 0 .../cmake}/cross-mingw32/debug/CMakeLists.txt | 0 .../cross-mingw32/fceux_cross-mingw32.cmake | 0 .../cmake}/cross-mingw32/release/CMakeLists.txt | 0 {cmake => attic/cmake-stuff/cmake}/fceux.cmake | 0 .../cmake-stuff/cmake}/native/CMakeLists.txt | 0 .../cmake}/native/debug/CMakeLists.txt | 0 .../cmake-stuff/cmake}/native/fceux_native.cmake | 0 .../cmake}/native/release/CMakeLists.txt | 0 documentation/todo | 5 +---- src/drivers/sdl/SConscript | 11 +++++++++++ 14 files changed, 13 insertions(+), 20 deletions(-) rename CMakeLists.txt => attic/cmake-stuff/CMakeLists.txt (100%) rename {cmake => attic/cmake-stuff/cmake}/cross-mingw32/CMakeLists.txt (100%) rename {cmake => attic/cmake-stuff/cmake}/cross-mingw32/debug/CMakeLists.txt (100%) rename {cmake => attic/cmake-stuff/cmake}/cross-mingw32/fceux_cross-mingw32.cmake (100%) rename {cmake => attic/cmake-stuff/cmake}/cross-mingw32/release/CMakeLists.txt (100%) rename {cmake => attic/cmake-stuff/cmake}/fceux.cmake (100%) rename {cmake => attic/cmake-stuff/cmake}/native/CMakeLists.txt (100%) rename {cmake => attic/cmake-stuff/cmake}/native/debug/CMakeLists.txt (100%) rename {cmake => attic/cmake-stuff/cmake}/native/fceux_native.cmake (100%) rename {cmake => attic/cmake-stuff/cmake}/native/release/CMakeLists.txt (100%) diff --git a/KNOWN-ISSUES b/KNOWN-ISSUES index 882b051a..4fa59939 100644 --- a/KNOWN-ISSUES +++ b/KNOWN-ISSUES @@ -1,6 +1,4 @@ SDL: - * Segfault on "Record As" * Single-window mode broken in OSX * F1 in GUI mode (with no terminal attached) causes endless hang - * --inputcfg broken with GTK=1 atm * In OSX, Zapper input is taken in GTK window rather than SDL window diff --git a/SConstruct b/SConstruct index 09cfea7c..2e11970e 100644 --- a/SConstruct +++ b/SConstruct @@ -12,7 +12,7 @@ opts.AddVariables( BoolVariable('NEWPPU', 'Enable new PPU core', 1), BoolVariable('CREATE_AVI', 'Enable avi creation support (SDL only)', 1), BoolVariable('LOGO', 'Enable a logoscreen when creating avis (SDL only)', '1'), - BoolVariable('GTK', 'Enable GTK2 GUI (SDL only)', 1), + BoolVariable('GTK', 'Enable GTK2 GUI (SDL only)', 0), BoolVariable('GTK3', 'Enable GTK3 GUI (SDL only)', 0), ) @@ -60,19 +60,6 @@ else: print 'Did not find libSDL or SDL.lib, exiting!' Exit(1) - if env['GTK']: - # Add compiler and linker flags from pkg-config - env.ParseConfig('pkg-config --cflags --libs gtk+-2.0') - env.Append(CPPDEFINES=["_GTK2"]) - env.Append(CCFLAGS = ["-D_GTK"]) - # GTK3 Preparation compiler flags: - env.Append(CCFLAGS = ['-DGDK_DISABLE_DEPRECATED', '-DGTK_DISABLE_DEPRECATED', '-DGSEAL_ENABLE', '-DGTK_DISABLE_SINGLE_INCLUDES']) - - if env['GTK3']: - # Add compiler and linker flags from pkg-config - env.ParseConfig('pkg-config --cflags --libs gtk+-3.0') - env.Append(CPPDEFINES=["_GTK3"]) - env.Append(CCFLAGS = ["-D_GTK"]) ### Lua platform defines ### Applies to all files even though only lua needs it, but should be ok if env['LUA']: diff --git a/CMakeLists.txt b/attic/cmake-stuff/CMakeLists.txt similarity index 100% rename from CMakeLists.txt rename to attic/cmake-stuff/CMakeLists.txt diff --git a/cmake/cross-mingw32/CMakeLists.txt b/attic/cmake-stuff/cmake/cross-mingw32/CMakeLists.txt similarity index 100% rename from cmake/cross-mingw32/CMakeLists.txt rename to attic/cmake-stuff/cmake/cross-mingw32/CMakeLists.txt diff --git a/cmake/cross-mingw32/debug/CMakeLists.txt b/attic/cmake-stuff/cmake/cross-mingw32/debug/CMakeLists.txt similarity index 100% rename from cmake/cross-mingw32/debug/CMakeLists.txt rename to attic/cmake-stuff/cmake/cross-mingw32/debug/CMakeLists.txt diff --git a/cmake/cross-mingw32/fceux_cross-mingw32.cmake b/attic/cmake-stuff/cmake/cross-mingw32/fceux_cross-mingw32.cmake similarity index 100% rename from cmake/cross-mingw32/fceux_cross-mingw32.cmake rename to attic/cmake-stuff/cmake/cross-mingw32/fceux_cross-mingw32.cmake diff --git a/cmake/cross-mingw32/release/CMakeLists.txt b/attic/cmake-stuff/cmake/cross-mingw32/release/CMakeLists.txt similarity index 100% rename from cmake/cross-mingw32/release/CMakeLists.txt rename to attic/cmake-stuff/cmake/cross-mingw32/release/CMakeLists.txt diff --git a/cmake/fceux.cmake b/attic/cmake-stuff/cmake/fceux.cmake similarity index 100% rename from cmake/fceux.cmake rename to attic/cmake-stuff/cmake/fceux.cmake diff --git a/cmake/native/CMakeLists.txt b/attic/cmake-stuff/cmake/native/CMakeLists.txt similarity index 100% rename from cmake/native/CMakeLists.txt rename to attic/cmake-stuff/cmake/native/CMakeLists.txt diff --git a/cmake/native/debug/CMakeLists.txt b/attic/cmake-stuff/cmake/native/debug/CMakeLists.txt similarity index 100% rename from cmake/native/debug/CMakeLists.txt rename to attic/cmake-stuff/cmake/native/debug/CMakeLists.txt diff --git a/cmake/native/fceux_native.cmake b/attic/cmake-stuff/cmake/native/fceux_native.cmake similarity index 100% rename from cmake/native/fceux_native.cmake rename to attic/cmake-stuff/cmake/native/fceux_native.cmake diff --git a/cmake/native/release/CMakeLists.txt b/attic/cmake-stuff/cmake/native/release/CMakeLists.txt similarity index 100% rename from cmake/native/release/CMakeLists.txt rename to attic/cmake-stuff/cmake/native/release/CMakeLists.txt diff --git a/documentation/todo b/documentation/todo index bd85bbe1..5a1131dd 100644 --- a/documentation/todo +++ b/documentation/todo @@ -24,10 +24,7 @@ Kyoro Chan Land: Expects a sprite hit to happen, but it has sprite 0 over me). SDL Port: - Make the code better. - Add a GTK+ interface using GLADE, interfacing with the emulator via a - stdio interface. - Update(FIX) the SDL_net netplay code to work with the new netplay code. + Hotkey remap GUI Figure out a good way to add "turbo" button support and then do it. diff --git a/src/drivers/sdl/SConscript b/src/drivers/sdl/SConscript index ca005a50..eaea9093 100644 --- a/src/drivers/sdl/SConscript +++ b/src/drivers/sdl/SConscript @@ -2,8 +2,19 @@ # Thanks Antonio Ospite! Import('env') env.ParseConfig('pkg-config --cflags --libs x11') +if env['GTK']: + # Add compiler and linker flags from pkg-config + env.ParseConfig('pkg-config --cflags --libs gtk+-2.0') + env.Append(CPPDEFINES=["_GTK2"]) + env.Append(CCFLAGS = ["-D_GTK"]) +if env['GTK3']: +# Add compiler and linker flags from pkg-config + env.ParseConfig('pkg-config --cflags --libs gtk+-3.0') + env.Append(CPPDEFINES=["_GTK3"]) + env.Append(CCFLAGS = ["-D_GTK"]) Export('env') + my_list = Split(""" input.cpp config.cpp