diff options
| author | erihel <erihel@gmail.com> | 2012-08-09 23:04:29 +0200 |
|---|---|---|
| committer | erihel <erihel@gmail.com> | 2012-08-09 23:04:29 +0200 |
| commit | 9946459c0cd65c3b66719a2aefc42c7ab2a29c04 (patch) | |
| tree | 78e68a3a434082c5f42926f907adb05db9ae24dd /src/plugins | |
| parent | f1d1cdceee3ec49546ba800a1b53a2dfb9c21e11 (diff) | |
| download | colobot-9946459c0cd65c3b66719a2aefc42c7ab2a29c04.tar.gz colobot-9946459c0cd65c3b66719a2aefc42c7ab2a29c04.tar.bz2 colobot-9946459c0cd65c3b66719a2aefc42c7ab2a29c04.zip | |
* changed 0, NULL to nullptr
* changed profile.cpp to use SimpleIni to load config files
* added new CProfile singleton class for loading config
* added SimpleIni to lib/ dir
* added config loading tests
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/pluginloader.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/test/CMakeLists.txt | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/plugins/pluginloader.cpp b/src/plugins/pluginloader.cpp index adceb6b..337c0ce 100644 --- a/src/plugins/pluginloader.cpp +++ b/src/plugins/pluginloader.cpp @@ -56,13 +56,13 @@ bool CPluginLoader::UnloadPlugin() GetLogger()->Warn("Plugin %s is not loaded.\n"); return true; } - + void (*uninstall)() = (void (*)()) lt_dlsym(mHandle, "UninstallPluginEntry"); if (!uninstall) { GetLogger()->Error("Error getting UninstallPluginEntry for plugin %s: %s\n", mFilename.c_str(), lt_dlerror()); return false; } - + lt_dlclose(mHandle); mLoaded = false; return true; @@ -89,7 +89,7 @@ bool CPluginLoader::LoadPlugin() GetLogger()->Error("Error getting GetPluginInterfaceEntry for plugin %s: %s\n", mFilename.c_str(), lt_dlerror()); return false; } - + install(); mInterface = getInterface(); mLoaded = true; diff --git a/src/plugins/test/CMakeLists.txt b/src/plugins/test/CMakeLists.txt index 5953468..cd4e6be 100644 --- a/src/plugins/test/CMakeLists.txt +++ b/src/plugins/test/CMakeLists.txt @@ -5,7 +5,6 @@ set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -O0 -std=c++11 -rdynamic") add_executable(plugin_test plugin_test.cpp ../../common/iman.cpp ../../common/logger.cpp ../pluginloader.cpp) -# Change to DirectX SDK directory include_directories("../../") -target_link_libraries(plugin_test ltdl)
\ No newline at end of file +target_link_libraries(plugin_test ltdl) |