ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

My package check patch. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2604 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Marcus Wanners 2009-03-07 21:05:03 +00:00
parent 56d1f87f49
commit 49335efa71
2 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
SConstruct
View File

@ -213,18 +213,28 @@ if sys.platform == 'darwin':
env['HAVE_SDL'] = conf.CheckSDL('1.0.0') env['HAVE_SDL'] = conf.CheckSDL('1.0.0')
# Bluetooth for wii support # 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 # 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 # 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 # sfml
env['HAVE_SFML'] = 0 env['HAVE_SFML'] = 0
if conf.CheckPKG('sfml') and conf.CheckCHeader("SFML/Audio.hpp"): if sys.platform != 'win32':
env['HAVE_SFML'] = 1; if conf.CheckPKG('sfml') and conf.CheckCHeader("SFML/Audio.hpp"):
env['HAVE_SFML'] = 1;
#osx 64 specifics #osx 64 specifics
if sys.platform == 'darwin': if sys.platform == 'darwin':
@ -236,6 +246,9 @@ if sys.platform == 'darwin':
if not env['osx'] == '32x11': if not env['osx'] == '32x11':
env['HAVE_X11'] = 0 env['HAVE_X11'] = 0
env['HAVE_COCOA'] = 1 env['HAVE_COCOA'] = 1
elif sys.platform == 'win32':
env['HAVE_X11'] = 0
env['HAVE_COCOA'] = 0
else: else:
env['HAVE_X11'] = conf.CheckPKG('x11') env['HAVE_X11'] = conf.CheckPKG('x11')
env['HAVE_COCOA'] = 0 env['HAVE_COCOA'] = 0

26
Source/Plugins/Plugin_VideoOGL/Src/SConscript
View File

@ -67,14 +67,15 @@ conf = gfxenv.Configure(custom_tests = tests,
if sys.platform == 'darwin': if sys.platform == 'darwin':
# Use libraries from MacPorts. # Use libraries from MacPorts.
compileFlags.append('-I/opt/local/include') compileFlags.append('-I/opt/local/include')
linkFlags.append('-L/opt/local/lib') linkFlags.append('-L/opt/local/lib')
conf.CheckPKG('OpenGL') conf.CheckPKG('OpenGL')
if not conf.CheckPKG('Cg'): if not conf.CheckPKG('Cg'):
print name + " must have Cg framework from nvidia to be build" print name + " must have Cg framework from nvidia to be build"
Return() Return()
elif sys.platform == 'win32':
print name + " is assuming that you have opengl, glu, cg, and cggl"
else: else:
if not (conf.CheckPKG('GL') and conf.CheckPKG('GLU')): if not (conf.CheckPKG('GL') and conf.CheckPKG('GLU')):
print name + " must have opengl and glu to be build" 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'): if not conf.CheckPKG('Cg') or not conf.CheckPKG('CgGL'):
print name + " must have cg and cggl to be build" print name + " must have cg and cggl to be build"
Return() Return()
if sys.platform == 'win32':
if not conf.CheckPKG('GLEW'): print name + " is assuming that you have glew"
else:
if not conf.CheckPKG('GLEW'):
print name + " must have glew to be build" print name + " must have glew to be build"
Return() Return()
@ -125,7 +128,8 @@ gfxenv.Append(
LINKFLAGS = linkFlags, LINKFLAGS = linkFlags,
) )
gfxenv.SharedLibrary( if sys.platform != 'win32':
gfxenv.SharedLibrary(
env['plugin_dir']+name, env['plugin_dir']+name,
files, files,
LIBS = libs + gfxenv['LIBS'] LIBS = libs + gfxenv['LIBS']