RTLD_SELF is a recent addition on Linux.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6959 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-01-29 05:08:52 +00:00 · 2011-01-29 05:08:52 +00:00 · d002a97575
parent 1bcad428ea
commit d002a97575
2 changed files with 3 additions and 6 deletions
--- a/Source/Core/Common/Src/DynamicLibrary.cpp
+++ b/Source/Core/Common/Src/DynamicLibrary.cpp
@ -120,11 +120,10 @@ int DynamicLibrary::Unload()
 			library_file.c_str(), library);
 #ifdef _WIN32
 	retval = FreeLibrary(library);
+#elif defined __linux__
+	retval = dlclose(library) ? 0 : 1;
 #else
-	if (library == RTLD_SELF)
-		return 1;
-	else
-		retval = dlclose(library) ? 0 : 1;
+	return 1;
 #endif

 	if (! retval) {
--- a/Source/Core/DolphinWX/Src/SConscript
+++ b/Source/Core/DolphinWX/Src/SConscript
@ -24,8 +24,6 @@ if env['HAVE_WX']:
 		'ARCodeAddEdit.cpp',
 		'GeckoCodeDiag.cpp',
 		'ConfigMain.cpp',
-		'DSPHLEConfigDlg.cpp',
-		'DSPLLEConfigDlg.cpp',
 		'Frame.cpp',
 		'FrameAui.cpp',
 		'FrameTools.cpp',