diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-28 22:54:53 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-28 22:54:53 +0200 |
| commit | 1b83929487f797b0b0960b89fb5cbdc8c216ba96 (patch) | |
| tree | 56b881182b63183461706ace0dac4932e45545ad /src/CBot | |
| parent | b06c663bc2976940e3a5aa17b6d2c314a908f697 (diff) | |
| download | colobot-1b83929487f797b0b0960b89fb5cbdc8c216ba96.tar.gz colobot-1b83929487f797b0b0960b89fb5cbdc8c216ba96.tar.bz2 colobot-1b83929487f797b0b0960b89fb5cbdc8c216ba96.zip | |
Pulled changes from master branch
Diffstat (limited to 'src/CBot')
| -rw-r--r-- | src/CBot/CBotString.cpp | 2 | ||||
| -rw-r--r-- | src/CBot/CMakeLists.txt | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/CBot/CBotString.cpp b/src/CBot/CBotString.cpp index 2a1e3bd..53b0f27 100644 --- a/src/CBot/CBotString.cpp +++ b/src/CBot/CBotString.cpp @@ -21,7 +21,7 @@ #include <string.h>
-HINSTANCE CBotString::m_hInstance = (HINSTANCE)LoadLibrary("Cbot.dll"); // comment le récupérer autrement ??
+HINSTANCE CBotString::m_hInstance = (HINSTANCE)LoadLibrary("libCbot.dll"); // comment le récupérer autrement ??
CBotString::CBotString()
diff --git a/src/CBot/CMakeLists.txt b/src/CBot/CMakeLists.txt index 409ef3b..9933e9c 100644 --- a/src/CBot/CMakeLists.txt +++ b/src/CBot/CMakeLists.txt @@ -10,6 +10,7 @@ CBotToken.cpp CBotTwoOpExpr.cpp CBotVar.cpp CBotWhile.cpp +CBot.rc ) add_library(CBot SHARED ${SOURCES}) |