SF.net SVN: openvrml:[4226] trunk

[<br...@us...>]

Revision: 4226
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4226&view=rev
Author:   braden
Date:     2011-02-11 05:14:30 +0000 (Fri, 11 Feb 2011)

Log Message:
-----------
Define BOOST_FILESYSTEM_VERSION=2 to build with Boost 1.46.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/Makefile.am

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-02-05 07:29:12 UTC (rev 4225)
+++ trunk/ChangeLog	2011-02-11 05:14:30 UTC (rev 4226)
@@ -1,3 +1,14 @@
+2011-02-11 Braden McDaniel  <br...@en...>
+
+	Define BOOST_FILESYSTEM_VERSION=2 to build with Boost 1.46.
+
+	* src/Makefile.am
+	(libopenvrml_libopenvrml_la_CPPFLAGS): Add
+	-DBOOST_FILESYSTEM_VERSION=2.
+	(local_libopenvrml_dl_la_CPPFLAGS): Add
+	-DBOOST_FILESYSTEM_VERSION=2.
+	(script_java_la_CPPFLAGS): Add -DBOOST_FILESYSTEM_VERSION=2.
+
 2011-02-05 Braden McDaniel  <br...@en...>
 
 	* src/local/libopenvrml-control/openvrml_control/browser.cpp

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2011-02-05 07:29:12 UTC (rev 4225)
+++ trunk/src/Makefile.am	2011-02-11 05:14:30 UTC (rev 4226)
@@ -70,7 +70,8 @@
         -DOPENVRML_PKGDATADIR_=\"$(pkgdatadir)\" \
         -DOPENVRML_PKGLIBDIR_=\"$(pkglibdir)\" \
         -DBOOST_MPL_CFG_NO_PREPROCESSED_HEADERS \
-        -DBOOST_MPL_LIMIT_VECTOR_SIZE=30
+        -DBOOST_MPL_LIMIT_VECTOR_SIZE=30 \
+        -DBOOST_FILESYSTEM_VERSION=2
 libopenvrml_libopenvrml_la_CXXFLAGS = \
         $(FREETYPE_CFLAGS) \
         $(PTHREAD_CFLAGS) \
@@ -132,7 +133,8 @@
         local/libopenvrml-dl/openvrml/local/dl.h
 local_libopenvrml_dl_la_CPPFLAGS = \
         -I$(top_builddir)/src/libopenvrml \
-        -I$(top_srcdir)/src/libopenvrml
+        -I$(top_srcdir)/src/libopenvrml \
+        -DBOOST_FILESYSTEM_VERSION=2
 local_libopenvrml_dl_la_LIBADD = \
         -lboost_filesystem$(BOOST_LIB_SUFFIX) \
         -lboost_system$(BOOST_LIB_SUFFIX) \
@@ -175,7 +177,8 @@
         -DJRE_HOME=\"$(JRE_HOME)\" \
         -DOPENVRML_JVM_ARCH=\"$(OPENVRML_JVM_ARCH)\" \
         -DBOOST_MPL_CFG_NO_PREPROCESSED_HEADERS \
-        -DBOOST_MPL_LIMIT_VECTOR_SIZE=30
+        -DBOOST_MPL_LIMIT_VECTOR_SIZE=30 \
+        -DBOOST_FILESYSTEM_VERSION=2
 script_java_la_LDFLAGS = \
         -module \
         -no-undefined \


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.