[Hdrflow-svn] SF.net SVN: hdrflow: [183] trunk

[<gl...@us...>]

Revision: 183
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=183&view=rev
Author:   glslang
Date:     2007-07-12 15:11:47 -0700 (Thu, 12 Jul 2007)

Log Message:
-----------
+olibs integration

Modified Paths:
--------------
    trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj
    trunk/app/HDRFlow/ScriptEngine.cpp
    trunk/app/HDRFlow/ScriptEngine.hpp
    trunk/lib/openlibraries/src/umbrella_framework/Makefile.am
    trunk/lib/openlibraries/src/umbrella_framework/openlibraries.hpp
    trunk/unity.sh

Modified: trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj
===================================================================
--- trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj	2007-07-11 20:39:38 UTC (rev 182)
+++ trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj	2007-07-12 22:11:47 UTC (rev 183)
@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		67032E9E0C46DB9C00FA55E2 /* HDRFlow.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 67032E9D0C46DB9C00FA55E2 /* HDRFlow.framework */; };
 		671E22A30C4166E400CA1860 /* ScriptEditorController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 671E22A20C4166E400CA1860 /* ScriptEditorController.mm */; };
 		674E44640C3F854A0036A908 /* ScriptEditor.nib in Resources */ = {isa = PBXBuildFile; fileRef = 674E44620C3F854A0036A908 /* ScriptEditor.nib */; };
 		678A4AA70C2B18B50011E9F7 /* CustomOpenGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = 678A4AA60C2B18B50011E9F7 /* CustomOpenGLView.m */; };
@@ -30,6 +31,7 @@
 		29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
 		29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
 		32CA4F630368D1EE00C91783 /* HDRFlow_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HDRFlow_Prefix.pch; sourceTree = "<group>"; };
+		67032E9D0C46DB9C00FA55E2 /* HDRFlow.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HDRFlow.framework; path = /Library/Frameworks/HDRFlow.framework; sourceTree = "<absolute>"; };
 		671E22910C41652E00CA1860 /* ScriptEditorController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ScriptEditorController.h; sourceTree = "<group>"; };
 		671E22A20C4166E400CA1860 /* ScriptEditorController.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = ScriptEditorController.mm; sourceTree = "<group>"; };
 		674E44630C3F854A0036A908 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/ScriptEditor.nib; sourceTree = "<group>"; };
@@ -55,6 +57,7 @@
 				8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
 				67DC62180C2EC0D9005CFE6E /* OpenGL.framework in Frameworks */,
 				67A8A6EA0C41836600DB3F1B /* Python.framework in Frameworks */,
+				67032E9E0C46DB9C00FA55E2 /* HDRFlow.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -79,6 +82,7 @@
 		1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				67032E9D0C46DB9C00FA55E2 /* HDRFlow.framework */,
 				67A8A6E90C41836600DB3F1B /* Python.framework */,
 				67DC62170C2EC0D9005CFE6E /* OpenGL.framework */,
 				1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
@@ -277,6 +281,10 @@
 			buildSettings = {
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					/usr/include/python2.3,
+				);
 				PREBINDING = NO;
 				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 			};
@@ -287,6 +295,10 @@
 			buildSettings = {
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					/usr/include/python2.3,
+				);
 				PREBINDING = NO;
 				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 			};

Modified: trunk/app/HDRFlow/ScriptEngine.cpp
===================================================================
--- trunk/app/HDRFlow/ScriptEngine.cpp	2007-07-11 20:39:38 UTC (rev 182)
+++ trunk/app/HDRFlow/ScriptEngine.cpp	2007-07-12 22:11:47 UTC (rev 183)
@@ -7,11 +7,15 @@
 
 #include "ScriptEngine.hpp"
 
