added scons wxgl flag

remove OSX64 define


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1494 8ced0084-cf51-0410-be5f-012b33b47a6e

SConstruct

@@ -95,6 +95,7 @@ vars.AddVariables(
     BoolVariable('bundle', 'Set to create bundle', False),
     BoolVariable('lint', 'Set for lint build (extra warnings)', False),
     BoolVariable('nowx', 'Set For Building with no WX libs (WIP)', False),
+    BoolVariable('wxgl', 'Set For Building with WX GL libs (WIP)', False),
     EnumVariable('flavor', 'Choose a build flavor', 'release',
                  allowed_values = ('release', 'devel', 'debug'),
                  ignorecase = 2
@@ -187,13 +188,20 @@ env['HAVE_BLUEZ'] = conf.CheckPKG('bluez')
 env['HAVE_AO'] = conf.CheckPKG('ao')
 
 # handling wx flags CCFLAGS should be created before
-env['HAVE_WX'] = conf.CheckWXConfig('2.8', ['adv', 'core', 'base'], 
-                                    0) #env['flavor'] == 'debug')
+wxmods = ['adv', 'core', 'base']
+env['USE_WX'] = 0
+if env['wxgl']:
+    wxmods.append('gl')
+    env['USE_WX'] = 1
+
+env['HAVE_WX'] = conf.CheckWXConfig('2.8', wxmods, 0) 
 
 #osx 64 specifics
 if sys.platform == 'darwin':
     if env['osx'] == '64cocoa':
-        compileFlags += ['-arch' , 'x86_64', '-DOSX64']
+        compileFlags += ['-arch' , 'x86_64' ]
+        conf.Define('MAP_32BIT', 0)
+
     if not env['osx'] == '32x11':
         env['HAVE_X11'] = 0
         env['HAVE_COCOA'] = conf.CheckPKG('cocoa')
@@ -210,6 +218,7 @@ conf.Define('HAVE_SDL', env['HAVE_SDL'])
 conf.Define('HAVE_BLUEZ', env['HAVE_BLUEZ'])
 conf.Define('HAVE_AO', env['HAVE_AO'])
 conf.Define('HAVE_WX', env['HAVE_WX'])
+conf.Define('USE_WX', env['USE_WX'])
 conf.Define('HAVE_X11', env['HAVE_X11'])
 conf.Define('HAVE_COCOA', env['HAVE_COCOA'])
 

Source/Plugins/Plugin_VideoOGL/Src/Config.h

@@ -17,7 +17,6 @@
 
 #ifndef _CONFIG_H
 #define _CONFIG_H
-//#define USE_WX 1
 
 // Log in two categories, andsave three other options in the same byte
 #define CONF_LOG 1

Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp

@@ -199,7 +199,7 @@ bool OpenGL_Create(SVideoInitialize &_VideoInitialize, int _iwidth, int _iheight
 
 	//setup ogl to use double buffering
 	SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
-#elif defined(OSX64)
+#elif defined(HAVE_COCOA) && HAVE_COCOA
     cocoaGLCreateApp();
     GLWin.width = nBackbufferWidth;
     GLWin.height = nBackbufferHeight;