Changeset 1348
- Timestamp:
- 12/08/07 17:19:16 (1 year ago)
- Location:
- trunk
- Files:
-
- 5 modified
-
src/openassetlib/plugins/sqlite/config.hpp (modified) (1 diff)
-
src/openassetlib/plugins/sqlite/Makefile.am (modified) (1 diff)
-
src/openobjectlib/sg/Makefile.am (modified) (1 diff)
-
src/openpluginlib/pl/openpluginlib.cpp (modified) (1 diff)
-
unity.sh (modified) (14 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/openassetlib/plugins/sqlite/config.hpp
r1347 r1348 16 16 #else 17 17 # ifdef SQLITE_EXPORTS 18 # define AL_SQLITE3_DECLSPEC extern18 # define AL_SQLITE3_DECLSPEC __attribute__( ( visibility( "default" ) ) ) 19 19 # else 20 # define AL_SQLITE3_DECLSPEC 20 # define AL_SQLITE3_DECLSPEC __attribute__( ( visibility( "default" ) ) ) 21 21 # endif 22 22 #endif -
trunk/src/openassetlib/plugins/sqlite/Makefile.am
r1340 r1348 22 22 $(OLIB_CXXFLAGS) \ 23 23 $(BOOST_INCLUDE_PATH) \ 24 $(XML2_CXXFLAGS) 25 # end24 $(XML2_CXXFLAGS) \ 25 -DSQLITE_EXPORTS 26 26 27 27 libopenassetlib_sqlite3_plugin_la_LIBADD = \ -
trunk/src/openobjectlib/sg/Makefile.am
r1340 r1348 50 50 $(OPENGL_LIBS) \ 51 51 $(OPENGL_GLU_LIBS) \ 52 $(GLEW_LIBS) \ 53 $(top_builddir)/src/openpluginlib/pl/libopenpluginlib_pl.la \ 54 $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la 52 $(GLEW_LIBS) 55 53 56 54 libopenobjectlib_sg_la_LDFLAGS = \ -
trunk/src/openpluginlib/pl/openpluginlib.cpp
r1347 r1348 161 161 el_reg.insert( "/Library/Frameworks/OpenLibraries.framework/Frameworks/OpenImageLib.framework/PlugIns" ); 162 162 el_reg.insert( "/Library/Frameworks/OpenLibraries.framework/Frameworks/OpenMediaLib.framework/PlugIns" ); 163 el_reg.insert( "/Library/Frameworks/OpenLibraries.framework/Frameworks/OpenAssetLib.framework/PlugIns" ); 163 164 el_reg.insert( "/Library/Frameworks/OpenLibraries.framework/Frameworks/OpenEffectsLib.framework/PlugIns" ); 164 165 # endif -
trunk/unity.sh
r1346 r1348 147 147 cp $1/$i current_header.$$ 148 148 149 deplist="openpluginlib/pl openimagelib/il openmedialib/ml openassetlib/al "149 deplist="openpluginlib/pl openimagelib/il openmedialib/ml openassetlib/al openobjectlib/sg" 150 150 for j in $deplist 151 151 do case $j in … … 158 158 openmedialib* ) 159 159 sed -e "s|$j|OpenMediaLib|g" -i '' current_header.$$ > $2.framework/Versions/Current/Headers/$i 160 ;; 161 openobjectlib* ) 162 sed -e "s|$j|OpenObjectLib|g" -i '' current_header.$$ > $2.framework/Versions/Current/Headers/$i 160 163 ;; 161 164 openassetlib* ) … … 308 311 make_framework_interdeps( ) 309 312 { 310 deplist="openpluginlib_pl openimagelib_il openmedialib_ml openassetlib_al "313 deplist="openpluginlib_pl openimagelib_il openmedialib_ml openassetlib_al openobjectlib_sg" 311 314 for i in $deplist 312 315 do plugins=`ls $1.framework/PlugIns/*.* 2> /dev/null` … … 327 330 $install_name_prefix/OpenMediaLib.framework/Versions/$framework_version/OpenMediaLib $j 328 331 ;; 332 openobjectlib_sg ) 333 install_name_tool -change $depname \ 334 $install_name_prefix/OpenObjectLib.framework/Versions/$framework_version/OpenObjectLib $j 335 ;; 329 336 openassetlib_al ) 330 337 install_name_tool -change $depname \ … … 354 361 make_umbrella_framework_deps( ) 355 362 { 356 deplist="openpluginlib_pl openimagelib_il openmedialib_ml openassetlib_al "363 deplist="openpluginlib_pl openimagelib_il openmedialib_ml openassetlib_al openobjectlib_sg" 357 364 for i in $deplist 358 365 do depname=`otool -L $1 | grep $i | cut -d ' ' -f 1` … … 374 381 $1 375 382 ;; 383 openobjectlib_sg ) 384 install_name_tool -change $depname \ 385 "$install_name_prefix"/OpenLibraries.framework/Versions/$framework_version/Frameworks/OpenObjectLib.framework/Versions/$framework_version/OpenObjectLib \ 386 $1 387 ;; 376 388 openassetlib_al ) 377 389 install_name_tool -change $depname \ … … 387 399 { 388 400 install_name_tool -id $install_name_prefix/OpenLibraries.framework/Frameworks/$1.framework/Versions/A/PlugIns/$1.so $2 389 fmwklist="OpenPluginLib OpenImageLib OpenMediaLib OpenAssetLib "401 fmwklist="OpenPluginLib OpenImageLib OpenMediaLib OpenAssetLib OpenObjectLib" 390 402 for i in $fmwklist 391 403 do install_name_tool -change $install_name_prefix/$i.framework/Versions/A/$i \ … … 410 422 done 411 423 412 depnames="$install_name_prefix/OpenPluginLib.framework $install_name_prefix/OpenImageLib.framework $install_name_prefix/OpenMediaLib.framework $install_name_prefix/OpenAssetLib.framework "424 depnames="$install_name_prefix/OpenPluginLib.framework $install_name_prefix/OpenImageLib.framework $install_name_prefix/OpenMediaLib.framework $install_name_prefix/OpenAssetLib.framework $install_name_prefix/OpenObjectLib.framework" 413 425 for i in $libs 414 426 do for j in $depnames 415 427 do deps=`otool -L $i | grep $j | cut -d ' ' -f 1` 416 428 for k in $deps 417 do if [ `basename $k` != "OpenPluginLib" ] && [ `basename $k` != "OpenImageLib" ] && [ `basename $k` != "OpenMediaLib" ] && [ `basename $k` != "OpenAssetLib" ] 429 do if [ `basename $k` != "OpenPluginLib" ] && [ `basename $k` != "OpenImageLib" ] && [ `basename $k` != "OpenMediaLib" ] && [ `basename $k` != "OpenAssetLib" ] && [ `basename $k` != "OpenObjectLib" ] 418 430 then install_name_tool -change $k \ 419 431 $install_name_prefix/OpenLibraries.framework/Versions/A/Frameworks/$1.framework/Versions/A/Libraries/`basename $k` $i … … 449 461 cp -R "./OpenMediaLib.framework" "$framework_dir/Versions/$framework_version/Frameworks" 450 462 cp -R "./OpenAssetLib.framework" "$framework_dir/Versions/$framework_version/Frameworks" 463 cp -R "./OpenObjectLib.framework" "$framework_dir/Versions/$framework_version/Frameworks" 451 464 452 465 make_umbrella_framework_deps "OpenLibraries.framework/OpenLibraries" && … … 454 467 make_umbrella_framework_deps "OpenLibraries.framework/Frameworks/OpenImageLib.framework/PlugIns/OpenImageLib.so" && 455 468 make_umbrella_framework_deps "OpenLibraries.framework/Frameworks/OpenMediaLib.framework/PlugIns/OpenMediaLib.so" && 456 make_umbrella_framework_deps "OpenLibraries.framework/Frameworks/OpenAssetLib.framework/PlugIns/OpenAssetLib.so" 469 make_umbrella_framework_deps "OpenLibraries.framework/Frameworks/OpenAssetLib.framework/PlugIns/OpenAssetLib.so" && 470 make_umbrella_framework_deps "OpenLibraries.framework/Frameworks/OpenObjectLib.framework/PlugIns/OpenObjectLib.so" 457 471 458 472 deplist="GLEW boost" … … 499 513 update_umbrella_framework_install_names "OpenMediaLib" 500 514 update_umbrella_framework_install_names "OpenAssetLib" 515 update_umbrella_framework_install_names "OpenObjectLib" 501 516 502 517 make_umbrella_framework_python_deps "OpenPluginLib" "OpenLibraries.framework/Frameworks/OpenPluginLib.framework/PlugIns/OpenPluginLib.so" … … 554 569 strip -x OpenLibraries.framework/Frameworks/OpenAssetLib.framework/Libraries/*.dylib && 555 570 strip -x OpenLibraries.framework/Frameworks/OpenAssetLib.framework/PlugIns/*.so && 556 strip -x OpenLibraries.framework/Frameworks/OpenAssetLib.framework/PlugIns/*.dylib 571 strip -x OpenLibraries.framework/Frameworks/OpenAssetLib.framework/PlugIns/*.dylib && 572 strip -x OpenLibraries.framework/Frameworks/OpenObjectLib.framework/OpenObjectLib && 573 strip -x OpenLibraries.framework/Frameworks/OpenObjectLib.framework/Libraries/*.dylib && 574 strip -x OpenLibraries.framework/Frameworks/OpenObjectLib.framework/PlugIns/*.so && 575 strip -x OpenLibraries.framework/Frameworks/OpenObjectLib.framework/PlugIns/*.dylib 576 557 577 check_status $? 558 578 fi … … 580 600 echo " OpenMediaLib..." && 581 601 make_framework "OpenMediaLib" "./src/openmedialib/ml" && 582 echo -n " OpenAssetLib..." && 583 make_framework "OpenAssetLib" "./src/openassetlib/al" 602 echo " OpenAssetLib..." && 603 make_framework "OpenAssetLib" "./src/openassetlib/al" && 604 echo -n " OpenObjectLib..." && 605 make_framework "OpenObjectLib" "./src/openobjectlib/sg" 584 606 check_status $? 585 607 … … 592 614 make_framework_libraries_unique "OpenImageLib" && 593 615 make_framework_libraries_unique "OpenMediaLib" && 594 make_framework_libraries_unique "OpenAssetLib" 616 make_framework_libraries_unique "OpenAssetLib" && 617 make_framework_libraries_unique "OpenObjectLib" 595 618 check_status $? 596 619
