diff options
| author | John Peterson <jpeterson57@gmail.com> | 2008-11-16 20:09:13 +0000 |
|---|---|---|
| committer | John Peterson <jpeterson57@gmail.com> | 2008-11-16 20:09:13 +0000 |
| commit | be6a6215c9942d82e6be0586df285b494aed1c48 (patch) | |
| tree | 1e095511db77028d2894b2c27f2e56cf4e54b500 /Source/Core/Common/Src/DynamicLibrary.cpp | |
| parent | ecf6825a97ddd6f6c88e1362a67c571cee2a3223 (diff) | |
Calibrated emulated Wiimote aiming in widescreen mode. Added config menu to Wiimote. Added hide cursor option to OpenGL plugin. Added custom Wii settings and moved SYSCONF to User/Config (it will be copied by the game to Wii/shared2/sys when a game is run). Made the DSP and Video debugging windowses run on the same dll instance as the main instance.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1188 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/Common/Src/DynamicLibrary.cpp')
| -rw-r--r-- | Source/Core/Common/Src/DynamicLibrary.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/Source/Core/Common/Src/DynamicLibrary.cpp b/Source/Core/Common/Src/DynamicLibrary.cpp index 286bb103c1..320b9a198e 100644 --- a/Source/Core/Common/Src/DynamicLibrary.cpp +++ b/Source/Core/Common/Src/DynamicLibrary.cpp @@ -56,26 +56,32 @@ std::string GetLastErrorAsString() }
#endif
-bool DynamicLibrary::Load(const char* filename)
+// ------------------------------------------------------------------
+/* Loading means loading the dll with LoadLibrary() to get an instance to the dll.
+ This is done when Dolphin is started to determine which dlls are good, and
+ before opening the Config and Debugging windowses from Plugin.cpp and
+ before opening the dll for running the emulation in Video_...cpp in Core. */
+// -----------------------
+int DynamicLibrary::Load(const char* filename)
{
if (!filename || strlen(filename) == 0)
{
LOG(MASTER_LOG, "Missing filename of dynamic library to load");
- return false;
+ return 0;
}
LOG(MASTER_LOG, "Trying to load library %s", filename);
if (IsLoaded())
{
LOG(MASTER_LOG, "Trying to load already loaded library %s", filename);
- return false;
+ return 2;
}
#ifdef _WIN32
library = LoadLibrary(filename);
if (!library) {
LOG(MASTER_LOG, "Error loading DLL %s: %s", filename, GetLastErrorAsString().c_str());
- return false;
+ return 0;
}
#else
library = dlopen(filename, RTLD_NOW | RTLD_LOCAL);
@@ -90,7 +96,7 @@ bool DynamicLibrary::Load(const char* filename) }
#endif
library_file = filename;
- return true;
+ return 1;
}
|
