From 4891ceaf1cd805a42da802d9813f58abd1c4234f Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Sun, 12 Dec 2010 15:15:10 +0100
Subject: [PATCH] Fixed: Compilation under Linux

---
 .../src/plugins/example/CMakeLists.txt               |  6 +++++-
 .../object_viewer_qt/src/plugins/log/CMakeLists.txt  |  6 +++++-
 .../tools/3d/object_viewer_widget/src/CMakeLists.txt | 12 ++++++++----
 .../georges_editor_qt/src/objectviewer_dialog.cpp    |  2 +-
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/example/CMakeLists.txt b/code/nel/tools/3d/object_viewer_qt/src/plugins/example/CMakeLists.txt
index ef5a633f9..33a485c61 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/example/CMakeLists.txt
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/example/CMakeLists.txt
@@ -22,7 +22,11 @@ SOURCE_GROUP("OVQT Extension System" FILES ${OVQT_EXT_SYS_SRC})
 ADD_LIBRARY(ovqt_plugin_example SHARED ${SRC} ${OVQT_PLUG_EXAMPLE_MOC_SRC} ${OVQT_EXT_SYS_SRC})
 
 TARGET_LINK_LIBRARIES(ovqt_plugin_example nelmisc ${QT_LIBRARIES})
-							
+
+IF(WITH_STLPORT)
+  TARGET_LINK_LIBRARIES(ovqt_plugin_example ${CMAKE_THREAD_LIBS_INIT})
+ENDIF(WITH_STLPORT)
+
 NL_DEFAULT_PROPS(ovqt_plugin_example "NeL, Tools, 3D: Object Viewer Qt Plugin: Example")
 NL_ADD_RUNTIME_FLAGS(ovqt_plugin_example)
 NL_ADD_LIB_SUFFIX(ovqt_plugin_example)
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/log/CMakeLists.txt b/code/nel/tools/3d/object_viewer_qt/src/plugins/log/CMakeLists.txt
index 7b8b85d5d..d24f6ec3a 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/log/CMakeLists.txt
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/log/CMakeLists.txt
@@ -26,7 +26,11 @@ SOURCE_GROUP("OVQT Extension System" FILES ${OVQT_EXT_SYS_SRC})
 ADD_LIBRARY(ovqt_plugin_log SHARED ${SRC} ${OVQT_PLUG_LOG_MOC_SRC} ${OVQT_EXT_SYS_SRC} ${OVQT_PLUG_LOG_UI_HDRS})
 
 TARGET_LINK_LIBRARIES(ovqt_plugin_log nelmisc ${QT_LIBRARIES})
-							
+
+IF(WITH_STLPORT)
+  TARGET_LINK_LIBRARIES(ovqt_plugin_log ${CMAKE_THREAD_LIBS_INIT})
+ENDIF(WITH_STLPORT)
+
 NL_DEFAULT_PROPS(ovqt_plugin_log "NeL, Tools, 3D: Object Viewer Qt Plugin: Log")
 NL_ADD_RUNTIME_FLAGS(ovqt_plugin_log)
 NL_ADD_LIB_SUFFIX(ovqt_plugin_log)
diff --git a/code/nel/tools/3d/object_viewer_widget/src/CMakeLists.txt b/code/nel/tools/3d/object_viewer_widget/src/CMakeLists.txt
index ca77bfe2d..34797d45e 100644
--- a/code/nel/tools/3d/object_viewer_widget/src/CMakeLists.txt
+++ b/code/nel/tools/3d/object_viewer_widget/src/CMakeLists.txt
@@ -27,13 +27,17 @@ TARGET_LINK_LIBRARIES(object_viewer_widget_qt
 		${QT_LIBRARIES}
 		${QT_QTOPENGL_LIBRARY})
 
-ADD_DEFINITIONS(-DQT_NO_KEYWORDS ${LIBXML2_DEFINITIONS} ${QT_DEFINITIONS})
-ADD_DEFINITIONS(-DQT_PLUGIN)
-ADD_DEFINITIONS(-DQT_SHARED)
+IF(WITH_STLPORT)
+  TARGET_LINK_LIBRARIES(object_viewer_widget_qt ${CMAKE_THREAD_LIBS_INIT})
+ENDIF(WITH_STLPORT)
+
+ADD_DEFINITIONS(-DQT_NO_KEYWORDS ${LIBXML2_DEFINITIONS} ${QT_DEFINITIONS})
+ADD_DEFINITIONS(-DQT_PLUGIN)
+ADD_DEFINITIONS(-DQT_SHARED)
 #ADD_DEFINITIONS(-DQT_NO_DEBUG)
 
 NL_DEFAULT_PROPS(object_viewer_widget_qt "NeL, Tools, 3D: Object Viewer Qt Widget")
-#NL_ADD_RUNTIME_FLAGS(object_viewer_widget_qt)
+NL_ADD_RUNTIME_FLAGS(object_viewer_widget_qt)
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(object_viewer_widget_qt ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/objectviewer_dialog.cpp b/code/ryzom/tools/leveldesign/georges_editor_qt/src/objectviewer_dialog.cpp
index d1bd1a90e..b7be551df 100644
--- a/code/ryzom/tools/leveldesign/georges_editor_qt/src/objectviewer_dialog.cpp
+++ b/code/ryzom/tools/leveldesign/georges_editor_qt/src/objectviewer_dialog.cpp
@@ -46,7 +46,7 @@ namespace NLQT
 	{
 		_ui.setupUi(this);
 
-		_nlw = Modules::objViewInt().getWidget();
+		_nlw = dynamic_cast<QNLWidget*>(Modules::objViewInt().getWidget());
 		//_nlw->setObjectName(QString::fromUtf8("nlwidget"));
 		_ui.gridLayout->addWidget(_nlw, 0, 0);
 	}