|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r50616 - in sandbox/guigl: boost/guigl boost/guigl/view boost/guigl/widget libs/guigl/build libs/guigl/build/vc8ide libs/guigl/example
From: stipe_at_[hidden]
Date: 2009-01-15 18:13:27
Author: srajko
Date: 2009-01-15 18:13:26 EST (Thu, 15 Jan 2009)
New Revision: 50616
URL: http://svn.boost.org/trac/boost/changeset/50616
Log:
fixed dll-linking errors on windows
Text files modified:
sandbox/guigl/boost/guigl/view/base.hpp | 3 ++-
sandbox/guigl/boost/guigl/view/clickable.hpp | 2 +-
sandbox/guigl/boost/guigl/view/draggable.hpp | 2 +-
sandbox/guigl/boost/guigl/view/mouse_tracking.hpp | 2 +-
sandbox/guigl/boost/guigl/widget/button.hpp | 4 ++--
sandbox/guigl/boost/guigl/widget/labeled_slider.hpp | 2 +-
sandbox/guigl/boost/guigl/widget/slider.hpp | 6 +++---
sandbox/guigl/boost/guigl/window.hpp | 2 +-
sandbox/guigl/libs/guigl/build/Jamfile | 6 ++++++
sandbox/guigl/libs/guigl/build/vc8ide/build.vcproj | 12 ++++++++++++
sandbox/guigl/libs/guigl/example/window_example.cpp | 8 ++++----
11 files changed, 34 insertions(+), 15 deletions(-)
Modified: sandbox/guigl/boost/guigl/view/base.hpp
==============================================================================
--- sandbox/guigl/boost/guigl/view/base.hpp (original)
+++ sandbox/guigl/boost/guigl/view/base.hpp 2009-01-15 18:13:26 EST (Thu, 15 Jan 2009)
@@ -11,6 +11,7 @@
#include <boost/guigl/access.hpp>
#include <boost/guigl/event.hpp>
+#include <boost/guigl/export_symbols.hpp>
#include <boost/guigl/parameters.hpp>
namespace boost { namespace guigl {
@@ -56,7 +57,7 @@
#define BOOST_GUIGL_WIDGET_DRAW \
friend class ::boost::guigl::access; \
- void draw(); \
+ void BOOST_EXPORT_SYMBOLS draw(); \
void draw_prologue(); \
void draw_epilogue(); \
Modified: sandbox/guigl/boost/guigl/view/clickable.hpp
==============================================================================
--- sandbox/guigl/boost/guigl/view/clickable.hpp (original)
+++ sandbox/guigl/boost/guigl/view/clickable.hpp 2009-01-15 18:13:26 EST (Thu, 15 Jan 2009)
@@ -43,7 +43,7 @@
button::enum_type clickable_button()
{ return Button::value; }
protected:
- bool on_event(const event_type &event_info);
+ bool BOOST_EXPORT_SYMBOLS on_event(const event_type &event_info);
bool button_down()
{ return m_button_down; }
Modified: sandbox/guigl/boost/guigl/view/draggable.hpp
==============================================================================
--- sandbox/guigl/boost/guigl/view/draggable.hpp (original)
+++ sandbox/guigl/boost/guigl/view/draggable.hpp 2009-01-15 18:13:26 EST (Thu, 15 Jan 2009)
@@ -50,7 +50,7 @@
{ return Button::value; }
protected:
- bool on_event(const event_type &event_info);
+ bool BOOST_EXPORT_SYMBOLS on_event(const event_type &event_info);
const position_type &drag_origin() const
{ return m_drag_origin; }
void set_drag_origin(const position_type &origin)
Modified: sandbox/guigl/boost/guigl/view/mouse_tracking.hpp
==============================================================================
--- sandbox/guigl/boost/guigl/view/mouse_tracking.hpp (original)
+++ sandbox/guigl/boost/guigl/view/mouse_tracking.hpp 2009-01-15 18:13:26 EST (Thu, 15 Jan 2009)
@@ -51,7 +51,7 @@
{ return m_mouse_state; }
protected:
- bool on_event(const event_type &event_info);
+ bool BOOST_EXPORT_SYMBOLS on_event(const event_type &event_info);
private:
guigl::mouse_state m_mouse_state;
Modified: sandbox/guigl/boost/guigl/widget/button.hpp
==============================================================================
--- sandbox/guigl/boost/guigl/widget/button.hpp (original)
+++ sandbox/guigl/boost/guigl/widget/button.hpp 2009-01-15 18:13:26 EST (Thu, 15 Jan 2009)
@@ -48,8 +48,8 @@
}
boost::signal<void()> on_click;
protected:
- BOOST_EXPORT_SYMBOLS BOOST_GUIGL_WIDGET_DRAW
- BOOST_EXPORT_SYMBOLS bool on_event(const event_type &event_info);
+ BOOST_GUIGL_WIDGET_DRAW
+ bool BOOST_EXPORT_SYMBOLS on_event(const event_type &event_info);
private:
void clickable_button_down(bool state);
Modified: sandbox/guigl/boost/guigl/widget/labeled_slider.hpp
==============================================================================
--- sandbox/guigl/boost/guigl/widget/labeled_slider.hpp (original)
+++ sandbox/guigl/boost/guigl/widget/labeled_slider.hpp 2009-01-15 18:13:26 EST (Thu, 15 Jan 2009)
@@ -32,7 +32,7 @@
protected:
BOOST_EXPORT_SYMBOLS void draw();
- BOOST_EXPORT_SYMBOLS bool on_event(const event_type &event_info);
+ bool BOOST_EXPORT_SYMBOLS on_event(const event_type &event_info);
friend class guigl::access;
};
Modified: sandbox/guigl/boost/guigl/widget/slider.hpp
==============================================================================
--- sandbox/guigl/boost/guigl/widget/slider.hpp (original)
+++ sandbox/guigl/boost/guigl/widget/slider.hpp 2009-01-15 18:13:26 EST (Thu, 15 Jan 2009)
@@ -47,10 +47,10 @@
{ return m_value; }
/// Sets the value of the slider.
- void set_value(double value);
+ void BOOST_EXPORT_SYMBOLS set_value(double value);
protected:
- BOOST_EXPORT_SYMBOLS BOOST_GUIGL_WIDGET_DRAW
- BOOST_EXPORT_SYMBOLS bool on_event(const event_type &event_info);
+ BOOST_GUIGL_WIDGET_DRAW
+ bool BOOST_EXPORT_SYMBOLS on_event(const event_type &event_info);
private:
double m_value;
Modified: sandbox/guigl/boost/guigl/window.hpp
==============================================================================
--- sandbox/guigl/boost/guigl/window.hpp (original)
+++ sandbox/guigl/boost/guigl/window.hpp 2009-01-15 18:13:26 EST (Thu, 15 Jan 2009)
@@ -36,7 +36,7 @@
BOOST_EXPORT_SYMBOLS window(const argument_pack_type &args);
BOOST_EXPORT_SYMBOLS ~window();
- static void redraw(const view::positioned<> &v);
+ static void BOOST_EXPORT_SYMBOLS redraw(const view::positioned<> &v);
class impl;
private:
Modified: sandbox/guigl/libs/guigl/build/Jamfile
==============================================================================
--- sandbox/guigl/libs/guigl/build/Jamfile (original)
+++ sandbox/guigl/libs/guigl/build/Jamfile 2009-01-15 18:13:26 EST (Thu, 15 Jan 2009)
@@ -9,6 +9,9 @@
import feature ;
lib glut : : <name>glut <link>shared ;
+lib glut32 : : <name>glut32 <link>shared ;
+lib opengl32 : : <name>opengl32 <link>shared ;
+lib glu32 : : <name>glu32 <link>shared ;
project boost/guigl
: source-location ../src
@@ -18,6 +21,9 @@
: usage-requirements
<toolset>gcc:<library>glut
<toolset>darwin:<linkflags>"-framework GLUT -framework OpenGL"
+ <toolset>msvc:<library>glut32
+ <toolset>msvc:<library>opengl32
+ <toolset>msvc:<library>glu32
<library>/boost/signals//boost_signals
<define>BOOST_ALL_NO_LIB=1
;
Modified: sandbox/guigl/libs/guigl/build/vc8ide/build.vcproj
==============================================================================
--- sandbox/guigl/libs/guigl/build/vc8ide/build.vcproj (original)
+++ sandbox/guigl/libs/guigl/build/vc8ide/build.vcproj 2009-01-15 18:13:26 EST (Thu, 15 Jan 2009)
@@ -84,6 +84,10 @@
RelativePath="..\..\..\../boost/guigl/window.hpp"
>
</File>
+ <File
+ RelativePath="..\..\..\..\boost\guigl\export_symbols.hpp"
+ >
+ </File>
<Filter
Name="component"
>
@@ -284,6 +288,14 @@
>
</File>
</Filter>
+ <Filter
+ Name="utility"
+ >
+ <File
+ RelativePath="..\..\..\..\boost\guigl\utility\export_symbols.hpp"
+ >
+ </File>
+ </Filter>
</Filter>
<Filter
Name="field_map"
Modified: sandbox/guigl/libs/guigl/example/window_example.cpp
==============================================================================
--- sandbox/guigl/libs/guigl/example/window_example.cpp (original)
+++ sandbox/guigl/libs/guigl/example/window_example.cpp 2009-01-15 18:13:26 EST (Thu, 15 Jan 2009)
@@ -56,10 +56,10 @@
widget::labeled_button *b1 = new widget::labeled_button((
_size=size_type(100,30),
- _position(50, 50),
- _background(1,1,1),
- _active_color(1,0,0),
- _color(0,0,0),
+ _position=position_type(50, 50),
+ _background=color_type(1,1,1),
+ _active_color=color_type(1,0,0),
+ _color=color_type(0,0,0),
_label="Button"));
test_window1 << b1;
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk