From 108cf8494cb5402d6ed8cbeef4139576d55a6816 Mon Sep 17 00:00:00 2001 From: mcfarlandjb Date: Sun, 16 Feb 2014 02:51:17 +0000 Subject: [PATCH] Updated sdl2 branch SConstruct defaults to use SDL2=1 and OPENGL=0. The combination SDL2=1 and OPENGL=1 currently does not build. This is also partially just a test of my new SVN permissions while still doing something mildly useful --- branches/sdl2/SConstruct | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/branches/sdl2/SConstruct b/branches/sdl2/SConstruct index 926f22fb..5d9f0bb4 100644 --- a/branches/sdl2/SConstruct +++ b/branches/sdl2/SConstruct @@ -17,7 +17,7 @@ opts.AddVariables( BoolVariable('DEBUG', 'Build with debugging symbols', 1), BoolVariable('RELEASE', 'Set to 1 to build for release', 0), BoolVariable('FRAMESKIP', 'Enable frameskipping', 1), - BoolVariable('OPENGL', 'Enable OpenGL support', 1), + BoolVariable('OPENGL', 'Enable OpenGL support (not supported by SDL2 yet)', 0), BoolVariable('LUA', 'Enable Lua support', 1), BoolVariable('GTK', 'Enable GTK2 GUI (SDL only)', 1), BoolVariable('GTK3', 'Enable GTK3 GUI (SDL only)', 0), @@ -28,7 +28,7 @@ opts.AddVariables( BoolVariable('SYSTEM_MINIZIP', 'Use system minizip instead of static minizip provided with fceux', 0), BoolVariable('LSB_FIRST', 'Least signficant byte first (non-PPC)', 1), BoolVariable('CLANG', 'Compile with llvm-clang instead of gcc', 0), - BoolVariable('SDL2', 'Compile using SDL2 instead of SDL 1.2 (experimental/non-functional)', 0) + BoolVariable('SDL2', 'Compile using SDL2 instead of SDL 1.2 (experimental/non-functional)', 1) ) AddOption('--prefix', dest='prefix', type='string', nargs=1, action='store', metavar='DIR', help='installation prefix') @@ -67,6 +67,7 @@ if os.environ.has_key('PKG_CONFIG_PATH'): if os.environ.has_key('PKG_CONFIG_LIBDIR'): env['ENV']['PKG_CONFIG_LIBDIR'] = os.environ['PKG_CONFIG_LIBDIR'] + print "platform: ", env['PLATFORM'] # compile with clang