From a09ccf923957ee32319addd102eead7a1a53872e Mon Sep 17 00:00:00 2001 From: juergen <juergen@5a81b35b-ba03-0410-adc8-b2c5c5119f08> Date: Wed, 21 Apr 2010 08:12:26 +0000 Subject: [PATCH] export fixes for win32 disabling wiggle code for the moment added option definition for option COMPOUND_LIB for master CMakeLists.txt updated win32 build config git-svn-id: https://dng.biozentrum.unibas.ch/svn/openstructure/trunk@2069 5a81b35b-ba03-0410-adc8-b2c5c5119f08 --- CMakeLists.txt | 1 + build_configs/win32 | 1 + modules/gfx/src/impl/wgl_offscreen_buffer.cc | 2 +- modules/gfx/src/impl/wgl_offscreen_buffer.hh | 8 -------- modules/gui/src/data_viewer/null_overlay.hh | 3 ++- modules/gui/src/data_viewer/pointlist_overlay_base.hh | 2 +- modules/info/src/info_path.hh | 2 ++ 7 files changed, 8 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 459d7c7e0..f0c18ef02 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,6 +29,7 @@ option(ENABLE_SPNAV "whether 3DConnexion devices should be supported" OFF) option(STATIC_PROPERTY_WORKAROUND "workaround for static property bug with some boost/boost_python combinations" OFF) option(DEPLOYMENT "switch on deployment settings" OFF) +option(COMPOUND_LIB "location of the compound library to enable rule based builder based on the chemical component dictionary") if (PREFIX) diff --git a/build_configs/win32 b/build_configs/win32 index ec1131828..e315b0005 100644 --- a/build_configs/win32 +++ b/build_configs/win32 @@ -22,3 +22,4 @@ set(USE_SHADER "OFF" CACHE PATH "use GLSL shaders") set(OPTIMIZE "ON" CACHE PATH "Release Code optimisations") set(ENABLE_IPLT "ON" CACHE PATH "include IPLT functionality") set(DEPLOYMENT "ON" CACHE PATH "activate deployment scripts" ) +set(COMPOUND_LIB "${USER_DIR}/compound_lib" CACHE PATH "location of compound lib for rule based builder" ) diff --git a/modules/gfx/src/impl/wgl_offscreen_buffer.cc b/modules/gfx/src/impl/wgl_offscreen_buffer.cc index 135e5c3ee..614a19567 100644 --- a/modules/gfx/src/impl/wgl_offscreen_buffer.cc +++ b/modules/gfx/src/impl/wgl_offscreen_buffer.cc @@ -21,7 +21,7 @@ namespace ost { namespace gfx { -OffscreenBuffer::OffscreenBuffer(unsigned int width, unsigned int height, const OffscreenBufferFormat& f, bool shared=true): +OffscreenBuffer::OffscreenBuffer(unsigned int width, unsigned int height, const OffscreenBufferFormat& f, bool shared): width_(width), height_(height), valid_(false), active_(false) {} diff --git a/modules/gfx/src/impl/wgl_offscreen_buffer.hh b/modules/gfx/src/impl/wgl_offscreen_buffer.hh index ae846a2ba..df4cfaab4 100644 --- a/modules/gfx/src/impl/wgl_offscreen_buffer.hh +++ b/modules/gfx/src/impl/wgl_offscreen_buffer.hh @@ -19,7 +19,6 @@ #ifndef OST_GFX_WGL_OFFSCREEN_BUFFER_HH #define OST_GFX_WGL_OFFSCREEN_BUFFER_HH -#include <ost/gfx/GL/wglew.h> namespace ost { namespace gfx { @@ -46,13 +45,6 @@ private: int height_; bool valid_; bool active_; - - HPBUFFERARB pbuffer_; - HGLRC context_; //rendering context - HGLRC old_context_; - - HDC dev_context_;//device context - HDC old_dev_context_; }; }} // ns diff --git a/modules/gui/src/data_viewer/null_overlay.hh b/modules/gui/src/data_viewer/null_overlay.hh index 737bf94ec..3e4128b03 100644 --- a/modules/gui/src/data_viewer/null_overlay.hh +++ b/modules/gui/src/data_viewer/null_overlay.hh @@ -23,10 +23,11 @@ */ #include "overlay_base.hh" +#include <ost/gui/module_config.hh> namespace ost { namespace img { namespace gui { -class DLLEXPORT NullOverlay: public Overlay +class DLLEXPORT_OST_GUI NullOverlay: public Overlay { Q_OBJECT; public: diff --git a/modules/gui/src/data_viewer/pointlist_overlay_base.hh b/modules/gui/src/data_viewer/pointlist_overlay_base.hh index dc8b3da07..606c859a1 100644 --- a/modules/gui/src/data_viewer/pointlist_overlay_base.hh +++ b/modules/gui/src/data_viewer/pointlist_overlay_base.hh @@ -72,7 +72,7 @@ class DLLEXPORT_OST_GUI PointlistOverlayBaseSettings: public QDialog QPushButton* passive_color_b_; }; -class DLLEXPORT PointlistOverlayBase: public Overlay +class DLLEXPORT_OST_GUI PointlistOverlayBase: public Overlay { Q_OBJECT; public: diff --git a/modules/info/src/info_path.hh b/modules/info/src/info_path.hh index da5871f8a..ad69b47cd 100644 --- a/modules/info/src/info_path.hh +++ b/modules/info/src/info_path.hh @@ -70,6 +70,8 @@ private: }; DLLEXPORT_OST_INFO std::ostream& operator<<(std::ostream&, const InfoPath& p); +#ifndef _MSC_VER DLLEXPORT_OST_INFO InfoPath operator+(const InfoPath& p1, const InfoPath& p2); +#endif }} // ns -- GitLab