Changeset 748

Timestamp:

10/08/08 02:30:38 (3 months ago)

Author:

artem

Message:

+ fixed building with boost-1_36
+ corrected order of BOOST_TOOLKIT
(create symlinks on OSX + boost-1_35)

Location:

trunk

Files:

• SConstruct (modified) (1 diff)
• bindings/python/SConscript (modified) (2 diffs)
• plugins/input/shape/SConscript (modified) (1 diff)
• src/datasource_cache.cpp (modified) (1 diff)

trunk/SConstruct

@@ -190 +190 @@
 for count, libinfo in enumerate(BOOST_LIBSHEADERS):
     if  env['THREADING'] == 'multi' :
-        if not conf.CheckLibWithHeader('boost_%s%s%s' % (libinfo[0],thread_suffix,env['BOOST_APPEND']), libinfo[1], 'C++') and libinfo[2] :
+        if not conf.CheckLibWithHeader('boost_%s%s%s' % (libinfo[0],env['BOOST_APPEND'],thread_suffix), libinfo[1], 'C++') and libinfo[2] :
             color_print(1,'Could not find header or shared library for boost %s, exiting!' % libinfo[0])
             Exit(1)

trunk/bindings/python/SConscript

@@ -41 +41 @@
 libraries = ['mapnik','png','jpeg']
 if env['THREADING'] == 'multi':
-    libraries.append('boost_python%s%s' % (thread_suffix,env['BOOST_APPEND']))
+    libraries.append('boost_python%s%s' % (env['BOOST_APPEND'],thread_suffix))
 else :
     libraries.append('boost_python%s' % env['BOOST_APPEND'])
@@ -49 +49 @@
     libraries.append('icudata')
     if env['THREADING'] == 'multi':
-        libraries.append('boost_regex%s%s' % (thread_suffix,env['BOOST_APPEND']))
+        libraries.append('boost_regex%s%s' % (env['BOOST_APPEND'],thread_suffix))
     else :
         libraries.append('boost_regex%s' % env['BOOST_APPEND'])
     if env['THREADING'] == 'multi':
-        libraries.append('boost_thread%s%s' % (thread_suffix,env['BOOST_APPEND']))
+        libraries.append('boost_thread%s%s' % (env['BOOST_APPEND'],thread_suffix))
     if '-DHAVE_PYCAIRO' in env['CXXFLAGS']:
         libraries.append([lib for lib in env['LIBS'] if lib.startswith('cairo')])

trunk/plugins/input/shape/SConscript

@@ -41 +41 @@
     
 if env['THREADING'] == 'multi':
-    libraries = ['boost_iostreams%s%s' % (thread_suffix,env['BOOST_APPEND']) ]
+    libraries = ['boost_iostreams%s%s' % (env['BOOST_APPEND'],thread_suffix) ]
 else:
     libraries = ['boost_iostreams%s' % (env['BOOST_APPEND']) ]

trunk/src/datasource_cache.cpp

@@ -126 +126 @@
          for (filesystem::directory_iterator itr(path);itr!=end_itr;++itr )
          {
-            if (!is_directory( *itr )  && is_input_plugin(itr->leaf()))
+           if (!is_directory( *itr )  && is_input_plugin(itr->path().leaf()))
             {
                try