fixed build and grabbing mouse again

qwertzui11 · Jan 31, 2015 · d7c3d67 · d7c3d67
1 parent 35722c4
commit d7c3d67
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 32 deletions.
diff --git a/examples/voxelterrain/source/Handler.hpp b/examples/voxelterrain/source/Handler.hpp
@@ -120,8 +120,8 @@ class Handler : public Ogre::FrameListener, public OIS::MouseListener, public OI
         pl.insert(std::make_pair(std::string("w32_keyboard"), std::string("DISCL_FOREGROUND")));
         pl.insert(std::make_pair(std::string("w32_keyboard"), std::string("DISCL_NONEXCLUSIVE")));
     #elif defined OIS_LINUX_PLATFORM
-//        pl.insert(std::make_pair(std::string("x11_mouse_grab"), std::string("true")));
-        pl.insert(std::make_pair(std::string("x11_mouse_grab"), std::string("false")));
+        pl.insert(std::make_pair(std::string("x11_mouse_grab"), std::string("true")));
+//        pl.insert(std::make_pair(std::string("x11_mouse_grab"), std::string("false")));
         pl.insert(std::make_pair(std::string("x11_mouse_hide"), std::string("true")));
         pl.insert(std::make_pair(std::string("x11_keyboard_grab"), std::string("false")));
         pl.insert(std::make_pair(std::string("XAutoRepeatOn"), std::string("true")));

diff --git a/modules/core/CMakeLists.txt b/modules/core/CMakeLists.txt
@@ -1,44 +1,40 @@
 
 set(sources
-base64.cpp
-byteArray.cpp
-compression.cpp
 dateTime.cpp
+byteArray.cpp
 string.cpp
 timer.cpp
 )
 
 set(headers
-predecl.hpp
-any.hpp
-base64.hpp
-compression.hpp
-pair.hpp
-hashMapMulti.hpp
-string.hpp
+array.hpp
+bind.hpp
+byteArray.hpp
+classVersion.hpp
 dateTime.hpp
 deque.hpp
 enableSharedFromThis.hpp
-move.hpp
-weakPointer.hpp
-array.hpp
-sharedPointer.hpp
-hashList.hpp
 geometry.hpp
+hashList.hpp
 hashMap.hpp
+hashMapMulti.hpp
 idCreator.hpp
+list.hpp
 map.hpp
-timer.hpp
-byteArray.hpp
-classVersion.hpp
+move.hpp
 noncopyable.hpp
+optional.hpp
+pair.hpp
+predecl.hpp
 scopedPtr.hpp
+sharedPointer.hpp
 signal.hpp
-vector.hpp
-stringList.hpp
 state.hpp
-list.hpp
-bind.hpp
+string.hpp
+stringList.hpp
+timer.hpp
+vector.hpp
+weakPointer.hpp
 )
 
 add_module(core)

diff --git a/modules/procedural/CMakeLists.txt b/modules/procedural/CMakeLists.txt
@@ -1,17 +1,11 @@
 
 set(sources
 log/global.cpp
-cube.cpp
-circle.cpp
-plane.cpp
-sphere.cpp
 )
 
 set(headers
 predecl.hpp
 log/global.hpp
-circle.hpp
-sphere.hpp
 voxel/config.hpp
 voxel/data.hpp
 voxel/vertex.hpp
@@ -39,8 +33,6 @@ voxel/tile/base.hpp
 voxel/tile/surface.hpp
 voxel/tile/container.hpp
 voxel/tile/renderer.hpp
-cube.hpp
-plane.hpp
 )
 
 add_module(procedural)