mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-09-12 12:32:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

compile fix on linux

Browse source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1460 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2008-12-09 18:10:16 +00:00
commit 736409632e
5 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Source/Core/DolphinWX/Src/FrameWiimote.cpp
View file

@ -351,6 +351,8 @@ wxBitmap CFrame::CreateBitmapForSpeakers(int BitmapType, bool On)
return bitmap;
}
}
return bitmap;
}
@ -407,4 +409,4 @@ void CFrame::MoveSpeakers()
m_StatBmp[i+4]->Move(x, y);
}
}
// ==============
// ==============

1
Source/Core/DolphinWX/Src/SConscript
View file

@ -30,6 +30,7 @@ if wxenv['HAVE_WX']:
'PatchAddEdit.cpp',
'CheatsWindow.cpp',
'stdafx.cpp',
'FrameWiimote.cpp',
]
CPPDEFINES = [

24
Source/Plugins/Plugin_VideoOGL/Src/SConscript
View file

@ -73,22 +73,30 @@ if gfxenv['osx64']:
tests = {'CheckPKG' : utils.CheckPKG}
conf = gfxenv.Configure(custom_tests = tests)
if not (conf.CheckPKG('gl') and conf.CheckPKG('glu')):
print name + " must have opengl (gl and glu) to be build"
Return()
if not conf.CheckPKG('gl'):
if not conf.CheckLibWithHeader('gl', 'gl.h', 'c', 1):
print name + " must have opengl to be build"
else:
gfxenv.ParseConfig("pkg-config gl --cflags --libs")
#if not conf.CheckPKG('glu')):
# Return()
# check for xxf86vm
gfxenv['HAVE_XXF86VM'] = conf.CheckPKG('xxf86vm')
gfxenv = conf.Finish()
conf.Finish()
if gfxenv['HAVE_XXF86VM']:
gfxenv.ParseConfig("pkg-config xxf86vm --cflags --libs")
gfxenv.ParseConfig("pkg-config gl --cflags --libs")
gfxenv.ParseConfig("pkg-config glu --cflags --libs")
#gfxenv.ParseConfig("pkg-config glu --cflags --libs")
if sys.platform == 'darwin':
@ -98,11 +106,11 @@ if sys.platform == 'darwin':
# Use frameworks instead of plain libs, when possible.
linkFlags += [
'-Wl,-framework,%s' % framework
for framework in [ 'Cg' ]
for framework in [ 'Cg', 'OpenGL' ]
]
else:
# Libraries without pkg-config support.
libs += [ 'Cg', 'CgGL' ]
libs += [ 'Cg', 'CgGL', 'GLU' ]
# change to True if you want to compile with SDL