Revision: 1754
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=1754&view=rev
Author: rorthomas
Date: 2011-03-13 08:51:31 +0000 (Sun, 13 Mar 2011)
Log Message:
-----------
mygui fixes for linux
Modified Paths:
--------------
trunk/source/main/gameplay/SceneMouse.cpp
trunk/source/main/main_editor/CMakeLists.txt
trunk/source/main/main_sim/CMakeLists.txt
trunk/source/main/main_viewer/CMakeLists.txt
Modified: trunk/source/main/gameplay/SceneMouse.cpp
===================================================================
--- trunk/source/main/gameplay/SceneMouse.cpp 2011-03-13 00:57:13 UTC (rev
1753)
+++ trunk/source/main/gameplay/SceneMouse.cpp 2011-03-13 08:51:31 UTC (rev
1754)
@@ -20,8 +20,11 @@
#include "SceneMouse.h"
#include "RoRFrameListener.h"
#include <Ogre.h>
-#include <MyGUI.h>
+#ifdef USE_MYGUI
+# include <MyGUI.h>
+#endif //USE_MYGUI
+
using namespace Ogre;
template<> SceneMouse *Singleton < SceneMouse >::ms_Singleton = 0;
@@ -62,7 +65,9 @@
{
rfl->camRotX += Degree(-(float)ms.X.rel * 0.13f);
rfl->camRotY += Degree(-(float)ms.Y.rel * 0.13f);
+#ifdef USE_MYGUI
MyGUI::PointerManager::getInstance().setPointer("hand");
+#endif // USE_MYGUI
return true;
}
return false;
Modified: trunk/source/main/main_editor/CMakeLists.txt
===================================================================
--- trunk/source/main/main_editor/CMakeLists.txt 2011-03-13 00:57:13 UTC
(rev 1753)
+++ trunk/source/main/main_editor/CMakeLists.txt 2011-03-13 08:51:31 UTC
(rev 1754)
@@ -2,7 +2,6 @@
project(${BINNAME})
-
#setup libraries
macro(setup_lib name)
if(ROR_USE_${name})
@@ -128,4 +127,3 @@
ENDIF(WIN32)
target_link_libraries(${BINNAME} ${wxWidgets_LIBRARIES} ${Ogre_LIBRARIES}
${Ogre_Terrain_LIBRARIES} ${Ogre_Paging_LIBRARIES} ${Ogre_RTShader_LIBRARIES}
${Ois_LIBRARIES} ${OS_LIBS} ${optional_libs})
-
Modified: trunk/source/main/main_sim/CMakeLists.txt
===================================================================
--- trunk/source/main/main_sim/CMakeLists.txt 2011-03-13 00:57:13 UTC (rev
1753)
+++ trunk/source/main/main_sim/CMakeLists.txt 2011-03-13 08:51:31 UTC (rev
1754)
@@ -2,7 +2,6 @@
project(${BINNAME})
-
#setup libraries
macro(setup_lib name)
if(ROR_USE_${name})
@@ -121,4 +120,3 @@
ENDIF(WIN32)
target_link_libraries(${BINNAME} ${Ogre_LIBRARIES} ${Ogre_Terrain_LIBRARIES}
${Ogre_Paging_LIBRARIES} ${Ogre_RTShader_LIBRARIES} ${Ois_LIBRARIES} ${OS_LIBS}
${optional_libs})
-
Modified: trunk/source/main/main_viewer/CMakeLists.txt
===================================================================
--- trunk/source/main/main_viewer/CMakeLists.txt 2011-03-13 00:57:13 UTC
(rev 1753)
+++ trunk/source/main/main_viewer/CMakeLists.txt 2011-03-13 08:51:31 UTC
(rev 1754)
@@ -113,7 +113,6 @@
add_sub_dir(framework)
add_sub_dir(main_viewer)
-
# find wxWidgets
SET(wxWidgets_USE_UNICODE ON)
FIND_PACKAGE(wxWidgets REQUIRED COMPONENTS base core html net adv propgrid aui)
@@ -121,7 +120,6 @@
add_definitions("-D${wxWidgets_DEFINITIONS}" ${wxWidgets_CXX_FLAGS})
link_directories (${wxWidgets_LIB_DIR})
-
IF(WIN32)
add_executable(${BINNAME} WIN32 ${headers} ${sources} icon.rc)
ELSE(WIN32)
@@ -129,4 +127,3 @@
ENDIF(WIN32)
target_link_libraries(${BINNAME} ${wxWidgets_LIBRARIES} ${Ogre_LIBRARIES}
${Ogre_Terrain_LIBRARIES} ${Ogre_Paging_LIBRARIES} ${Ogre_RTShader_LIBRARIES}
${Ois_LIBRARIES} ${OS_LIBS} ${optional_libs})
-
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Colocation vs. Managed Hosting
A question and answer guide to determining the best fit
for your organization - today and in the future.
http://p.sf.net/sfu/internap-sfd2d
_______________________________________________
Rigsofrods-devel mailing list
Rigsofrods-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
