summaryrefslogtreecommitdiffstats
path: root/src/plugins/test
diff options
context:
space:
mode:
authorerihel <erihel@gmail.com>2012-08-09 21:21:14 +0200
committererihel <erihel@gmail.com>2012-08-09 21:21:14 +0200
commitf1d1cdceee3ec49546ba800a1b53a2dfb9c21e11 (patch)
treeedaf51343085410a66f773b4d189b6eaffa091dd /src/plugins/test
parent611680a72e0f04e080c3b7ed59bd23d5b8b709f1 (diff)
downloadcolobot-f1d1cdceee3ec49546ba800a1b53a2dfb9c21e11.tar.gz
colobot-f1d1cdceee3ec49546ba800a1b53a2dfb9c21e11.tar.bz2
colobot-f1d1cdceee3ec49546ba800a1b53a2dfb9c21e11.zip
Changes after merge
Diffstat (limited to 'src/plugins/test')
-rw-r--r--src/plugins/test/CMakeLists.txt2
-rw-r--r--src/plugins/test/plugin_test.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/test/CMakeLists.txt b/src/plugins/test/CMakeLists.txt
index 551daeb..5953468 100644
--- a/src/plugins/test/CMakeLists.txt
+++ b/src/plugins/test/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8)
set(CMAKE_BUILD_TYPE debug)
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 ../plugin.cpp)
+add_executable(plugin_test plugin_test.cpp ../../common/iman.cpp ../../common/logger.cpp ../pluginloader.cpp)
# Change to DirectX SDK directory
include_directories("../../")
diff --git a/src/plugins/test/plugin_test.cpp b/src/plugins/test/plugin_test.cpp
index 7175773..9aadfac 100644
--- a/src/plugins/test/plugin_test.cpp
+++ b/src/plugins/test/plugin_test.cpp
@@ -5,7 +5,7 @@
#include <common/logger.h>
#include <common/iman.h>
#include <sound/sound.h>
-#include <plugins/plugin.h>
+#include <plugins/pluginloader.h>
int main() {
@@ -14,7 +14,7 @@ int main() {
lt_dlinit();
- CPlugin *plugin = new CPlugin("libopenalsound");
+ CPluginLoader *plugin = new CPluginLoader("libopenalsound");
if (plugin->LoadPlugin()) {
CSoundInterface *sound = static_cast<CSoundInterface*>(CInstanceManager::GetInstancePointer()->SearchInstance(CLASS_SOUND));