Subject: [Boost-commit] svn:boost r50981 - sandbox-branches/guigl-wmbuild sandbox-branches/guigl-wmbuild/libs/guigl/build sandbox-branches/guigl-wmbuild/libs/guigl/example sandbox-branches/guigl-wmbuild/libs/guigl/window_manager sandbox/guigl/libs/guigl/build/xcodeide/guigl.xcodeproj
From: stipe_at_[hidden]
Date: 2009-02-02 18:46:54
Author: srajko
Date: 2009-02-02 18:46:53 EST (Mon, 02 Feb 2009)
New Revision: 50981
URL: http://svn.boost.org/trac/boost/changeset/50981
Log:
added use-window-manager feature
Added:
sandbox-branches/guigl-wmbuild/libs/guigl/window_manager/
sandbox-branches/guigl-wmbuild/libs/guigl/window_manager/Jamfile (contents, props changed)
Text files modified:
sandbox-branches/guigl-wmbuild/Jamroot | 11 +++++------
sandbox-branches/guigl-wmbuild/libs/guigl/build/Jamfile | 15 +++------------
sandbox-branches/guigl-wmbuild/libs/guigl/example/Jamfile | 10 ++++++++--
3 files changed, 16 insertions(+), 20 deletions(-)
Modified: sandbox-branches/guigl-wmbuild/Jamroot
==============================================================================
--- sandbox-branches/guigl-wmbuild/Jamroot (original)
+++ sandbox-branches/guigl-wmbuild/Jamroot 2009-02-02 18:46:53 EST (Mon, 02 Feb 2009)
@@ -18,15 +18,14 @@
path-constant TOP : . ;
# we are using Boost
-use-project boost
- : $(BOOST_ROOT)
- ;
+use-project boost : $(BOOST_ROOT) ;
-use-project guigl : libs/guigl/build ;
+use-project /boost/guigl : libs/guigl/build ;
+use-project /boost/guigl/window_manager : libs/guigl/window_manager ;
-# the Dataflow project and anything using it needs Dataflow and Boost headers
+# this project and anything using it needs these and Boost headers
project guigl
- : build-dir bin.v2
+ : build-dir bin
: usage-requirements
<include>.
<include>$(BOOST_ROOT)
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-02 18:46:53 EST (Mon, 02 Feb 2009)
@@ -8,22 +8,11 @@
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
+project boost/guigl
: source-location ../src
: requirements
- <toolset>darwin:<linkflags>"-framework GLUT -framework OpenGL"
<define>BOOST_ALL_NO_LIB=1
: 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
;
@@ -31,6 +20,8 @@
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
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-02 18:46:53 EST (Mon, 02 Feb 2009)
@@ -11,10 +11,16 @@
<library>$(TOP)/libs/guigl/build//boost_guigl
;
-exe window_example : window_example.cpp two_spheres.cpp two_buttons.cpp ;
+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
: <install-dependencies>on <install-type>EXE
- <install-type>LIB <location>$(TOP)/bin.v2/stage/window_example
+ <install-type>LIB <location>$(TOP)/bin/stage/window_example
;
\ No newline at end of file
Added: sandbox-branches/guigl-wmbuild/libs/guigl/window_manager/Jamfile
==============================================================================
--- (empty file)
+++ sandbox-branches/guigl-wmbuild/libs/guigl/window_manager/Jamfile 2009-02-02 18:46:53 EST (Mon, 02 Feb 2009)
@@ -0,0 +1,39 @@
+#==================================---------------------------------------------
+# Copyright 2008 Stjepan Rajko
+#
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+#----------------------------------------------===============================*/
+
+import feature ;
+
+lib glut : : <name>glut <link>shared ;
+lib freeglut : : <name>freeglut <link>shared ;
+lib nrglut32 : : <name>glut32 <link>shared ;
+lib opengl32 : : <name>opengl32 <link>shared ;
+lib glu32 : : <name>glu32 <link>shared ;
+
+alias platform_glut : : : :
+ <toolset>gcc:<library>glut
+ <toolset>darwin:<linkflags>"-framework GLUT -framework OpenGL"
+ <toolset>msvc:<library>freeglut
+ <toolset>msvc:<library>opengl32
+ <toolset>msvc:<library>glu32
+ ;
+
+alias glut32 : : : :
+ <library>nrglut32
+ <library>opengl32
+ <library>glu32
+ ;
+
+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
+ : <library>/boost/guigl/window_manager//glut32/<use-window-manager>none ;
+