--- configurator/CMakeLists.txt.orig	2009-06-25 22:30:12.000000000 +0400
+++ configurator/CMakeLists.txt	2010-01-27 22:29:11.000000000 +0300
@@ -12,6 +12,9 @@
 
 FIND_PACKAGE(wxWidgets COMPONENTS base core html net)
 IF(wxWidgets_FOUND)
+  STRING(REGEX REPLACE ";" ";-D" wxWidgets_DEFINITIONS "${wxWidgets_DEFINITIONS}")
+  SET(wxWidgets_DEFINITIONS "-D${wxWidgets_DEFINITIONS}")
+
   include_directories(${wxWidgets_INCLUDE_DIRS})
   add_definitions(${wxWidgets_DEFINITIONS} ${wxWidgets_CXX_FLAGS})
 
@@ -27,9 +30,10 @@
   link_directories (${wxWidgets_LIB_DIR})
   include_directories (${RoR_Dependencies_SOURCE_DIR}/rorserver-sf/source)
   include_directories (${RoR_Dependencies_SOURCE_DIR}/ogrenew/OgreMain/include)
-  include_directories (${RoR_Dependencies_SOURCE_DIR}/ogrenew/Dependencies/include)
-  include_directories (${RoR_Dependencies_SOURCE_DIR}/OIS-HEAD/ois/includes)
   include_directories (${RoR_Main_SOURCE_DIR}/source)
+  include_directories (${LOCALBASE}/include/OIS)
+
+  add_definitions("-D\"strnlen(a,b)=strlen(a)\"")
 
   SET(config_source ${config_source} ${RoR_SOURCE_DIR}/main/source/InputEngine.cpp)
 
@@ -48,7 +52,7 @@
 
   add_executable(rorconfig ${config_source} ${config_headers} ${config_res})
   TARGET_LINK_LIBRARIES(rorconfig ${wxWidgets_LIBRARIES} )
-  target_link_libraries(rorconfig OgreMain ois)
+  target_link_libraries(rorconfig OgreMain ${LOCALBASE}/lib/libOIS.so)
 
   IF(WIN32)
     SET_TARGET_PROPERTIES(rorconfig PROPERTIES COMPILE_FLAGS "")