+namespace py = boost::python;
+
 namespace hdrflow {
 
 ScriptEngine::ScriptEngine( )
 {
 	Py_Initialize( );
+
+	main_module_ = py::object( py::handle<>( py::borrowed( PyImport_AddModule( "__main__" ) ) ) );
 }
 
 ScriptEngine::~ScriptEngine( )

Modified: trunk/app/HDRFlow/ScriptEngine.hpp
===================================================================
--- trunk/app/HDRFlow/ScriptEngine.hpp	2007-07-11 20:39:38 UTC (rev 182)
+++ trunk/app/HDRFlow/ScriptEngine.hpp	2007-07-12 22:11:47 UTC (rev 183)
@@ -8,7 +8,7 @@
 #ifndef SCRIPT_ENGINE_INC_
 #define SCRIPT_ENGINE_INC_
 
-#include <Python/python.h>
+#include <HDRFlow/openlibraries.hpp>
 
 namespace hdrflow {
 
@@ -21,6 +21,7 @@
 	bool eval( );
 
 private:
+	boost::python::object main_module_;
 }; 
 
 } 

Modified: trunk/lib/openlibraries/src/umbrella_framework/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/umbrella_framework/Makefile.am	2007-07-11 20:39:38 UTC (rev 182)
+++ trunk/lib/openlibraries/src/umbrella_framework/Makefile.am	2007-07-12 22:11:47 UTC (rev 183)
@@ -11,14 +11,18 @@
 	openlibraries.cpp		\
 	openlibraries.hpp
 
-libumbrella_framework_la_CXXFLAGS = 	\
-	$(OLIB_CXXFLAGS)		\
-	$(BOOST_INCLUDE_PATH)
+libumbrella_framework_la_CXXFLAGS = \
+	$(OLIB_CXXFLAGS)				\
+	$(BOOST_INCLUDE_PATH)			\
+	$(GLEW_INCLUDE_PATH)			\
+	$(PYTHON_INCLUDE_PATH)
 
 libumbrella_framework_la_LIBADD =	\
 	$(top_builddir)/src/openpluginlib/pl/libopenpluginlib_pl.la	\
-	$(top_builddir)/src/openimagelib/il/libopenimagelib_il.la		\
-	$(top_builddir)/src/openmedialib/ml/libopenmedialib_ml.la
+	$(top_builddir)/src/openimagelib/il/libopenimagelib_il.la	\
+	$(top_builddir)/src/openmedialib/ml/libopenmedialib_ml.la	\
+	$(BOOST_PYTHON_LIBS)										\
+	$(GLEW_LIBS)
 
 libumbrella_framework_la_LDFLAGS = 	\
 	$(OLIB_LDFLAGS)			\

Modified: trunk/lib/openlibraries/src/umbrella_framework/openlibraries.hpp
===================================================================
--- trunk/lib/openlibraries/src/umbrella_framework/openlibraries.hpp	2007-07-11 20:39:38 UTC (rev 182)
+++ trunk/lib/openlibraries/src/umbrella_framework/openlibraries.hpp	2007-07-12 22:11:47 UTC (rev 183)
@@ -8,6 +8,8 @@
 #ifndef OPENLIBRARIES_INC_
 #define OPENLIBRARIES_INC_
 
+#include <boost/python.hpp>
+
 #include <openpluginlib/pl/openpluginlib.hpp>
 
 #endif

Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh	2007-07-11 20:39:38 UTC (rev 182)
+++ trunk/unity.sh	2007-07-12 22:11:47 UTC (rev 183)
@@ -323,7 +323,7 @@
 	done
 	
 	# Copy Boost headers
-	cp -R /usr/local/include/boost-1_35/boost HDRFlow.framework/Versions/$framework_version/Frameworks/HDRFlowPlugin.framework/Headers
+	cp -R /usr/local/include/boost-$boost_new_version/boost HDRFlow.framework/Versions/$framework_version/Frameworks/HDRFlowPlugin.framework/Headers
 	header_prefix="HDRFlow.framework/Versions/$framework_version/Frameworks/HDRFlowPlugin.framework/Headers/boost"
     find $header_prefix -name '*.hpp' | xargs sed -e "s|boost/|HDRFlowPlugin/boost/|g" -i ''	
 }


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