|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r51012 - in sandbox-branches/guigl-wmbuild: boost/guigl/platform libs/guigl/build libs/guigl/build/vc8ide libs/guigl/example libs/guigl/src libs/guigl/window_manager
From: stipe_at_[hidden]
Date: 2009-02-04 12:20:32
Author: srajko
Date: 2009-02-04 12:20:31 EST (Wed, 04 Feb 2009)
New Revision: 51012
URL: http://svn.boost.org/trac/boost/changeset/51012
Log:
removed guigl_binding feature, the default use-window-manager is now none, example specifies use-window-manager feature for guigl only
Text files modified:
sandbox-branches/guigl-wmbuild/boost/guigl/platform/glut.hpp | 8 ++------
sandbox-branches/guigl-wmbuild/libs/guigl/build/Jamfile | 12 +++++-------
sandbox-branches/guigl-wmbuild/libs/guigl/build/vc8ide/build.vcproj | 8 ++++++++
sandbox-branches/guigl-wmbuild/libs/guigl/example/Jamfile | 5 +----
sandbox-branches/guigl-wmbuild/libs/guigl/src/window.cpp | 5 +----
sandbox-branches/guigl-wmbuild/libs/guigl/window_manager/Jamfile | 2 +-
6 files changed, 18 insertions(+), 22 deletions(-)
Modified: sandbox-branches/guigl-wmbuild/boost/guigl/platform/glut.hpp
==============================================================================
--- sandbox-branches/guigl-wmbuild/boost/guigl/platform/glut.hpp (original)
+++ sandbox-branches/guigl-wmbuild/boost/guigl/platform/glut.hpp 2009-02-04 12:20:31 EST (Wed, 04 Feb 2009)
@@ -6,13 +6,9 @@
http://www.boost.org/LICENSE_1_0.txt)
-----------------------------------------------===============================*/
-#if defined(BOOST_GUIGL_USE_FLTK_GLUT)
+#if defined(BOOST_GUIGL_GLUT_H)
-#include <Fl/glut.H>
-
-#elif defined(__APPLE__)
-
-#include <GLUT/glut.h>
+#include BOOST_GUIGL_GLUT_H
#else
Modified: sandbox-branches/guigl-wmbuild/libs/guigl/build/Jamfile
==============================================================================
--- sandbox-branches/guigl-wmbuild/libs/guigl/build/Jamfile (original)
+++ sandbox-branches/guigl-wmbuild/libs/guigl/build/Jamfile 2009-02-04 12:20:31 EST (Wed, 04 Feb 2009)
@@ -8,20 +8,18 @@
import feature ;
+feature.feature use-window-manager : none : composite propagated ;
+feature.set-default use-window-manager : none ;
+
project boost/guigl
: source-location ../src
: requirements
<define>BOOST_ALL_NO_LIB=1
: usage-requirements
- <library>/boost/signals//boost_signals
+ <library>/boost/signals//boost_signals/<use-window-manager>none
<define>BOOST_ALL_NO_LIB=1
;
-feature.feature guigl_binding : glut fltk : propagated ;
-feature.set-default guigl_binding : glut ;
-
-feature.feature use-window-manager : none : composite propagated ;
-
SOURCES =
application
widget/button widget/labeled_button
@@ -30,7 +28,7 @@
lib boost_guigl
: $(SOURCES).cpp
- [ obj binding_window_obj : window.cpp/<guigl_binding>fltk:<define>BOOST_GUIGL_USE_FLTK_GLUT ]
+ [ obj binding_window_obj : window.cpp ]
[ obj widget_window_obj : widget/window.cpp ]
;
Modified: sandbox-branches/guigl-wmbuild/libs/guigl/build/vc8ide/build.vcproj
==============================================================================
--- sandbox-branches/guigl-wmbuild/libs/guigl/build/vc8ide/build.vcproj (original)
+++ sandbox-branches/guigl-wmbuild/libs/guigl/build/vc8ide/build.vcproj 2009-02-04 12:20:31 EST (Wed, 04 Feb 2009)
@@ -340,6 +340,14 @@
<Filter
Name="src"
>
+ <File
+ RelativePath="..\..\src\application.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\window.cpp"
+ >
+ </File>
<Filter
Name="widget"
>
Modified: sandbox-branches/guigl-wmbuild/libs/guigl/example/Jamfile
==============================================================================
--- sandbox-branches/guigl-wmbuild/libs/guigl/example/Jamfile (original)
+++ sandbox-branches/guigl-wmbuild/libs/guigl/example/Jamfile 2009-02-04 12:20:31 EST (Wed, 04 Feb 2009)
@@ -8,15 +8,12 @@
project boost/guigl/example
: requirements
- <library>$(TOP)/libs/guigl/build//boost_guigl
+ <library>$(TOP)/libs/guigl/build//boost_guigl/<use-window-manager>platform_glut
;
exe window_example
:
window_example.cpp two_spheres.cpp two_buttons.cpp
- :
- # default choice - can be omitted
- <use-window-manager>platform_glut
;
install window_example_stage : window_example
Modified: sandbox-branches/guigl-wmbuild/libs/guigl/src/window.cpp
==============================================================================
--- sandbox-branches/guigl-wmbuild/libs/guigl/src/window.cpp (original)
+++ sandbox-branches/guigl-wmbuild/libs/guigl/src/window.cpp 2009-02-04 12:20:31 EST (Wed, 04 Feb 2009)
@@ -31,11 +31,8 @@
{
glutInitWindowSize((int)size.x, (int)size.y);
glutInitDisplayMode(GLUT_RGBA | GLUT_DOUBLE | GLUT_ALPHA | (depth?GLUT_DEPTH:0));
-#if defined(BOOST_GUIGL_USE_FLTK_GLUT)
+ // FLTK GLUT requires a char * label
int id = glutCreateWindow(const_cast<char *>(label.c_str()));
-#else
- int id = glutCreateWindow(label.c_str());
-#endif
if(depth)
glEnable(GL_DEPTH_TEST);
else
Modified: sandbox-branches/guigl-wmbuild/libs/guigl/window_manager/Jamfile
==============================================================================
--- sandbox-branches/guigl-wmbuild/libs/guigl/window_manager/Jamfile (original)
+++ sandbox-branches/guigl-wmbuild/libs/guigl/window_manager/Jamfile 2009-02-04 12:20:31 EST (Wed, 04 Feb 2009)
@@ -17,6 +17,7 @@
alias platform_glut : : : :
<toolset>gcc:<library>glut
<toolset>darwin:<linkflags>"-framework GLUT -framework OpenGL"
+ <toolset>darwin:<define>BOOST_GUIGL_GLUT_H=\\\"GLUT/glut.h\\\"
<toolset>msvc:<library>freeglut
<toolset>msvc:<library>opengl32
<toolset>msvc:<library>glu32
@@ -31,7 +32,6 @@
feature.extend use-window-manager : platform_glut ;
feature.compose <use-window-manager>platform_glut
: <library>/boost/guigl/window_manager//platform_glut/<use-window-manager>none ;
-feature.set-default use-window-manager : platform_glut ;
feature.extend use-window-manager : glut32 ;
feature.compose <use-window-manager>glut32
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