Had to move the Nel3DWidget library to the core plugin, because Nel can only be used statically at this point. Which makes using the separate Nel3DWidget library inparctical.

This commit is contained in:
dfighter1985 2014-06-16 15:30:35 +02:00
parent 41727220e0
commit 3c9dad8ba5
7 changed files with 10 additions and 46 deletions

View file

@ -1,5 +1,4 @@
ADD_SUBDIRECTORY(3rdparty)
ADD_SUBDIRECTORY(Nel3DWidget)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR} ${QT_INCLUDES})
INCLUDE( ${QT_USE_FILE} )

View file

@ -1,36 +0,0 @@
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${QT_INCLUDES}
)
INCLUDE( ${QT_USE_FILE} )
FILE(GLOB SRC *.cpp *.h)
SET(NEL3DWIDGET_HDR
nel3d_widget.h
)
SET(QT_USE_QTGUI TRUE)
QT4_WRAP_CPP( NEL3DWIDGET_MOC_SRC ${NEL3DWIDGET_HDR} )
SOURCE_GROUP(QtGeneratedMocSrc FILES ${NEL3DWIDGET_MOC_SRC} )
SOURCE_GROUP("Nel 3D Widget files" FILES ${SRC})
ADD_LIBRARY(nel3dwidget SHARED
${SRC}
${NEL3DWIDGET_MOC_SRC}
)
TARGET_LINK_LIBRARIES( nel3dwidget
nelmisc
nel3d
${QT_LIBRARIES}
)
NL_DEFAULT_PROPS(nel3dwidget "Nel3D Qt Widget")
NL_ADD_RUNTIME_FLAGS(nel3dwidget)
NL_ADD_LIB_SUFFIX(nel3dwidget)
ADD_DEFINITIONS( -DN3DW_LIB -DQT_DLL -DQT_SHARED ${QT_DEFINITIONS} )

View file

@ -4,6 +4,11 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR}
${QT_INCLUDES})
FILE(GLOB SRC *.cpp *.h)
SET( SRC ${SRC}
${CMAKE_CURRENT_SOURCE_DIR}/Nel3DWidget/nel3d_widget.h
${CMAKE_CURRENT_SOURCE_DIR}/Nel3DWidget/nel3d_widget.cpp
)
SET(OVQT_EXT_SYS_SRC ${CMAKE_CURRENT_SOURCE_DIR}/../../extension_system/iplugin.h
${CMAKE_CURRENT_SOURCE_DIR}/../../extension_system/iplugin_manager.h
${CMAKE_CURRENT_SOURCE_DIR}/../../extension_system/iplugin_spec.h)
@ -22,6 +27,7 @@ SET(OVQT_CORE_PLUGIN_HDR
search_paths_settings_page.h
general_settings_page.h
plugin_view_dialog.h
${CMAKE_CURRENT_SOURCE_DIR}/Nel3DWidget/nel3d_widget.h
)
SET(OVQT_CORE_PLUGIN_UIS settings_dialog.ui
@ -47,7 +53,7 @@ SOURCE_GROUP("OVQT Extension System" FILES ${OVQT_EXT_SYS_SRC})
ADD_LIBRARY(studio_plugin_core SHARED ${SRC} ${OVQT_CORE_PLUGIN_MOC_SRC} ${OVQT_EXT_SYS_SRC} ${OVQT_CORE_PLUGIN_RC_SRCS} ${OVQT_CORE_PLUGIN_UI_HDRS})
TARGET_LINK_LIBRARIES(studio_plugin_core nelmisc ${QT_LIBRARIES})
TARGET_LINK_LIBRARIES(studio_plugin_core nelmisc nel3d ${QT_LIBRARIES})
NL_DEFAULT_PROPS(studio_plugin_core "Tools: Studio Plugin: Core")
NL_ADD_RUNTIME_FLAGS(studio_plugin_core)

View file

@ -22,11 +22,7 @@
#include "nel/misc/types_nl.h"
#include <string>
#if defined( N3DW_LIB )
#define N3DW_EXPORT Q_DECL_EXPORT
#else
#define N3DW_EXPORT Q_DECL_IMPORT
#endif
#include "../core_global.h"
namespace NL3D
{
@ -35,7 +31,7 @@ namespace NL3D
}
/// Nel 3D interface to Qt
class N3DW_EXPORT Nel3DWidget : public QWidget
class CORE_EXPORT Nel3DWidget : public QWidget
{
Q_OBJECT
public:

View file

@ -77,7 +77,6 @@ TARGET_LINK_LIBRARIES(
${QT_QTOPENGL_LIBRARY}
${LIBXML2_LIBRARIES}
qt_property_browser
nel3dwidget
)
NL_DEFAULT_PROPS(studio_plugin_gui_editor "Tools: Studio Plugin: GUI Editor")

View file

@ -30,7 +30,7 @@
#include <QTimerEvent>
#include "editor_selection_watcher.h"
#include "../../Nel3DWidget/nel3d_widget.h"
#include "../core/Nel3DWidget/nel3d_widget.h"
namespace GUIEditor
{