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

@@ -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

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']:

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.
 

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