From 49335efa713c15a7d02dc80d4e036b260e2c83f6 Mon Sep 17 00:00:00 2001 From: Marcus Wanners Date: Sat, 7 Mar 2009 21:05:03 +0000 Subject: [PATCH] My package check patch. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2604 8ced0084-cf51-0410-be5f-012b33b47a6e --- SConstruct | 23 ++++++++++++---- Source/Plugins/Plugin_VideoOGL/Src/SConscript | 26 +++++++++++-------- 2 files changed, 33 insertions(+), 16 deletions(-) diff --git a/SConstruct b/SConstruct index fb53bed8f5..e45769fac1 100644 --- a/SConstruct +++ b/SConstruct @@ -213,18 +213,28 @@ if sys.platform == 'darwin': env['HAVE_SDL'] = conf.CheckSDL('1.0.0') # Bluetooth for wii support -env['HAVE_BLUEZ'] = conf.CheckPKG('bluez') +if sys.platform == 'win32': + env['HAVE_BLUEZ'] = 0 +else: + env['HAVE_BLUEZ'] = conf.CheckPKG('bluez') # needed for sound -env['HAVE_AO'] = conf.CheckPKG('ao') +if sys.platform == 'win32': + env['HAVE_AO'] = 0 +else: + env['HAVE_AO'] = conf.CheckPKG('ao') # needed for mic -env['HAVE_PORTAUDIO'] = conf.CheckPortaudio(1890) +if sys.platform == 'win32': + env['HAVE_PORTAUDIO'] = 0 +else: + env['HAVE_PORTAUDIO'] = conf.CheckPortaudio(1890) # sfml env['HAVE_SFML'] = 0 -if conf.CheckPKG('sfml') and conf.CheckCHeader("SFML/Audio.hpp"): - env['HAVE_SFML'] = 1; +if sys.platform != 'win32': + if conf.CheckPKG('sfml') and conf.CheckCHeader("SFML/Audio.hpp"): + env['HAVE_SFML'] = 1; #osx 64 specifics if sys.platform == 'darwin': @@ -236,6 +246,9 @@ if sys.platform == 'darwin': if not env['osx'] == '32x11': env['HAVE_X11'] = 0 env['HAVE_COCOA'] = 1 +elif sys.platform == 'win32': + env['HAVE_X11'] = 0 + env['HAVE_COCOA'] = 0 else: env['HAVE_X11'] = conf.CheckPKG('x11') env['HAVE_COCOA'] = 0 diff --git a/Source/Plugins/Plugin_VideoOGL/Src/SConscript b/Source/Plugins/Plugin_VideoOGL/Src/SConscript index 8846e613cb..773b3a8aa0 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/SConscript +++ b/Source/Plugins/Plugin_VideoOGL/Src/SConscript @@ -67,14 +67,15 @@ conf = gfxenv.Configure(custom_tests = tests, if sys.platform == 'darwin': - # Use libraries from MacPorts. - compileFlags.append('-I/opt/local/include') - linkFlags.append('-L/opt/local/lib') - conf.CheckPKG('OpenGL') - if not conf.CheckPKG('Cg'): - print name + " must have Cg framework from nvidia to be build" - Return() - + # Use libraries from MacPorts. + compileFlags.append('-I/opt/local/include') + linkFlags.append('-L/opt/local/lib') + conf.CheckPKG('OpenGL') + if not conf.CheckPKG('Cg'): + print name + " must have Cg framework from nvidia to be build" + Return() +elif sys.platform == 'win32': + print name + " is assuming that you have opengl, glu, cg, and cggl" else: if not (conf.CheckPKG('GL') and conf.CheckPKG('GLU')): print name + " must have opengl and glu to be build" @@ -83,8 +84,10 @@ else: if not conf.CheckPKG('Cg') or not conf.CheckPKG('CgGL'): print name + " must have cg and cggl to be build" Return() - -if not conf.CheckPKG('GLEW'): +if sys.platform == 'win32': + print name + " is assuming that you have glew" +else: + if not conf.CheckPKG('GLEW'): print name + " must have glew to be build" Return() @@ -125,7 +128,8 @@ gfxenv.Append( LINKFLAGS = linkFlags, ) -gfxenv.SharedLibrary( +if sys.platform != 'win32': + gfxenv.SharedLibrary( env['plugin_dir']+name, files, LIBS = libs + gfxenv['LIBS']