mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-29 12:19:12 +00:00
Fix an issue that made it so that the emulator could not be resized in the nowx build on linux. Also some code cleanup in the OpenGL and Software plugins.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5889 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
aa88d8b790
commit
25efe443ea
6 changed files with 216 additions and 312 deletions
|
@ -1,11 +1,7 @@
|
|||
# -*- python -*-
|
||||
|
||||
Import('env')
|
||||
# can we import path in one place?
|
||||
import sys
|
||||
sys.path.append(env['base_dir']+'SconsTests')
|
||||
import utils
|
||||
import platform
|
||||
|
||||
name = "Plugin_VideoSoftware"
|
||||
|
||||
|
@ -25,38 +21,30 @@ files = [
|
|||
'Rasterizer.cpp',
|
||||
'RasterFont.cpp',
|
||||
'Renderer.cpp',
|
||||
'SetupUnit.cpp',
|
||||
'Statistics.cpp',
|
||||
'Tev.cpp',
|
||||
'TextureEncoder.cpp',
|
||||
'TextureSampler.cpp',
|
||||
'TransformUnit.cpp',
|
||||
'VertexFormatConverter.cpp',
|
||||
'VertexLoader.cpp',
|
||||
'VideoConfig.cpp',
|
||||
'XFMemLoader.cpp',
|
||||
]
|
||||
linkFlags = [
|
||||
'SetupUnit.cpp',
|
||||
'Statistics.cpp',
|
||||
'Tev.cpp',
|
||||
'TextureEncoder.cpp',
|
||||
'TextureSampler.cpp',
|
||||
'TransformUnit.cpp',
|
||||
'VertexFormatConverter.cpp',
|
||||
'VertexLoader.cpp',
|
||||
'VideoConfig.cpp',
|
||||
'XFMemLoader.cpp',
|
||||
]
|
||||
|
||||
libs = [
|
||||
'videocommon', 'GLEW', 'SOIL', 'common'
|
||||
]
|
||||
|
||||
gfxenv = env.Clone()
|
||||
|
||||
if sys.platform == 'win32':
|
||||
files += [ 'Win32.cpp' ]
|
||||
|
||||
if sys.platform == 'darwin':
|
||||
files += [ 'cocoaGL.m', ]
|
||||
|
||||
if sys.platform == 'win32':
|
||||
files += [
|
||||
'Win32.cpp'
|
||||
]
|
||||
libs += [
|
||||
env['base_dir'] + '/Externals/Cg/'
|
||||
]
|
||||
files += [ 'Win32.cpp' ]
|
||||
libs += [ env['base_dir'] + '/Externals/Cg/' ]
|
||||
gfxenv['CPPPATH'] += libs
|
||||
|
||||
gfxenv.SharedLibrary(
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue