From 1b83929487f797b0b0960b89fb5cbdc8c216ba96 Mon Sep 17 00:00:00 2001
From: Piotr Dziwinski <piotrdz@gmail.com>
Date: Thu, 28 Jun 2012 22:54:53 +0200
Subject: Pulled changes from master branch

---
 src/CBot/CBotString.cpp | 2 +-
 src/CBot/CMakeLists.txt | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/CBot')

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})
-- 
cgit v1.2.3-1-g7c22