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

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

Revision: 347
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=347&view=rev
Author:   glslang
Date:     2007-10-06 09:11:16 -0700 (Sat, 06 Oct 2007)

Log Message:
-----------
+build fixes

Modified Paths:
--------------
    trunk/HDRFlowMaya.pmproj
    trunk/unity.sh

Modified: trunk/HDRFlowMaya.pmproj
===================================================================
(Binary files differ)

Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh	2007-10-06 13:25:04 UTC (rev 346)
+++ trunk/unity.sh	2007-10-06 16:11:16 UTC (rev 347)
@@ -4,6 +4,7 @@
 # Unification of build and distribution:
 #	recurses into lib and app directories, building each in turn.
 #	updates Boost version in VC project files.
+#   updates version.
 #	builds OS/X frameworks
 
 check_status( )
@@ -164,7 +165,7 @@
 				esac
 			done
 
-			sed -e "s|$header_path|$2|g" -e "s|GL/glew.h|HDRFlowPlugin/glew.h|g" -e "s|boost/|HDRFlowPlugin/boost/|" current_header.$$ > $2.framework/Versions/Current/Headers/$i
+			#sed -e "s|$header_path|$2|g" -e "s|GL/glew.h|HDRFlowPlugin/glew.h|g" -e "s|boost/|HDRFlowPlugin/boost/|" current_header.$$ > $2.framework/Versions/Current/Headers/$i
 		
 			rm current_header.$$
 		fi
@@ -448,7 +449,16 @@
 				done
 			done
 		 done
-	fi	
+	fi
+	
+	libs=`ls HDRFlow.framework/Versions/A/Frameworks/$1.framework/Versions/A/Libraries/*.dylib`
+	for i in $libs
+	do	deps=`otool -L $i | grep $install_name_prefix/$1.framework | cut -d ' ' -f 1`
+		for k in $deps
+		do	install_name_tool -change $k \
+					$install_name_prefix/HDRFlow.framework/Versions/A/Frameworks/$1.framework/Versions/A/Libraries/`basename $k` $i
+		done
+	done
 }
 
 make_umbrella_framework( )
@@ -533,10 +543,10 @@
 	done
 	
 	# Copy Boost and GLEW headers
-	cp -R /usr/local/include/boost-$boost_new_version/boost HDRFlow.framework/Versions/$framework_version/Frameworks/HDRFlowPlugin.framework/Headers
-	cp -R /usr/local/include/GL/glew.h 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 ''
+	#cp -R /usr/local/include/boost-$boost_new_version/boost HDRFlow.framework/Versions/$framework_version/Frameworks/HDRFlowPlugin.framework/Headers
+	#cp -R /usr/local/include/GL/glew.h 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 ''
 	check_status $?
 }
 


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