From 418f8a2b236456c91b16a31c72224a3d4340edbd Mon Sep 17 00:00:00 2001 From: nakeee Date: Tue, 28 Oct 2008 14:19:28 +0000 Subject: [PATCH] opengl scons compile fix on linux git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@990 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_Zelda.cpp | 2 +- Source/Plugins/Plugin_VideoOGL/Src/SConscript | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_Zelda.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_Zelda.cpp index c2096e953a..13d1160205 100644 --- a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_Zelda.cpp +++ b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_Zelda.cpp @@ -16,7 +16,7 @@ // http://code.google.com/p/dolphin-emu/ // Games that uses this UCode: -// Zelda: The Windwaker, Mario Sunshine, Mario Kart +// Zelda: The Windwaker, Mario Sunshine, Mario Kart, Twilight Princess #include "../Globals.h" #include "UCodes.h" diff --git a/Source/Plugins/Plugin_VideoOGL/Src/SConscript b/Source/Plugins/Plugin_VideoOGL/Src/SConscript index 8dacba06b5..a756cd31fb 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/SConscript +++ b/Source/Plugins/Plugin_VideoOGL/Src/SConscript @@ -99,6 +99,8 @@ else: # Libraries without pkg-config support. libs += [ 'GL', 'Cg', 'CgGL' ] + + if useSDL: compileFlags += [ '-DUSE_SDL=1' ] @@ -110,5 +112,5 @@ gfxenv.Append( gfxenv.SharedLibrary( '../../../../Binary/%s/Plugins/zeroogl.so' % platform, files, - LIBS = libs + LIBS = libs + gfxenv['LIBS'] )