Subject: [Boost-commit] svn:boost r51026 - in sandbox/guigl: . 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 19:52:22
Author: srajko
Date: 2009-02-04 19:52:21 EST (Wed, 04 Feb 2009)
New Revision: 51026
URL: http://svn.boost.org/trac/boost/changeset/51026
Log:
merging wmbuild changes
Added:
sandbox/guigl/libs/guigl/window_manager/
- copied from r51025, /sandbox-branches/guigl-wmbuild/libs/guigl/window_manager/
sandbox/guigl/libs/guigl/window_manager/Jamfile
- copied unchanged from r51025, /sandbox-branches/guigl-wmbuild/libs/guigl/window_manager/Jamfile
Text files modified:
sandbox/guigl/Jamroot | 11 +++++------
sandbox/guigl/boost/guigl/platform/glut.hpp | 8 ++------
sandbox/guigl/libs/guigl/build/Jamfile | 21 +++++----------------
sandbox/guigl/libs/guigl/build/vc8ide/build.vcproj | 16 ++++++++++++++++
sandbox/guigl/libs/guigl/build/vc8ide/example.vcproj | 4 ++--
sandbox/guigl/libs/guigl/example/Jamfile | 9 ++++++---
sandbox/guigl/libs/guigl/src/window.cpp | 5 +----
7 files changed, 37 insertions(+), 37 deletions(-)
Modified: sandbox/guigl/Jamroot
==============================================================================
--- sandbox/guigl/Jamroot (original)
+++ sandbox/guigl/Jamroot 2009-02-04 19:52:21 EST (Wed, 04 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/guigl/boost/guigl/platform/glut.hpp
==============================================================================
--- sandbox/guigl/boost/guigl/platform/glut.hpp (original)
+++ sandbox/guigl/boost/guigl/platform/glut.hpp 2009-02-04 19:52:21 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/guigl/libs/guigl/build/Jamfile
==============================================================================
--- sandbox/guigl/libs/guigl/build/Jamfile (original)
+++ sandbox/guigl/libs/guigl/build/Jamfile 2009-02-04 19:52:21 EST (Wed, 04 Feb 2009)
@@ -8,29 +8,18 @@
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 ;
+feature.feature use-window-manager : none : composite propagated ;
+feature.set-default use-window-manager : none ;
-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
+ <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 ;
-
SOURCES =
application
widget/button widget/labeled_button
@@ -39,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/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-02-04 19:52:21 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"
>
@@ -373,6 +381,14 @@
</File>
</Filter>
</Filter>
+ <Filter
+ Name="window_manager"
+ >
+ <File
+ RelativePath="..\..\window_manager\Jamfile"
+ >
+ </File>
+ </Filter>
<File
RelativePath="..\Jamfile"
>
Modified: sandbox/guigl/libs/guigl/build/vc8ide/example.vcproj
==============================================================================
--- sandbox/guigl/libs/guigl/build/vc8ide/example.vcproj (original)
+++ sandbox/guigl/libs/guigl/build/vc8ide/example.vcproj 2009-02-04 19:52:21 EST (Wed, 04 Feb 2009)
@@ -15,7 +15,7 @@
<Configurations>
<Configuration
Name="debug|Win32"
- OutputDirectory="..\..\..\..\bin.v2\stage\window_example"
+ OutputDirectory="..\..\..\..\bin\stage\window_example"
IntermediateDirectory="$(OutDir)"
ConfigurationType="0"
>
@@ -35,7 +35,7 @@
</Configuration>
<Configuration
Name="release|Win32"
- OutputDirectory="..\..\..\..\bin.v2\stage\window_example"
+ OutputDirectory="..\..\..\..\bin\stage\window_example"
IntermediateDirectory="$(OutDir)"
ConfigurationType="0"
>
Modified: sandbox/guigl/libs/guigl/example/Jamfile
==============================================================================
--- sandbox/guigl/libs/guigl/example/Jamfile (original)
+++ sandbox/guigl/libs/guigl/example/Jamfile 2009-02-04 19:52:21 EST (Wed, 04 Feb 2009)
@@ -8,13 +8,16 @@
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 ;
+exe window_example
+ :
+ window_example.cpp two_spheres.cpp two_buttons.cpp
+ ;
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
Modified: sandbox/guigl/libs/guigl/src/window.cpp
==============================================================================
--- sandbox/guigl/libs/guigl/src/window.cpp (original)
+++ sandbox/guigl/libs/guigl/src/window.cpp 2009-02-04 19:52:21 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