Thread: [Jahshaka-cvs] SF.net SVN: openlibraries: [1316] trunk
Status: Beta
Brought to you by:
jahshaka
From: <gl...@us...> - 2007-10-28 11:24:56
|
Revision: 1316 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1316&view=rev Author: glslang Date: 2007-10-28 04:24:51 -0700 (Sun, 28 Oct 2007) Log Message: ----------- + initial hdrflow and olibs merge Modified Paths: -------------- trunk/COPYING trunk/Makefile.am trunk/configure.ac trunk/effects/Makefile.am trunk/effects/shaders/channel_selector.cg trunk/effects/shaders/channel_selector.frag trunk/effects/shaders/fixed_function.vert trunk/effects/shaders/histogram.cg trunk/effects/shaders/histogram.frag trunk/effects/shaders/passthrough.cg trunk/effects/shaders/passthrough.vert trunk/effects/shaders/rgb_to_yuv444.frag trunk/effects/shaders/sepia.cg trunk/effects/shaders/sepia.frag trunk/effects/shaders/yuv444_to_rgb.cg trunk/effects/shaders/yuv444_to_rgb.frag trunk/effects/shaders/yuv444_to_rgb_deinterlace.cg trunk/effects/shaders/yuv444_to_rgb_deinterlace.frag trunk/installer/add_to_path.nsh trunk/installer/write_env_str.nsh trunk/m4/bzip2.m4 trunk/m4/fast_math.m4 trunk/m4/gpl.m4 trunk/m4/openal.m4 trunk/m4/pkg.m4 trunk/m4/qt.m4 trunk/m4/quicktime.m4 trunk/m4/universal_binary.m4 trunk/m4/zlib.m4 trunk/media/Makefile.am trunk/media/models/complex_glass.x3d trunk/media/models/disco_lighting.x3d trunk/media/models/glittering.x3d trunk/media/models/plastic.x3d trunk/media/models/ptm.x3d trunk/media/models/reflections_refractions.x3d trunk/media/models/shl_per_pixel.x3d trunk/media/shaders/complex_glass_0.frag trunk/media/shaders/complex_glass_0.vert trunk/media/shaders/complex_glass_1.frag trunk/media/shaders/complex_glass_1.vert trunk/media/shaders/disco_lighting_0.frag trunk/media/shaders/disco_lighting_0.vert trunk/media/shaders/disco_lighting_1.frag trunk/media/shaders/disco_lighting_1.vert trunk/media/shaders/disco_lighting_2.frag trunk/media/shaders/disco_lighting_2.vert trunk/media/shaders/glittering_0.frag trunk/media/shaders/glittering_0.vert trunk/media/shaders/plastic_0.frag trunk/media/shaders/plastic_0.vert trunk/media/shaders/ptm_0.frag trunk/media/shaders/ptm_0.vert trunk/media/shaders/reflections_refractions_0.frag trunk/media/shaders/reflections_refractions_0.vert trunk/media/shaders/reflections_refractions_1.frag trunk/media/shaders/reflections_refractions_1.vert trunk/media/shaders/shl_per_pixel_0.frag trunk/media/shaders/shl_per_pixel_0.vert trunk/openlibraries.pc.in trunk/src/Makefile.am trunk/src/openassetlib/Makefile.am trunk/src/openassetlib/al/Makefile.am trunk/src/openassetlib/al/al.cpp trunk/src/openassetlib/al/al.hpp trunk/src/openassetlib/al/al_plugin.cpp trunk/src/openassetlib/al/al_vc8.vcproj trunk/src/openassetlib/al/asset.cpp trunk/src/openassetlib/al/base64_codec.cpp trunk/src/openassetlib/al/config.hpp trunk/src/openassetlib/al/guid.cpp trunk/src/openassetlib/al/set.cpp trunk/src/openassetlib/plugins/Makefile.am trunk/src/openassetlib/py/Makefile.am trunk/src/openassetlib/py/asset.cpp trunk/src/openassetlib/py/guid.cpp trunk/src/openassetlib/py/openassetlib.cpp trunk/src/openassetlib/py/plugin.cpp trunk/src/openassetlib/py/py.cpp trunk/src/openassetlib/py/py.hpp trunk/src/openassetlib/py/py_vc8.vcproj trunk/src/openassetlib/py/python.hpp trunk/src/openassetlib/py/set.cpp trunk/src/openeffectslib/Makefile.am trunk/src/openeffectslib/plugins/Makefile.am trunk/src/openeffectslib/plugins/tonemap/Makefile.am trunk/src/openeffectslib/plugins/tonemap/tonemap_plugin.cpp trunk/src/openeffectslib/plugins/tonemap/tonemap_plugin.opl trunk/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj trunk/src/openimagelib/Makefile.am trunk/src/openimagelib/il/Makefile.am trunk/src/openimagelib/il/basic_image.hpp trunk/src/openimagelib/il/compression_traits.hpp trunk/src/openimagelib/il/config.hpp trunk/src/openimagelib/il/float_traits.hpp trunk/src/openimagelib/il/il.cpp trunk/src/openimagelib/il/il.hpp trunk/src/openimagelib/il/il_vc8.vcproj trunk/src/openimagelib/il/openimagelib_plugin.hpp trunk/src/openimagelib/il/rgb_traits.hpp trunk/src/openimagelib/il/traits.hpp trunk/src/openimagelib/il/utility.cpp trunk/src/openimagelib/il/utility.hpp trunk/src/openimagelib/il/yuv_traits.hpp trunk/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.cpp trunk/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.opl trunk/src/openimagelib/plugins/3D_lightmap/3D_lightmap_vc8.vcproj trunk/src/openimagelib/plugins/3D_lightmap/Makefile.am trunk/src/openimagelib/plugins/Makefile.am trunk/src/openimagelib/plugins/bmp/Makefile.am trunk/src/openimagelib/plugins/bmp/bmp_plugin.cpp trunk/src/openimagelib/plugins/bmp/bmp_plugin.opl trunk/src/openimagelib/plugins/bmp/bmp_vc8.vcproj trunk/src/openimagelib/plugins/dds/Makefile.am trunk/src/openimagelib/plugins/dds/dds_plugin.cpp trunk/src/openimagelib/plugins/dds/dds_plugin.opl trunk/src/openimagelib/plugins/dds/dds_vc8.vcproj trunk/src/openimagelib/plugins/dpx/Makefile.am trunk/src/openimagelib/plugins/dpx/dpx_plugin.cpp trunk/src/openimagelib/plugins/dpx/dpx_plugin.opl trunk/src/openimagelib/plugins/dpx/dpx_vc8.vcproj trunk/src/openimagelib/plugins/exr/Makefile.am trunk/src/openimagelib/plugins/exr/exr_plugin.cpp trunk/src/openimagelib/plugins/exr/exr_plugin.opl trunk/src/openimagelib/plugins/exr/exr_vc8.vcproj trunk/src/openimagelib/plugins/gdi+/gdi+_plugin.cpp trunk/src/openimagelib/plugins/gdi+/gdi+_vc8.vcproj trunk/src/openimagelib/plugins/gdi+/gdi_plugin.opl trunk/src/openimagelib/plugins/hdr/Makefile.am trunk/src/openimagelib/plugins/hdr/hdr_plugin.cpp trunk/src/openimagelib/plugins/hdr/hdr_plugin.opl trunk/src/openimagelib/plugins/hdr/hdr_vc8.vcproj trunk/src/openimagelib/plugins/jpg/Makefile.am trunk/src/openimagelib/plugins/jpg/jpg_plugin.cpp trunk/src/openimagelib/plugins/jpg/jpg_plugin.opl trunk/src/openimagelib/plugins/jpg/jpg_vc8.vcproj trunk/src/openimagelib/plugins/png/Makefile.am trunk/src/openimagelib/plugins/png/png_plugin.cpp trunk/src/openimagelib/plugins/png/png_plugin.opl trunk/src/openimagelib/plugins/png/png_vc8.vcproj trunk/src/openimagelib/plugins/psd/Makefile.am trunk/src/openimagelib/plugins/psd/psd_plugin.cpp trunk/src/openimagelib/plugins/psd/psd_plugin.opl trunk/src/openimagelib/plugins/psd/psd_vc8.vcproj trunk/src/openimagelib/plugins/quicktime/Makefile.am trunk/src/openimagelib/plugins/quicktime/quicktime_plugin.cpp trunk/src/openimagelib/plugins/quicktime/quicktime_plugin.opl trunk/src/openimagelib/plugins/quicktime/quicktime_vc8.vcproj trunk/src/openimagelib/plugins/sgi/Makefile.am trunk/src/openimagelib/plugins/sgi/sgi_plugin.cpp trunk/src/openimagelib/plugins/sgi/sgi_plugin.opl trunk/src/openimagelib/plugins/sgi/sgi_vc8.vcproj trunk/src/openimagelib/plugins/tga/Makefile.am trunk/src/openimagelib/plugins/tga/tga_plugin.cpp trunk/src/openimagelib/plugins/tga/tga_plugin.opl trunk/src/openimagelib/plugins/tga/tga_vc8.vcproj trunk/src/openimagelib/plugins/tiff/Makefile.am trunk/src/openimagelib/plugins/tiff/tiff_plugin.cpp trunk/src/openimagelib/plugins/tiff/tiff_plugin.opl trunk/src/openimagelib/py/Makefile.am trunk/src/openimagelib/py/il.cpp trunk/src/openimagelib/py/py.cpp trunk/src/openimagelib/py/py.hpp trunk/src/openimagelib/py/py_vc8.vcproj trunk/src/openmedialib/Makefile.am trunk/src/openmedialib/ml/Makefile.am trunk/src/openmedialib/ml/config.hpp trunk/src/openmedialib/ml/ml.cpp trunk/src/openmedialib/ml/ml.hpp trunk/src/openmedialib/ml/ml_vc8.vcproj trunk/src/openmedialib/ml/openmedialib_plugin.cpp trunk/src/openmedialib/ml/openmedialib_plugin.hpp trunk/src/openmedialib/ml/store.hpp trunk/src/openmedialib/plugins/Makefile.am trunk/src/openmedialib/plugins/avformat/Makefile.am trunk/src/openmedialib/plugins/avformat/avformat_plugin.opl trunk/src/openmedialib/plugins/avformat/avformat_vc8.vcproj trunk/src/openmedialib/plugins/gensys/Makefile.am trunk/src/openmedialib/plugins/gensys/gensys_plugin.cpp trunk/src/openmedialib/plugins/gensys/gensys_plugin.opl trunk/src/openmedialib/plugins/gensys/gensys_vc8.vcproj trunk/src/openmedialib/plugins/glew/Makefile.am trunk/src/openmedialib/plugins/glew/glew_plugin.opl trunk/src/openmedialib/plugins/glew/glew_vc8.vcproj trunk/src/openmedialib/plugins/ofx/Makefile.am trunk/src/openmedialib/plugins/ofx/ofx_plugin.opl trunk/src/openmedialib/plugins/ofx/ofx_vc8.vcproj trunk/src/openmedialib/plugins/oil/Makefile.am trunk/src/openmedialib/plugins/oil/oil_plugin.cpp trunk/src/openmedialib/plugins/oil/oil_plugin.opl trunk/src/openmedialib/plugins/oil/oil_vc8.vcproj trunk/src/openmedialib/plugins/openal/Makefile.am trunk/src/openmedialib/plugins/openal/openal_plugin.opl trunk/src/openmedialib/plugins/openal/openal_vc8.vcproj trunk/src/openmedialib/plugins/quicktime/quicktime_input.h trunk/src/openmedialib/plugins/quicktime/quicktime_plugin.cpp trunk/src/openmedialib/plugins/quicktime/quicktime_plugin.opl trunk/src/openmedialib/plugins/quicktime/quicktime_store.cpp trunk/src/openmedialib/plugins/quicktime/quicktime_store.h trunk/src/openmedialib/plugins/quicktime/quicktime_track.cpp trunk/src/openmedialib/plugins/quicktime/quicktime_track.h trunk/src/openmedialib/plugins/quicktime/quicktime_vc8.vcproj trunk/src/openmedialib/plugins/template/Makefile.am trunk/src/openmedialib/plugins/template/template_plugin.opl trunk/src/openmedialib/plugins/template/template_vc8.vcproj trunk/src/openmedialib/py/Makefile.am trunk/src/openmedialib/py/py.cpp trunk/src/openmedialib/py/py.hpp trunk/src/openmedialib/py/py_vc8.vcproj trunk/src/openobjectlib/Makefile.am trunk/src/openobjectlib/plugins/3ds/3ds.cpp trunk/src/openobjectlib/plugins/3ds/3ds_plugin.cpp trunk/src/openobjectlib/plugins/3ds/3ds_plugin.hpp trunk/src/openobjectlib/plugins/3ds/3ds_plugin.opl trunk/src/openobjectlib/plugins/3ds/Makefile.am trunk/src/openobjectlib/plugins/3ds/config.hpp trunk/src/openobjectlib/plugins/Makefile.am trunk/src/openobjectlib/plugins/X3D/Makefile.am trunk/src/openobjectlib/plugins/X3D/X3D_vc8.vcproj trunk/src/openobjectlib/plugins/X3D/actions/x3d_parser_action.cpp trunk/src/openobjectlib/plugins/X3D/actions/x3d_parser_action.hpp trunk/src/openobjectlib/plugins/X3D/config.hpp trunk/src/openobjectlib/plugins/X3D/x3d.cpp trunk/src/openobjectlib/plugins/X3D/x3d_content_handler_libxml.cpp trunk/src/openobjectlib/plugins/X3D/x3d_content_handler_libxml.hpp trunk/src/openobjectlib/plugins/X3D/x3d_content_handler_msxml.cpp trunk/src/openobjectlib/plugins/X3D/x3d_content_handler_msxml.hpp trunk/src/openobjectlib/plugins/X3D/x3d_plugin.cpp trunk/src/openobjectlib/plugins/X3D/x3d_plugin.hpp trunk/src/openobjectlib/plugins/X3D/x3d_plugin.opl trunk/src/openobjectlib/plugins/X3D/xml_value_tokenizer.hpp trunk/src/openobjectlib/plugins/obj/Makefile.am trunk/src/openobjectlib/plugins/obj/config.hpp trunk/src/openobjectlib/plugins/obj/obj.cpp trunk/src/openobjectlib/plugins/obj/obj_plugin.cpp trunk/src/openobjectlib/plugins/obj/obj_plugin.hpp trunk/src/openobjectlib/plugins/obj/obj_plugin.opl trunk/src/openobjectlib/plugins/obj/obj_vc8.vcproj trunk/src/openobjectlib/plugins/obj/spirit.hpp trunk/src/openobjectlib/sg/Makefile.am trunk/src/openobjectlib/sg/appearance.cpp trunk/src/openobjectlib/sg/appearance.hpp trunk/src/openobjectlib/sg/bbox_volume.hpp trunk/src/openobjectlib/sg/calculate_tangent_space.hpp trunk/src/openobjectlib/sg/config.hpp trunk/src/openobjectlib/sg/constant_time_dispatcher.hpp trunk/src/openobjectlib/sg/graph_updater.hpp trunk/src/openobjectlib/sg/hw_GL_renderer.cpp trunk/src/openobjectlib/sg/hw_GL_renderer.hpp trunk/src/openobjectlib/sg/lexical_cast.hpp trunk/src/openobjectlib/sg/meshes.hpp trunk/src/openobjectlib/sg/openobjectlib_plugin.hpp trunk/src/openobjectlib/sg/render_buffer.hpp trunk/src/openobjectlib/sg/scene.hpp trunk/src/openobjectlib/sg/sg.hpp trunk/src/openobjectlib/sg/sg_vc8.vcproj trunk/src/openobjectlib/sg/shaders.hpp trunk/src/openobjectlib/sg/spatial.hpp trunk/src/openobjectlib/sg/spirit.hpp trunk/src/openpluginlib/Makefile.am trunk/src/openpluginlib/pl/GL_utility.cpp trunk/src/openpluginlib/pl/GL_utility.hpp trunk/src/openpluginlib/pl/Makefile.am trunk/src/openpluginlib/pl/allocatorstringstorage.h trunk/src/openpluginlib/pl/bind_info.cpp trunk/src/openpluginlib/pl/bind_info.hpp trunk/src/openpluginlib/pl/cg.cpp trunk/src/openpluginlib/pl/cg.hpp trunk/src/openpluginlib/pl/config.hpp trunk/src/openpluginlib/pl/content_handler_libxml.cpp trunk/src/openpluginlib/pl/content_handler_libxml.hpp trunk/src/openpluginlib/pl/content_handler_msxml.cpp trunk/src/openpluginlib/pl/content_handler_msxml.hpp trunk/src/openpluginlib/pl/cowstringopt.h trunk/src/openpluginlib/pl/discovery_traits.hpp trunk/src/openpluginlib/pl/fast_math.cpp trunk/src/openpluginlib/pl/fast_math.hpp trunk/src/openpluginlib/pl/flex_string.h trunk/src/openpluginlib/pl/flex_string_details.h trunk/src/openpluginlib/pl/flex_string_shell.h trunk/src/openpluginlib/pl/geometry.hpp trunk/src/openpluginlib/pl/openplugin.cpp trunk/src/openpluginlib/pl/openplugin.hpp trunk/src/openpluginlib/pl/openpluginlib.cpp trunk/src/openpluginlib/pl/openpluginlib.hpp trunk/src/openpluginlib/pl/opl_importer.cpp trunk/src/openpluginlib/pl/opl_importer.hpp trunk/src/openpluginlib/pl/opl_parser_action.cpp trunk/src/openpluginlib/pl/opl_parser_action.hpp trunk/src/openpluginlib/pl/pcos/iclonable.hpp trunk/src/openpluginlib/pl/pcos/iproperty_container.hpp trunk/src/openpluginlib/pl/pcos/isubject.hpp trunk/src/openpluginlib/pl/pcos/key.cpp trunk/src/openpluginlib/pl/pcos/key.hpp trunk/src/openpluginlib/pl/pcos/observer.hpp trunk/src/openpluginlib/pl/pcos/property.cpp trunk/src/openpluginlib/pl/pcos/property.hpp trunk/src/openpluginlib/pl/pcos/property_container.cpp trunk/src/openpluginlib/pl/pcos/property_container.hpp trunk/src/openpluginlib/pl/pcos/subject.cpp trunk/src/openpluginlib/pl/pcos/subject.hpp trunk/src/openpluginlib/pl/pcos/visitor.hpp trunk/src/openpluginlib/pl/property.hpp trunk/src/openpluginlib/pl/registry.cpp trunk/src/openpluginlib/pl/registry.hpp trunk/src/openpluginlib/pl/shader_manager.cpp trunk/src/openpluginlib/pl/shader_manager.hpp trunk/src/openpluginlib/pl/simplestringstorage.h trunk/src/openpluginlib/pl/smallstringopt.h trunk/src/openpluginlib/pl/string.hpp trunk/src/openpluginlib/pl/timer.cpp trunk/src/openpluginlib/pl/timer.hpp trunk/src/openpluginlib/pl/utf8_utils.cpp trunk/src/openpluginlib/pl/utf8_utils.hpp trunk/src/openpluginlib/pl/vectorstringstorage.h trunk/src/openpluginlib/py/Makefile.am trunk/src/openpluginlib/py/geometry.cpp trunk/src/openpluginlib/py/multi_property.cpp trunk/src/openpluginlib/py/openpluginlib.cpp trunk/src/openpluginlib/py/pcos/any.cpp trunk/src/openpluginlib/py/pcos/key.cpp trunk/src/openpluginlib/py/pcos/observer.cpp trunk/src/openpluginlib/py/pcos/property.cpp trunk/src/openpluginlib/py/pcos/property_container.cpp trunk/src/openpluginlib/py/pcos/subject.cpp trunk/src/openpluginlib/py/pcos/visitor.cpp trunk/src/openpluginlib/py/py.cpp trunk/src/openpluginlib/py/py.hpp trunk/src/openpluginlib/py/py_vc8.vcproj trunk/src/openpluginlib/py/python.hpp trunk/src/openpluginlib/py/single_property.cpp trunk/src/openpluginlib/py/string.cpp trunk/test/Makefile.am trunk/test/openassetlib/Makefile.am trunk/test/openassetlib/python_bindings_unittest/python_binding_unittest.py trunk/test/openassetlib/python_bindings_unittest/uuid.py trunk/test/openassetlib/unittest_filesystem_storage_plugin/filesystem_plugin_test.py trunk/test/openassetlib/unittest_filesystem_storage_plugin/main.cpp trunk/test/openassetlib/unittest_filesystem_storage_plugin/uuid.py trunk/test/openassetlib/unittest_sqlite3_metadata_plugin/main.cpp trunk/test/openimagelib/GL/Makefile.am trunk/test/openimagelib/GL/_2D/Makefile.am trunk/test/openimagelib/GL/_2D/_2D.cpp trunk/test/openimagelib/GL/_2D/_2D_vc8.vcproj trunk/test/openimagelib/GL/_2D_compressed/Makefile.am trunk/test/openimagelib/GL/_2D_compressed/_2D_compressed.cpp trunk/test/openimagelib/GL/_2D_compressed/_2D_compressed_vc8.vcproj trunk/test/openimagelib/GL/_2D_compressed_cubemap/Makefile.am trunk/test/openimagelib/GL/_2D_compressed_cubemap/_2D_compressed_cubemap.cpp trunk/test/openimagelib/GL/_2D_compressed_cubemap/_2D_compressed_cubemap_vc8.vcproj trunk/test/openimagelib/GL/_2D_crop/Makefile.am trunk/test/openimagelib/GL/_2D_crop/_2D_crop.cpp trunk/test/openimagelib/GL/_2D_crop/_2D_crop_vc8.vcproj trunk/test/openimagelib/GL/_2D_crop2/Makefile.am trunk/test/openimagelib/GL/_2D_crop2/_2D_crop2.cpp trunk/test/openimagelib/GL/_2D_crop2/_2D_crop2_vc8.vcproj trunk/test/openimagelib/GL/_2D_exr/Makefile.am trunk/test/openimagelib/GL/_2D_exr/_2D_exr.cpp trunk/test/openimagelib/GL/_2D_exr/_2D_exr_vc8.vcproj trunk/test/openimagelib/GL/_2D_scale/Makefile.am trunk/test/openimagelib/GL/_2D_scale/_2D_scale.cpp trunk/test/openimagelib/GL/_2D_sgi/Makefile.am trunk/test/openimagelib/GL/_2D_sgi/_2D_sgi.cpp trunk/test/openimagelib/GL/_2D_sgi/_2D_sgi_vc8.vcproj trunk/test/openimagelib/GL/_3D_lightmap/_3D_lightmap.cpp trunk/test/openimagelib/GL/_3D_lightmap/_3D_lightmap_vc8.vcproj trunk/test/openimagelib/Makefile.am trunk/test/openmedialib/Makefile.am trunk/test/openmedialib/player/Makefile.am trunk/test/openmedialib/player/player.cpp trunk/test/openmedialib/player/player_vc8.vcproj trunk/test/openmedialib/python/balance.py trunk/test/openmedialib/python/bootstrap.py trunk/test/openmedialib/python/common.py trunk/test/openmedialib/python/filter.py trunk/test/openmedialib/python/mix.py trunk/test/openmedialib/python/ntsc.oml trunk/test/openmedialib/python/pal.oml trunk/test/openmedialib/python/play.py trunk/test/openmedialib/python/reseat.py trunk/test/openmedialib/python/resize.py trunk/test/openmedialib/python/reverse.py trunk/test/openmedialib/python/rpn.oml trunk/test/openmedialib/python/rpn.py trunk/test/openmedialib/python/stacks.py trunk/test/openmedialib/python/store.py trunk/test/openmedialib/qtplayer/README trunk/test/openmedialib/qtplayer/main.cpp trunk/test/openmedialib/qtplayer/qtplayer.h trunk/test/openmedialib/qtplayer/qtplayer.pro trunk/test/openmedialib/store/Makefile.am trunk/test/openmedialib/store/store.cpp trunk/test/openmedialib/store/store_vc8.vcproj trunk/test/openobjectlib/GL/Makefile.am trunk/test/openobjectlib/GL/multipass_draw/Makefile.am trunk/test/openobjectlib/GL/multipass_draw/multipass_draw.cpp trunk/test/openobjectlib/GL/multipass_draw/multipass_draw_vc8.vcproj trunk/test/openobjectlib/GL/noise_volume/Makefile.am trunk/test/openobjectlib/GL/noise_volume/noise_volume.cpp trunk/test/openobjectlib/GL/noise_volume/noise_volume_vc8.vcproj trunk/test/openobjectlib/GL/obj_draw/Makefile.am trunk/test/openobjectlib/GL/obj_draw/f-16.mtl trunk/test/openobjectlib/GL/obj_draw/f-16.obj trunk/test/openobjectlib/GL/obj_draw/obj_draw.cpp trunk/test/openobjectlib/GL/obj_draw/obj_draw_vc8.vcproj trunk/test/openobjectlib/GL/texture_draw/Makefile.am trunk/test/openobjectlib/GL/texture_draw/texture_draw.cpp trunk/test/openobjectlib/GL/texture_draw/texture_draw_vc8.vcproj trunk/test/openobjectlib/Makefile.am trunk/test/openpluginlib/Makefile.am trunk/test/openpluginlib/discovery/Makefile.am trunk/test/openpluginlib/discovery/discovery.cpp trunk/test/openpluginlib/discovery/discovery_vc8.vcproj trunk/test/openpluginlib/enumerate/Makefile.am trunk/test/openpluginlib/enumerate/enumerate.cpp trunk/test/openpluginlib/enumerate/enumerate.py trunk/test/openpluginlib/enumerate/enumerate_vc8.vcproj trunk/test/openpluginlib/gettimeofday/Makefile.am trunk/test/openpluginlib/gettimeofday/gettimeofday.cpp trunk/test/openpluginlib/gpu_timer_query/Makefile.am trunk/test/openpluginlib/gpu_timer_query/gpu_timer_query.cpp trunk/test/openpluginlib/gpu_timer_query/gpu_timer_query_vc8.vcproj trunk/test/openpluginlib/initialization/Makefile.am trunk/test/openpluginlib/initialization/initialization.cpp trunk/test/openpluginlib/initialization/initialization_vc8.vcproj trunk/test/openpluginlib/pcos/Makefile.am trunk/test/openpluginlib/pcos/key/Makefile.am trunk/test/openpluginlib/pcos/key/key.cpp trunk/test/openpluginlib/pcos/key/key_vc8.vcproj trunk/test/openpluginlib/pcos/property/Makefile.am trunk/test/openpluginlib/pcos/property/property.cpp trunk/test/openpluginlib/pcos/property/property.py trunk/test/openpluginlib/pcos/property/property_vc8.vcproj trunk/test/openpluginlib/pcos/property_container/Makefile.am trunk/test/openpluginlib/pcos/property_container/property_container.cpp trunk/test/openpluginlib/pcos/property_container/property_container.py trunk/test/openpluginlib/pcos/property_container/property_container_vc8.vcproj trunk/test/openpluginlib/pcos/subject-observer/Makefile.am trunk/test/openpluginlib/pcos/subject-observer/subject-observer.cpp trunk/test/openpluginlib/pcos/subject-observer/subject-observer.py trunk/test/openpluginlib/pcos/subject-observer/subject-observer_vc8.vcproj trunk/test/openpluginlib/rdtsc/Makefile.am trunk/test/openpluginlib/rdtsc/rdtsc.cpp trunk/test/openpluginlib/rdtsc/rdtsc_vc8.vcproj trunk/test/openpluginlib/sleep/sleep.cpp trunk/test/openpluginlib/sleep/sleep_vc8.vcproj trunk/winbuild.py Added Paths: ----------- trunk/COPYING.rtf trunk/Info.plist.template trunk/InfoPlist.strings.template trunk/m4/Makefile.am trunk/m4/tiff.m4 trunk/m4/umbrella_framework.m4 trunk/openlibraries_vc8.sln trunk/src/openassetlib/plugins/sqlite/ trunk/src/openassetlib/plugins/sqlite/Makefile.am trunk/src/openassetlib/plugins/sqlite/config.hpp trunk/src/openassetlib/plugins/sqlite/database.cpp trunk/src/openassetlib/plugins/sqlite/database.hpp trunk/src/openassetlib/plugins/sqlite/sqlite-vc71-d-3_2_7.lib trunk/src/openassetlib/plugins/sqlite/sqlite-vc71-r-3_2_7.lib trunk/src/openassetlib/plugins/sqlite/sqlite3.h trunk/src/openassetlib/plugins/sqlite/sqlite3_metadata.cpp trunk/src/openassetlib/plugins/sqlite/sqlite3_metadata_plugin.cpp trunk/src/openassetlib/plugins/sqlite/sqlite3_metadata_plugin.hpp trunk/src/openassetlib/plugins/sqlite/sqlite3_metadata_plugin.opl trunk/src/openassetlib/plugins/sqlite/sqlite_vc8.vcproj trunk/src/openimagelib/il/lut_converter.hpp trunk/src/openimagelib/plugins/tiff/tiff_vc8.vcproj trunk/src/openpluginlib/pl/pl_vc8.vcproj trunk/src/openpluginlib/pl/shlib.cpp trunk/src/openpluginlib/pl/shlib.hpp trunk/src/openpluginlib/pl/stream.cpp trunk/src/openpluginlib/pl/stream.hpp trunk/src/umbrella_framework/ trunk/src/umbrella_framework/Makefile.am trunk/src/umbrella_framework/openlibraries.cpp trunk/src/umbrella_framework/openlibraries.hpp trunk/test/openassetlib/unittest_filesystem_storage_plugin/unittest_filesystem_storage_plugin.vcproj trunk/test/openassetlib/unittest_sqlite3_metadata_plugin/unittest_sqlite3_metadata_plugin.vcproj trunk/test/openeffectslib/ trunk/test/openeffectslib/Makefile.am trunk/test/openeffectslib/rescaler_bench/ trunk/test/openeffectslib/rescaler_bench/rescaler_bench.cpp trunk/test/openeffectslib/rescaler_bench/rescaler_bench_vc8.vcproj trunk/test/openeffectslib/tm_bench/ trunk/test/openeffectslib/tm_bench/Makefile.am trunk/test/openeffectslib/tm_bench/tm_bench.cpp trunk/test/openeffectslib/tm_bench/tm_bench_vc8.vcproj Removed Paths: ------------- trunk/build.bat trunk/build_80.bat trunk/doc/ trunk/effects/kernels/ trunk/installer/msxml4.msi trunk/installer/openlibraries_fc5.spec trunk/installer/openlibraries_lib64.spec trunk/m4/gelato.m4 trunk/openassetlib_vc8.sln trunk/openeffectslib_vc8.sln trunk/openimagelib_vc8.sln trunk/openmedialib_vc8.sln trunk/openobjectlib_vc8.sln trunk/openpluginlib_vc8.sln trunk/src/openassetlib/plugins/filesystem_storage_plugin/ trunk/src/openassetlib/plugins/sqlite/Makefile.am trunk/src/openassetlib/plugins/sqlite/config.hpp trunk/src/openassetlib/plugins/sqlite/database.cpp trunk/src/openassetlib/plugins/sqlite/database.hpp trunk/src/openassetlib/plugins/sqlite/sqlite-vc71-d-3_2_7.lib trunk/src/openassetlib/plugins/sqlite/sqlite-vc71-r-3_2_7.lib trunk/src/openassetlib/plugins/sqlite/sqlite3.h trunk/src/openassetlib/plugins/sqlite/sqlite3_metadata.cpp trunk/src/openassetlib/plugins/sqlite/sqlite3_metadata_plugin.cpp trunk/src/openassetlib/plugins/sqlite/sqlite3_metadata_plugin.hpp trunk/src/openassetlib/plugins/sqlite/sqlite3_metadata_plugin.opl trunk/src/openassetlib/plugins/sqlite/sqlite_vc8.vcproj trunk/src/openassetlib/plugins/sqlite3_metadata_plugin/ trunk/src/openimagelib/il/noise_traits.hpp trunk/src/openimagelib/il/openimagelib_plugin.cpp trunk/src/openimagelib/plugins/3D_lightmap/3D_lightmap.cpp trunk/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.hpp trunk/src/openimagelib/plugins/3D_lightmap/config.hpp trunk/src/openimagelib/plugins/bmp/bmp.cpp trunk/src/openimagelib/plugins/bmp/bmp_plugin.hpp trunk/src/openimagelib/plugins/bmp/config.hpp trunk/src/openimagelib/plugins/dds/config.hpp trunk/src/openimagelib/plugins/dds/dds.cpp trunk/src/openimagelib/plugins/dds/dds_plugin.hpp trunk/src/openimagelib/plugins/dpx/config.hpp trunk/src/openimagelib/plugins/dpx/dpx.cpp trunk/src/openimagelib/plugins/dpx/dpx_plugin.hpp trunk/src/openimagelib/plugins/exr/config.hpp trunk/src/openimagelib/plugins/exr/exr.cpp trunk/src/openimagelib/plugins/exr/exr_plugin.hpp trunk/src/openimagelib/plugins/gdi+/config.hpp trunk/src/openimagelib/plugins/gdi+/gdi+.cpp trunk/src/openimagelib/plugins/gdi+/gdi+_plugin.hpp trunk/src/openimagelib/plugins/hdr/config.hpp trunk/src/openimagelib/plugins/hdr/hdr.cpp trunk/src/openimagelib/plugins/hdr/hdr_plugin.hpp trunk/src/openimagelib/plugins/jpg/config.hpp trunk/src/openimagelib/plugins/jpg/jpg.cpp trunk/src/openimagelib/plugins/jpg/jpg_plugin.hpp trunk/src/openimagelib/plugins/png/config.hpp trunk/src/openimagelib/plugins/png/png.cpp trunk/src/openimagelib/plugins/png/png_plugin.hpp trunk/src/openimagelib/plugins/psd/config.hpp trunk/src/openimagelib/plugins/psd/psd.cpp trunk/src/openimagelib/plugins/psd/psd_plugin.hpp trunk/src/openimagelib/plugins/qim/ trunk/src/openimagelib/plugins/quicktime/config.hpp trunk/src/openimagelib/plugins/quicktime/quicktime.cpp trunk/src/openimagelib/plugins/quicktime/quicktime_plugin.hpp trunk/src/openimagelib/plugins/sgi/config.hpp trunk/src/openimagelib/plugins/sgi/sgi.cpp trunk/src/openimagelib/plugins/sgi/sgi_plugin.hpp trunk/src/openimagelib/plugins/tga/config.hpp trunk/src/openimagelib/plugins/tga/tga.cpp trunk/src/openimagelib/plugins/tga/tga_plugin.hpp trunk/src/openimagelib/plugins/tiff/config.hpp trunk/src/openimagelib/plugins/tiff/tiff.cpp trunk/src/openimagelib/plugins/tiff/tiff_plugin.hpp trunk/src/openmedialib/plugins/caca/ trunk/src/openmedialib/plugins/directshow/ trunk/src/openmedialib/plugins/mlt/ trunk/src/openmedialib/plugins/quicktime/Makefile.am trunk/src/openmedialib/plugins/sdl/ trunk/src/openobjectlib/plugins/3ds/3ds_vc8.vcproj trunk/src/openobjectlib/plugins/Collada/ trunk/src/openobjectlib/plugins/FX_Composer/ trunk/src/openobjectlib/plugins/Gelato/ trunk/src/openobjectlib/plugins/fbx/ trunk/src/openobjectlib/plugins/flt/ trunk/src/openobjectlib/plugins/model/ trunk/src/openobjectlib/plugins/nvb/ trunk/src/openobjectlib/plugins/tsto/ trunk/src/openobjectlib/plugins/x3dbz/ trunk/src/openobjectlib/plugins/x3dz/ trunk/src/openpluginlib/pl/openpluginlib_vc8.vcproj trunk/src/openpluginlib/pl/pcos/any.hpp trunk/src/umbrella_framework/Makefile.am trunk/src/umbrella_framework/openlibraries.cpp trunk/src/umbrella_framework/openlibraries.hpp trunk/test/openassetlib/al_testharness/ trunk/test/openassetlib/python_bindings_unittest/jahlogo.png trunk/test/openassetlib/python_bindings_unittest/mvi_2827.avi trunk/test/openassetlib/unittest_filesystem_storage_plugin/unittest_filesystem_storage_plugin_vc8.vcproj trunk/test/openassetlib/unittest_sqlite3_metadata_plugin/sqlite3.exe trunk/test/openassetlib/unittest_sqlite3_metadata_plugin/unittest_sqlite3_metadata_plugin_vc8.vcproj trunk/test/openeffectslib/Makefile.am trunk/test/openeffectslib/rescaler_bench/ trunk/test/openeffectslib/rescaler_bench/rescaler_bench.cpp trunk/test/openeffectslib/rescaler_bench/rescaler_bench_vc8.vcproj trunk/test/openeffectslib/tm_bench/ trunk/test/openeffectslib/tm_bench/Makefile.am trunk/test/openeffectslib/tm_bench/tm_bench.cpp trunk/test/openeffectslib/tm_bench/tm_bench_vc8.vcproj trunk/test/openimagelib/GL/_2D/_2D-Info.plist trunk/test/openimagelib/GL/_2D/plugins/ trunk/test/openimagelib/GL/_2D_compressed/_2D_compressed-Info.plist trunk/test/openimagelib/GL/_2D_compressed/plugins/ trunk/test/openimagelib/GL/_2D_compressed_cubemap/_2D_compressed_cubemap-Info.plist trunk/test/openimagelib/GL/_2D_compressed_cubemap/plugins/ trunk/test/openimagelib/GL/_2D_crop/plugins/ trunk/test/openimagelib/GL/_2D_crop2/plugins/ trunk/test/openimagelib/GL/_2D_photoshop/ trunk/test/openimagelib/GL/_2D_scale/_2D_scale_vc8.vcproj trunk/test/openimagelib/GL/_2D_sgi/plugins/ trunk/test/openimagelib/GL/_2D_sgi/test.la trunk/test/openimagelib/Serialization/ trunk/test/openmedialib/directshow/ trunk/test/openmedialib/player/plugins/ trunk/test/openmedialib/qtplayer/qtplayer_vc8.vcproj trunk/test/openmedialib/store/plugins/ trunk/test/openmedialib/store/test.cpp trunk/test/openmedialib/store/testStoreJuan_vc8.vcproj trunk/test/openobjectlib/GL/CgFX_draw/ trunk/test/openobjectlib/GL/Cg_draw/ trunk/test/openobjectlib/GL/Collada_simple_draw/ trunk/test/openobjectlib/GL/bzip2_compressed_draw/ trunk/test/openobjectlib/GL/fixed_function_dot_product3_draw/ trunk/test/openobjectlib/GL/fixed_function_multi_texture_draw/ trunk/test/openobjectlib/GL/fixed_function_texture_draw/ trunk/test/openobjectlib/GL/gzip_compressed_draw/ trunk/test/openobjectlib/GL/multipass_draw/plugins/ trunk/test/openobjectlib/GL/noise_volume/plugins/ trunk/test/openobjectlib/GL/obj_draw/obj_draw-Info.plist trunk/test/openobjectlib/GL/obj_draw/plugins/ trunk/test/openobjectlib/GL/simple_draw/ trunk/test/openobjectlib/GL/texture_draw/plugins/ trunk/test/openobjectlib/Misc/ trunk/test/openobjectlib/QT/ trunk/test/openobjectlib/Serialization/ trunk/test/openpluginlib/discovery/plugins/ trunk/test/openpluginlib/initialization/plugins/ Property Changed: ---------------- trunk/bootstrap trunk/effects/Makefile.am trunk/effects/shaders/channel_selector.cg trunk/effects/shaders/channel_selector.frag trunk/effects/shaders/fixed_function.vert trunk/effects/shaders/histogram.cg trunk/effects/shaders/histogram.frag trunk/effects/shaders/passthrough.cg trunk/effects/shaders/passthrough.vert trunk/effects/shaders/rgb_to_yuv444.frag trunk/effects/shaders/sepia.cg trunk/effects/shaders/sepia.frag trunk/effects/shaders/yuv444_to_rgb.cg trunk/effects/shaders/yuv444_to_rgb.frag trunk/effects/shaders/yuv444_to_rgb_deinterlace.cg trunk/effects/shaders/yuv444_to_rgb_deinterlace.frag trunk/installer/add_to_path.nsh trunk/installer/openlibraries_lib32.spec trunk/installer/openlibraries_runtime.nsi trunk/installer/openlibraries_sdk.nsi trunk/installer/write_env_str.nsh trunk/m4/boost.m4 trunk/m4/bzip2.m4 trunk/m4/cg.m4 trunk/m4/fast_math.m4 trunk/m4/glew.m4 trunk/m4/gpl.m4 trunk/m4/ofx.m4 trunk/m4/openal.m4 trunk/m4/opengl.m4 trunk/m4/openimagelib.m4 trunk/m4/pkg.m4 trunk/m4/python.m4 trunk/m4/qt.m4 trunk/m4/quicktime.m4 trunk/m4/sqlite.m4 trunk/m4/universal_binary.m4 trunk/m4/zlib.m4 trunk/media/Makefile.am trunk/media/models/complex_glass.x3d trunk/media/models/disco_lighting.x3d trunk/media/models/glittering.x3d trunk/media/models/plastic.x3d trunk/media/models/ptm.x3d trunk/media/models/reflections_refractions.x3d trunk/media/models/shl_per_pixel.x3d trunk/src/Makefile.am trunk/src/openassetlib/Makefile.am trunk/src/openassetlib/plugins/Makefile.am trunk/src/openassetlib/py/Makefile.am trunk/src/openassetlib/py/asset.cpp trunk/src/openassetlib/py/guid.cpp trunk/src/openassetlib/py/openassetlib.cpp trunk/src/openassetlib/py/plugin.cpp trunk/src/openassetlib/py/py.cpp trunk/src/openassetlib/py/py.hpp trunk/src/openassetlib/py/py_vc8.vcproj trunk/src/openassetlib/py/python.hpp trunk/src/openassetlib/py/set.cpp trunk/src/openeffectslib/Makefile.am trunk/src/openeffectslib/plugins/Makefile.am trunk/src/openeffectslib/plugins/tonemap/Makefile.am trunk/src/openeffectslib/plugins/tonemap/tonemap_plugin.cpp trunk/src/openeffectslib/plugins/tonemap/tonemap_plugin.opl trunk/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj trunk/src/openimagelib/Makefile.am trunk/src/openimagelib/il/Makefile.am trunk/src/openimagelib/il/basic_image.hpp trunk/src/openimagelib/il/compression_traits.hpp trunk/src/openimagelib/il/config.hpp trunk/src/openimagelib/il/float_traits.hpp trunk/src/openimagelib/il/il.cpp trunk/src/openimagelib/il/il.hpp trunk/src/openimagelib/il/il_vc8.vcproj trunk/src/openimagelib/il/openimagelib_plugin.hpp trunk/src/openimagelib/il/rgb_traits.hpp trunk/src/openimagelib/il/traits.hpp trunk/src/openimagelib/il/utility.cpp trunk/src/openimagelib/il/utility.hpp trunk/src/openimagelib/il/yuv_traits.hpp trunk/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.cpp trunk/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.opl trunk/src/openimagelib/plugins/3D_lightmap/3D_lightmap_vc8.vcproj trunk/src/openimagelib/plugins/3D_lightmap/Makefile.am trunk/src/openimagelib/plugins/Makefile.am trunk/src/openimagelib/plugins/bmp/Makefile.am trunk/src/openimagelib/plugins/bmp/bmp_plugin.cpp trunk/src/openimagelib/plugins/bmp/bmp_plugin.opl trunk/src/openimagelib/plugins/bmp/bmp_vc8.vcproj trunk/src/openimagelib/plugins/dds/Makefile.am trunk/src/openimagelib/plugins/dds/dds_plugin.cpp trunk/src/openimagelib/plugins/dds/dds_plugin.opl trunk/src/openimagelib/plugins/dds/dds_vc8.vcproj trunk/src/openimagelib/plugins/dpx/Makefile.am trunk/src/openimagelib/plugins/dpx/dpx_plugin.cpp trunk/src/openimagelib/plugins/dpx/dpx_plugin.opl trunk/src/openimagelib/plugins/dpx/dpx_vc8.vcproj trunk/src/openimagelib/plugins/exr/Makefile.am trunk/src/openimagelib/plugins/exr/exr_plugin.cpp trunk/src/openimagelib/plugins/exr/exr_plugin.opl trunk/src/openimagelib/plugins/exr/exr_vc8.vcproj trunk/src/openimagelib/plugins/gdi+/gdi+_plugin.cpp trunk/src/openimagelib/plugins/gdi+/gdi+_vc8.vcproj trunk/src/openimagelib/plugins/gdi+/gdi_plugin.opl trunk/src/openimagelib/plugins/hdr/Makefile.am trunk/src/openimagelib/plugins/hdr/hdr_plugin.cpp trunk/src/openimagelib/plugins/hdr/hdr_plugin.opl trunk/src/openimagelib/plugins/hdr/hdr_vc8.vcproj trunk/src/openimagelib/plugins/jpg/Makefile.am trunk/src/openimagelib/plugins/jpg/jpg_plugin.cpp trunk/src/openimagelib/plugins/jpg/jpg_plugin.opl trunk/src/openimagelib/plugins/jpg/jpg_vc8.vcproj trunk/src/openimagelib/plugins/png/Makefile.am trunk/src/openimagelib/plugins/png/png_plugin.cpp trunk/src/openimagelib/plugins/png/png_plugin.opl trunk/src/openimagelib/plugins/png/png_vc8.vcproj trunk/src/openimagelib/plugins/psd/Makefile.am trunk/src/openimagelib/plugins/psd/psd_plugin.cpp trunk/src/openimagelib/plugins/psd/psd_plugin.opl trunk/src/openimagelib/plugins/psd/psd_vc8.vcproj trunk/src/openimagelib/plugins/quicktime/Makefile.am trunk/src/openimagelib/plugins/quicktime/quicktime_plugin.cpp trunk/src/openimagelib/plugins/quicktime/quicktime_plugin.opl trunk/src/openimagelib/plugins/quicktime/quicktime_vc8.vcproj trunk/src/openimagelib/plugins/sgi/Makefile.am trunk/src/openimagelib/plugins/sgi/sgi_plugin.cpp trunk/src/openimagelib/plugins/sgi/sgi_plugin.opl trunk/src/openimagelib/plugins/sgi/sgi_vc8.vcproj trunk/src/openimagelib/plugins/tga/Makefile.am trunk/src/openimagelib/plugins/tga/tga_plugin.cpp trunk/src/openimagelib/plugins/tga/tga_plugin.opl trunk/src/openimagelib/plugins/tga/tga_vc8.vcproj trunk/src/openimagelib/plugins/tiff/Makefile.am trunk/src/openimagelib/plugins/tiff/tiff_plugin.cpp trunk/src/openimagelib/plugins/tiff/tiff_plugin.opl trunk/src/openimagelib/py/Makefile.am trunk/src/openimagelib/py/il.cpp trunk/src/openimagelib/py/py.cpp trunk/src/openimagelib/py/py.hpp trunk/src/openimagelib/py/py_vc8.vcproj trunk/src/openmedialib/Makefile.am trunk/src/openmedialib/ml/Makefile.am trunk/src/openmedialib/ml/audio.hpp trunk/src/openmedialib/ml/config.hpp trunk/src/openmedialib/ml/filter.hpp trunk/src/openmedialib/ml/frame.hpp trunk/src/openmedialib/ml/input.hpp trunk/src/openmedialib/ml/ml.cpp trunk/src/openmedialib/ml/ml.hpp trunk/src/openmedialib/ml/ml_vc8.vcproj trunk/src/openmedialib/ml/openmedialib_plugin.cpp trunk/src/openmedialib/ml/openmedialib_plugin.hpp trunk/src/openmedialib/ml/store.hpp trunk/src/openmedialib/ml/utilities.cpp trunk/src/openmedialib/ml/utilities.hpp trunk/src/openmedialib/plugins/Makefile.am trunk/src/openmedialib/plugins/avformat/Makefile.am trunk/src/openmedialib/plugins/avformat/avformat_plugin.cpp trunk/src/openmedialib/plugins/avformat/avformat_plugin.opl trunk/src/openmedialib/plugins/avformat/avformat_vc8.vcproj trunk/src/openmedialib/plugins/gensys/Makefile.am trunk/src/openmedialib/plugins/gensys/gensys_plugin.cpp trunk/src/openmedialib/plugins/gensys/gensys_plugin.opl trunk/src/openmedialib/plugins/gensys/gensys_vc8.vcproj trunk/src/openmedialib/plugins/glew/Makefile.am trunk/src/openmedialib/plugins/glew/glew_plugin.cpp trunk/src/openmedialib/plugins/glew/glew_plugin.opl trunk/src/openmedialib/plugins/glew/glew_vc8.vcproj trunk/src/openmedialib/plugins/ofx/Makefile.am trunk/src/openmedialib/plugins/ofx/ofx_plugin.cpp trunk/src/openmedialib/plugins/ofx/ofx_plugin.opl trunk/src/openmedialib/plugins/ofx/ofx_vc8.vcproj trunk/src/openmedialib/plugins/oil/Makefile.am trunk/src/openmedialib/plugins/oil/oil_plugin.cpp trunk/src/openmedialib/plugins/oil/oil_plugin.opl trunk/src/openmedialib/plugins/oil/oil_vc8.vcproj trunk/src/openmedialib/plugins/openal/Makefile.am trunk/src/openmedialib/plugins/openal/openal_plugin.cpp trunk/src/openmedialib/plugins/openal/openal_plugin.opl trunk/src/openmedialib/plugins/openal/openal_vc8.vcproj trunk/src/openmedialib/plugins/quicktime/quicktime_audiotrack.cpp trunk/src/openmedialib/plugins/quicktime/quicktime_input.cpp trunk/src/openmedialib/plugins/quicktime/quicktime_plugin.cpp trunk/src/openmedialib/plugins/quicktime/quicktime_plugin.opl trunk/src/openmedialib/plugins/quicktime/quicktime_store.cpp trunk/src/openmedialib/plugins/quicktime/quicktime_track.cpp trunk/src/openmedialib/plugins/quicktime/quicktime_vc8.vcproj trunk/src/openmedialib/plugins/quicktime/quicktime_videotrack.cpp trunk/src/openmedialib/plugins/template/Makefile.am trunk/src/openmedialib/plugins/template/template_plugin.cpp trunk/src/openmedialib/plugins/template/template_plugin.opl trunk/src/openmedialib/plugins/template/template_vc8.vcproj trunk/src/openmedialib/py/Makefile.am trunk/src/openmedialib/py/ml.cpp trunk/src/openmedialib/py/py.cpp trunk/src/openmedialib/py/py.hpp trunk/src/openmedialib/py/py_vc8.vcproj trunk/src/openobjectlib/Makefile.am trunk/src/openobjectlib/plugins/3ds/3ds.cpp trunk/src/openobjectlib/plugins/3ds/3ds_plugin.cpp trunk/src/openobjectlib/plugins/3ds/3ds_plugin.hpp trunk/src/openobjectlib/plugins/3ds/3ds_plugin.opl trunk/src/openobjectlib/plugins/3ds/Makefile.am trunk/src/openobjectlib/plugins/3ds/config.hpp trunk/src/openobjectlib/plugins/Makefile.am trunk/src/openobjectlib/plugins/X3D/Makefile.am trunk/src/openobjectlib/plugins/X3D/X3D_vc8.vcproj trunk/src/openobjectlib/plugins/X3D/actions/x3d_parser_action.cpp trunk/src/openobjectlib/plugins/X3D/actions/x3d_parser_action.hpp trunk/src/openobjectlib/plugins/X3D/config.hpp trunk/src/openobjectlib/plugins/X3D/x3d.cpp trunk/src/openobjectlib/plugins/X3D/x3d_content_handler_libxml.cpp trunk/src/openobjectlib/plugins/X3D/x3d_content_handler_libxml.hpp trunk/src/openobjectlib/plugins/X3D/x3d_content_handler_msxml.cpp trunk/src/openobjectlib/plugins/X3D/x3d_content_handler_msxml.hpp trunk/src/openobjectlib/plugins/X3D/x3d_plugin.cpp trunk/src/openobjectlib/plugins/X3D/x3d_plugin.hpp trunk/src/openobjectlib/plugins/X3D/x3d_plugin.opl trunk/src/openobjectlib/plugins/X3D/xml_value_tokenizer.hpp trunk/src/openobjectlib/plugins/obj/Makefile.am trunk/src/openobjectlib/plugins/obj/config.hpp trunk/src/openobjectlib/plugins/obj/obj.cpp trunk/src/openobjectlib/plugins/obj/obj_plugin.cpp trunk/src/openobjectlib/plugins/obj/obj_plugin.hpp trunk/src/openobjectlib/plugins/obj/obj_plugin.opl trunk/src/openobjectlib/plugins/obj/obj_vc8.vcproj trunk/src/openobjectlib/plugins/obj/spirit.hpp trunk/src/openobjectlib/sg/Makefile.am trunk/src/openobjectlib/sg/appearance.cpp trunk/src/openobjectlib/sg/appearance.hpp trunk/src/openobjectlib/sg/bbox_volume.cpp trunk/src/openobjectlib/sg/bbox_volume.hpp trunk/src/openobjectlib/sg/calculate_tangent_space.cpp trunk/src/openobjectlib/sg/calculate_tangent_space.hpp trunk/src/openobjectlib/sg/config.hpp trunk/src/openobjectlib/sg/constant_time_dispatcher.hpp trunk/src/openobjectlib/sg/core.hpp trunk/src/openobjectlib/sg/graph_updater.cpp trunk/src/openobjectlib/sg/graph_updater.hpp trunk/src/openobjectlib/sg/hw_GL_renderer.cpp trunk/src/openobjectlib/sg/hw_GL_renderer.hpp trunk/src/openobjectlib/sg/lexical_cast.hpp trunk/src/openobjectlib/sg/meshes.cpp trunk/src/openobjectlib/sg/meshes.hpp trunk/src/openobjectlib/sg/openobjectlib_plugin.cpp trunk/src/openobjectlib/sg/openobjectlib_plugin.hpp trunk/src/openobjectlib/sg/render_buffer.cpp trunk/src/openobjectlib/sg/render_buffer.hpp trunk/src/openobjectlib/sg/scene.cpp trunk/src/openobjectlib/sg/scene.hpp trunk/src/openobjectlib/sg/sg.cpp trunk/src/openobjectlib/sg/sg.hpp trunk/src/openobjectlib/sg/sg_vc8.vcproj trunk/src/openobjectlib/sg/shaders.cpp trunk/src/openobjectlib/sg/shaders.hpp trunk/src/openobjectlib/sg/spatial.cpp trunk/src/openobjectlib/sg/spatial.hpp trunk/src/openobjectlib/sg/spirit.hpp trunk/src/openpluginlib/Makefile.am trunk/src/openpluginlib/pl/GL_utility.cpp trunk/src/openpluginlib/pl/GL_utility.hpp trunk/src/openpluginlib/pl/Makefile.am trunk/src/openpluginlib/pl/bind_info.cpp trunk/src/openpluginlib/pl/bind_info.hpp trunk/src/openpluginlib/pl/cg.cpp trunk/src/openpluginlib/pl/cg.hpp trunk/src/openpluginlib/pl/config.hpp trunk/src/openpluginlib/pl/content_handler_libxml.cpp trunk/src/openpluginlib/pl/content_handler_libxml.hpp trunk/src/openpluginlib/pl/content_handler_msxml.cpp trunk/src/openpluginlib/pl/content_handler_msxml.hpp trunk/src/openpluginlib/pl/discovery_traits.hpp trunk/src/openpluginlib/pl/fast_math.cpp trunk/src/openpluginlib/pl/fast_math.hpp trunk/src/openpluginlib/pl/geometry.hpp trunk/src/openpluginlib/pl/openplugin.cpp trunk/src/openpluginlib/pl/openplugin.hpp trunk/src/openpluginlib/pl/openpluginlib.cpp trunk/src/openpluginlib/pl/openpluginlib.hpp trunk/src/openpluginlib/pl/opl_importer.cpp trunk/src/openpluginlib/pl/opl_importer.hpp trunk/src/openpluginlib/pl/opl_parser_action.cpp trunk/src/openpluginlib/pl/opl_parser_action.hpp trunk/src/openpluginlib/pl/pcos/iclonable.hpp trunk/src/openpluginlib/pl/pcos/iproperty_container.hpp trunk/src/openpluginlib/pl/pcos/isubject.hpp trunk/src/openpluginlib/pl/pcos/key.cpp trunk/src/openpluginlib/pl/pcos/key.hpp trunk/src/openpluginlib/pl/pcos/observer.hpp trunk/src/openpluginlib/pl/pcos/property.cpp trunk/src/openpluginlib/pl/pcos/property.hpp trunk/src/openpluginlib/pl/pcos/property_container.cpp trunk/src/openpluginlib/pl/pcos/property_container.hpp trunk/src/openpluginlib/pl/pcos/subject.cpp trunk/src/openpluginlib/pl/pcos/subject.hpp trunk/src/openpluginlib/pl/pcos/visitor.hpp trunk/src/openpluginlib/pl/pool.cpp trunk/src/openpluginlib/pl/pool.hpp trunk/src/openpluginlib/pl/property.hpp trunk/src/openpluginlib/pl/registry.cpp trunk/src/openpluginlib/pl/registry.hpp trunk/src/openpluginlib/pl/shader_manager.cpp trunk/src/openpluginlib/pl/shader_manager.hpp trunk/src/openpluginlib/pl/timer.cpp trunk/src/openpluginlib/pl/timer.hpp trunk/src/openpluginlib/pl/utf8_utils.cpp trunk/src/openpluginlib/pl/utf8_utils.hpp trunk/src/openpluginlib/py/Makefile.am trunk/src/openpluginlib/py/geometry.cpp trunk/src/openpluginlib/py/multi_property.cpp trunk/src/openpluginlib/py/openpluginlib.cpp trunk/src/openpluginlib/py/pcos/any.cpp trunk/src/openpluginlib/py/pcos/key.cpp trunk/src/openpluginlib/py/pcos/observer.cpp trunk/src/openpluginlib/py/pcos/property.cpp trunk/src/openpluginlib/py/pcos/property_container.cpp trunk/src/openpluginlib/py/pcos/subject.cpp trunk/src/openpluginlib/py/pcos/visitor.cpp trunk/src/openpluginlib/py/py.cpp trunk/src/openpluginlib/py/py.hpp trunk/src/openpluginlib/py/py_vc8.vcproj trunk/src/openpluginlib/py/python.hpp trunk/src/openpluginlib/py/single_property.cpp trunk/src/openpluginlib/py/string.cpp trunk/test/Makefile.am trunk/test/openassetlib/Makefile.am trunk/test/openassetlib/unittest_filesystem_storage_plugin/main.cpp trunk/test/openassetlib/unittest_sqlite3_metadata_plugin/main.cpp trunk/test/openimagelib/GL/Makefile.am trunk/test/openimagelib/GL/_2D/Makefile.am trunk/test/openimagelib/GL/_2D/_2D.cpp trunk/test/openimagelib/GL/_2D/_2D_vc8.vcproj trunk/test/openimagelib/GL/_2D_compressed/Makefile.am trunk/test/openimagelib/GL/_2D_compressed/_2D_compressed.cpp trunk/test/openimagelib/GL/_2D_compressed/_2D_compressed_vc8.vcproj trunk/test/openimagelib/GL/_2D_compressed_cubemap/Makefile.am trunk/test/openimagelib/GL/_2D_compressed_cubemap/_2D_compressed_cubemap.cpp trunk/test/openimagelib/GL/_2D_compressed_cubemap/_2D_compressed_cubemap_vc8.vcproj trunk/test/openimagelib/GL/_2D_crop/Makefile.am trunk/test/openimagelib/GL/_2D_crop/_2D_crop.cpp trunk/test/openimagelib/GL/_2D_crop/_2D_crop_vc8.vcproj trunk/test/openimagelib/GL/_2D_crop2/Makefile.am trunk/test/openimagelib/GL/_2D_crop2/_2D_crop2.cpp trunk/test/openimagelib/GL/_2D_crop2/_2D_crop2_vc8.vcproj trunk/test/openimagelib/GL/_2D_exr/Makefile.am trunk/test/openimagelib/GL/_2D_exr/_2D_exr.cpp trunk/test/openimagelib/GL/_2D_exr/_2D_exr_vc8.vcproj trunk/test/openimagelib/GL/_2D_scale/Makefile.am trunk/test/openimagelib/GL/_2D_scale/_2D_scale.cpp trunk/test/openimagelib/GL/_2D_sgi/Makefile.am trunk/test/openimagelib/GL/_2D_sgi/_2D_sgi.cpp trunk/test/openimagelib/GL/_2D_sgi/_2D_sgi_vc8.vcproj trunk/test/openimagelib/GL/_3D_lightmap/_3D_lightmap.cpp trunk/test/openimagelib/GL/_3D_lightmap/_3D_lightmap_vc8.vcproj trunk/test/openimagelib/Makefile.am trunk/test/openmedialib/Makefile.am trunk/test/openmedialib/player/Makefile.am trunk/test/openmedialib/player/player.cpp trunk/test/openmedialib/player/player_vc8.vcproj trunk/test/openmedialib/python/filter.py trunk/test/openmedialib/python/mix.py trunk/test/openmedialib/python/play.py trunk/test/openmedialib/python/reseat.py trunk/test/openmedialib/python/resize.py trunk/test/openmedialib/python/reverse.py trunk/test/openmedialib/python/rpn.py trunk/test/openmedialib/qtplayer/main.cpp trunk/test/openmedialib/store/Makefile.am trunk/test/openmedialib/store/store.cpp trunk/test/openmedialib/store/store_vc8.vcproj trunk/test/openobjectlib/GL/Makefile.am trunk/test/openobjectlib/GL/multipass_draw/Makefile.am trunk/test/openobjectlib/GL/multipass_draw/multipass_draw.cpp trunk/test/openobjectlib/GL/multipass_draw/multipass_draw_vc8.vcproj trunk/test/openobjectlib/GL/noise_volume/Makefile.am trunk/test/openobjectlib/GL/noise_volume/noise_volume.cpp trunk/test/openobjectlib/GL/noise_volume/noise_volume_vc8.vcproj trunk/test/openobjectlib/GL/obj_draw/Makefile.am trunk/test/openobjectlib/GL/obj_draw/obj_draw.cpp trunk/test/openobjectlib/GL/obj_draw/obj_draw_vc8.vcproj trunk/test/openobjectlib/GL/texture_draw/Makefile.am trunk/test/openobjectlib/GL/texture_draw/texture_draw.cpp trunk/test/openobjectlib/GL/texture_draw/texture_draw_vc8.vcproj trunk/test/openobjectlib/Makefile.am trunk/test/openpluginlib/Makefile.am trunk/test/openpluginlib/discovery/Makefile.am trunk/test/openpluginlib/discovery/discovery.cpp trunk/test/openpluginlib/discovery/discovery_vc8.vcproj trunk/test/openpluginlib/enumerate/Makefile.am trunk/test/openpluginlib/enumerate/enumerate.cpp trunk/test/openpluginlib/enumerate/enumerate_vc8.vcproj trunk/test/openpluginlib/gettimeofday/Makefile.am trunk/test/openpluginlib/gettimeofday/gettimeofday.cpp trunk/test/openpluginlib/gpu_timer_query/Makefile.am trunk/test/openpluginlib/gpu_timer_query/gpu_timer_query.cpp trunk/test/openpluginlib/gpu_timer_query/gpu_timer_query_vc8.vcproj trunk/test/openpluginlib/initialization/Makefile.am trunk/test/openpluginlib/initialization/initialization.cpp trunk/test/openpluginlib/initialization/initialization_vc8.vcproj trunk/test/openpluginlib/pcos/Makefile.am trunk/test/openpluginlib/pcos/key/Makefile.am trunk/test/openpluginlib/pcos/key/key.cpp trunk/test/openpluginlib/pcos/key/key_vc8.vcproj trunk/test/openpluginlib/pcos/property/Makefile.am trunk/test/openpluginlib/pcos/property/property.cpp trunk/test/openpluginlib/pcos/property/property.py trunk/test/openpluginlib/pcos/property/property_vc8.vcproj trunk/test/openpluginlib/pcos/property_container/Makefile.am trunk/test/openpluginlib/pcos/property_container/property_container.cpp trunk/test/openpluginlib/pcos/property_container/property_container_vc8.vcproj trunk/test/openpluginlib/pcos/subject-observer/Makefile.am trunk/test/openpluginlib/pcos/subject-observer/subject-observer.cpp trunk/test/openpluginlib/pcos/subject-observer/subject-observer_vc8.vcproj trunk/test/openpluginlib/rdtsc/Makefile.am trunk/test/openpluginlib/rdtsc/rdtsc.cpp trunk/test/openpluginlib/rdtsc/rdtsc_vc8.vcproj trunk/test/openpluginlib/sleep/sleep.cpp trunk/test/openpluginlib/sleep/sleep_vc8.vcproj Modified: trunk/COPYING =================================================================== --- trunk/COPYING 2007-10-27 15:28:48 UTC (rev 1315) +++ trunk/COPYING 2007-10-28 11:24:51 UTC (rev 1316) @@ -456,50 +456,4 @@ DAMAGES. END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - <one line to give the library's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - <signature of Ty Coon>, 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - - + \ No newline at end of file Copied: trunk/COPYING.rtf (from rev 1315, branches/hdrflow/COPYING.rtf) =================================================================== --- trunk/COPYING.rtf (rev 0) +++ trunk/COPYING.rtf 2007-10-28 11:24:51 UTC (rev 1316) @@ -0,0 +1,462 @@ +{\rtf1\ansi\deff0{\fonttbl{\f0\fswiss\fprq2\fcharset0 Arial;}} +{\*\generator Msftedit 5.41.15.1507;}\viewkind4\uc1\pard\lang2057\f0\fs22\tab\tab GNU LESSER GENERAL PUBLIC LICENSE\par +\tab\tab Version 2.1, February 1999\par +\par + Copyright (C) 1991, 1999 Free Software Foundation, Inc.\par + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA\par + Everyone is permitted to copy and distribute verbatim copies\par + of this license document, but changing it is not allowed.\par +\par +[This is the first released version of the Lesser GPL. It also counts\par + as the successor of the GNU Library Public License, version 2, hence\par + the version number 2.1.]\par +\par +\tab\tab\tab Preamble\par +\par + The licenses for most software are designed to take away your\par +freedom to share and change it. By contrast, the GNU General Public\par +Licenses are intended to guarantee your freedom to share and change\par +free software--to make sure the software is free for all its users.\par +\par + This license, the Lesser General Public License, applies to some\par +specially designated software packages--typically libraries--of the\par +Free Software Foundation and other authors who decide to use it. You\par +can use it too, but we suggest you first think carefully about whether\par +this license or the ordinary General Public License is the better\par +strategy to use in any particular case, based on the explanations below.\par +\par + When we speak of free software, we are referring to freedom of use,\par +not price. Our General Public Licenses are designed to make sure that\par +you have the freedom to distribute copies of free software (and charge\par +for this service if you wish); that you receive source code or can get\par +it if you want it; that you can change the software and use pieces of\par +it in new free programs; and that you are informed that you can do\par +these things.\par +\par + To protect your rights, we need to make restrictions that forbid\par +distributors to deny you these rights or to ask you to surrender these\par +rights. These restrictions translate to certain responsibilities for\par +you if you distribute copies of the library or if you modify it.\par +\par + For example, if you distribute copies of the library, whether gratis\par +or for a fee, you must give the recipients all the rights that we gave\par +you. You must make sure that they, too, receive or can get the source\par +code. If you link other code with the library, you must provide\par +complete object files to the recipients, so that they can relink them\par +with the library after making changes to the library and recompiling\par +it. And you must show them these terms so they know their rights.\par +\par + We protect your rights with a two-step method: (1) we copyright the\par +library, and (2) we offer you this license, which gives you legal\par +permission to copy, distribute and/or modify the library.\par +\par + To protect each distributor, we want to make it very clear that\par +there is no warranty for the free library. Also, if the library is\par +modified by someone else and passed on, the recipients should know\par +that what they have is not the original version, so that the original\par +author's reputation will not be affected by problems that might be\par +introduced by others.\par +\page\par + Finally, software patents pose a constant threat to the existence of\par +any free program. We wish to make sure that a company cannot\par +effectively restrict the users of a free program by obtaining a\par +restrictive license from a patent holder. Therefore, we insist that\par +any patent license obtained for a version of the library must be\par +consistent with the full freedom of use specified in this license.\par +\par + Most GNU software, including some libraries, is covered by the\par +ordinary GNU General Public License. This license, the GNU Lesser\par +General Public License, applies to certain designated libraries, and\par +is quite different from the ordinary General Public License. We use\par +this license for certain libraries in order to permit linking those\par +libraries into non-free programs.\par +\par + When a program is linked with a library, whether statically or using\par +a shared library, the combination of the two is legally speaking a\par +combined work, a derivative of the original library. The ordinary\par +General Public License therefore permits such linking only if the\par +entire combination fits its criteria of freedom. The Lesser General\par +Public License permits more lax criteria for linking other code with\par +the library.\par +\par + We call this license the "Lesser" General Public License because it\par +does Less to protect the user's freedom than the ordinary General\par +Public License. It also provides other free software developers Less\par +of an advantage over competing no... [truncated message content] |
From: <gl...@us...> - 2007-10-28 14:10:41
|
Revision: 1319 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1319&view=rev Author: glslang Date: 2007-10-28 07:10:37 -0700 (Sun, 28 Oct 2007) Log Message: ----------- + merge cleanups and tidy-ups Modified Paths: -------------- trunk/installer/openlibraries_runtime.nsi trunk/installer/openlibraries_sdk.nsi trunk/openlibraries_vc8.sln trunk/src/openimagelib/py/il.cpp trunk/src/openmedialib/plugins/quicktime/quicktime_vc8.vcproj Modified: trunk/installer/openlibraries_runtime.nsi =================================================================== --- trunk/installer/openlibraries_runtime.nsi 2007-10-28 13:35:43 UTC (rev 1318) +++ trunk/installer/openlibraries_runtime.nsi 2007-10-28 14:10:37 UTC (rev 1319) @@ -81,14 +81,14 @@ ;StrCmp $R1 "${VERSION}" 0 +2 ;Abort - ;MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \ - ;"OpenLibraries v${VERSION} is already installed. $\n$\nClick `OK` to remove the \ - ;previous version or `Cancel` to cancel this upgrade." \ + ;MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION + ;"OpenLibraries v${VERSION} is already installed. $\n$\nClick `OK` to remove the + ;previous version or `Cancel` to cancel this upgrade." ;/SD IDOK IDOK uninst ;Abort ;Run the uninstaller - uninst: + ;uninst: ClearErrors ;Start the uninstaller using the option to not copy itself @@ -196,14 +196,14 @@ File "C:\Program Files\FFmpeg\lib\avcodec-51.dll" File "C:\Program Files\FFmpeg\lib\avformat-51.dll" File "C:\Program Files\FFmpeg\lib\avutil-49.dll" - File "C:\Program Files\FFmpeg\lib\libogg-0.dll" +; File "C:\Program Files\FFmpeg\lib\libogg-0.dll" File "C:\OpenEXR\bin\Debug\Half.dll" File "C:\OpenEXR\bin\Debug\Iex.dll" File "C:\OpenEXR\bin\Debug\IlmImf.dll" File "C:\OpenEXR\bin\Debug\Half.dll" File "C:\OpenEXR\bin\Debug\IlmThread.dll" File "C:\OpenEXR\bin\Debug\Imath.dll" - File "C:\SDL-1.2.11\lib\SDL.dll" +; File "C:\SDL-1.2.11\lib\SDL.dll" File "C:\Program Files\NVIDIA Corporation\Cg\bin\cg.dll" File "C:\Program Files\NVIDIA Corporation\Cg\bin\cgGL.dll" File "C:\Windows\system32\msvcp71.dll" @@ -241,9 +241,7 @@ File "..\src\openimagelib\plugins\tga\Multi-threaded Release DLL\openimagelib_tga-vc80-r-${VERSION}.dll" File "..\src\openmedialib\plugins\avformat\avformat_plugin.opl" File "..\src\openmedialib\plugins\avformat\Multi-threaded Release DLL\openmedialib_avformat-vc80-r-${VERSION}.dll" - File "..\src\openmedialib\plugins\glew\glew_plugin.opl" - File "..\src\openmedialib\plugins\glew\Multi-threaded Release DLL\openmedialib_glew-vc80-r-${VERSION}.dll" - File "..\src\openmedialib\plugins\oil\oil_plugin.opl" + File "..\src\openmedialib\plugins\oil\oil_plugin.opl" File "..\src\openmedialib\plugins\oil\Multi-threaded Release DLL\openmedialib_oil-vc80-r-${VERSION}.dll" File "..\src\openmedialib\plugins\openal\openal_plugin.opl" File "..\src\openmedialib\plugins\openal\Multi-threaded Release DLL\openmedialib_openal-vc80-r-${VERSION}.dll" @@ -251,22 +249,18 @@ File "..\src\openmedialib\plugins\gensys\Multi-threaded Release DLL\openmedialib_gensys-vc80-r-${VERSION}.dll" File "..\src\openmedialib\plugins\quicktime\quicktime_plugin.opl" File "..\src\openmedialib\plugins\quicktime\Multi-threaded Release DLL\openmedialib_quicktime-vc80-r-${VERSION}.dll" - File "..\src\openmedialib\plugins\sdl\sdl_plugin.opl" - File "..\src\openmedialib\plugins\sdl\Multi-threaded Release DLL\openmedialib_sdl-vc80-r-${VERSION}.dll" - File "..\src\openobjectlib\plugins\3ds\3ds_plugin.opl" - File "..\src\openobjectlib\plugins\3ds\Multi-threaded Release DLL\openobjectlib_3ds-vc80-r-${VERSION}.dll" +; File "..\src\openmedialib\plugins\sdl\sdl_plugin.opl" +; File "..\src\openmedialib\plugins\sdl\Multi-threaded Release DLL\openmedialib_sdl-vc80-r-${VERSION}.dll" File "..\src\openobjectlib\plugins\obj\obj_plugin.opl" File "..\src\openobjectlib\plugins\obj\Multi-threaded Release DLL\openobjectlib_obj-vc80-r-${VERSION}.dll" File "..\src\openobjectlib\plugins\X3D\x3d_plugin.opl" File "..\src\openobjectlib\plugins\X3D\Multi-threaded Release DLL\openobjectlib_x3d-vc80-r-${VERSION}.dll" - File "..\src\openobjectlib\plugins\Collada\collada_plugin.opl" - File "..\src\openobjectlib\plugins\Collada\Multi-threaded Release DLL\openobjectlib_collada-vc80-r-${VERSION}.dll" +; File "..\src\openobjectlib\plugins\Collada\collada_plugin.opl" +; File "..\src\openobjectlib\plugins\Collada\Multi-threaded Release DLL\openobjectlib_collada-vc80-r-${VERSION}.dll" File "..\src\openeffectslib\plugins\tonemap\tonemap_plugin.opl" File "..\src\openeffectslib\plugins\tonemap\Multi-threaded Release DLL\openeffectslib_tonemap-vc80-r-${VERSION}.dll" - File "..\src\openassetlib\plugins\filesystem_storage_plugin\filesystem_storage_plugin.opl" - File "..\src\openassetlib\plugins\filesystem_storage_plugin\Multi-threaded Release DLL\openassetlib_filesystem-vc80-r-${VERSION}.dll" - File "..\src\openassetlib\plugins\sqlite3_metadata_plugin\sqlite3_metadata_plugin.opl" - File "..\src\openassetlib\plugins\sqlite3_metadata_plugin\Multi-threaded Release DLL\openassetlib_sqlite3-vc80-r-${VERSION}.dll" + File "..\src\openassetlib\plugins\sqlite\sqlite3_metadata_plugin.opl" + File "..\src\openassetlib\plugins\sqlite\Multi-threaded Release DLL\openassetlib_sqlite-vc80-r-${VERSION}.dll" SetOutPath $INSTDIR\shaders File "..\effects\shaders\sepia.cg" Modified: trunk/installer/openlibraries_sdk.nsi =================================================================== --- trunk/installer/openlibraries_sdk.nsi 2007-10-28 13:35:43 UTC (rev 1318) +++ trunk/installer/openlibraries_sdk.nsi 2007-10-28 14:10:37 UTC (rev 1319) @@ -82,14 +82,14 @@ ;StrCmp $R2 "SDK" 0 +2 ;Abort - ;MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \ - ;"OpenLibraries v${VERSION} is already installed. $\n$\nClick `OK` to remove the \ - ;previous version or `Cancel` to cancel this upgrade." \ + ;MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION + ;"OpenLibraries v${VERSION} is already installed. $\n$\nClick `OK` to remove the + ;previous version or `Cancel` to cancel this upgrade. ;/SD IDOK IDOK uninst ;Abort ;Run the uninstaller - uninst: + ;uninst: ClearErrors ;Start the uninstaller using the option to not copy itself @@ -147,7 +147,6 @@ File ..\src\openpluginlib\pl\vectorstringstorage.h SetOutPath $INSTDIR\include\openlibraries-${VERSION_DOT}\openpluginlib\pl\pcos - File ..\src\openpluginlib\pl\pcos\any.hpp File ..\src\openpluginlib\pl\pcos\iproperty_container.hpp File ..\src\openpluginlib\pl\pcos\isubject.hpp File ..\src\openpluginlib\pl\pcos\iclonable.hpp @@ -164,7 +163,6 @@ File ..\src\openimagelib\il\config.hpp File ..\src\openimagelib\il\float_traits.hpp File ..\src\openimagelib\il\il.hpp - File ..\src\openimagelib\il\noise_traits.hpp File ..\src\openimagelib\il\openimagelib_plugin.hpp File ..\src\openimagelib\il\rgb_traits.hpp File ..\src\openimagelib\il\traits.hpp @@ -226,14 +224,14 @@ File "C:\Program Files\FFmpeg\lib\avcodec-51.dll" File "C:\Program Files\FFmpeg\lib\avformat-51.dll" File "C:\Program Files\FFmpeg\lib\avutil-49.dll" - File "C:\Program Files\FFmpeg\lib\libogg-0.dll" +; File "C:\Program Files\FFmpeg\lib\libogg-0.dll" File "C:\OpenEXR\bin\Debug\Half.dll" File "C:\OpenEXR\bin\Debug\Iex.dll" File "C:\OpenEXR\bin\Debug\IlmImf.dll" File "C:\OpenEXR\bin\Debug\Half.dll" File "C:\OpenEXR\bin\Debug\IlmThread.dll" File "C:\OpenEXR\bin\Debug\Imath.dll" - File "C:\SDL-1.2.12\lib\SDL.dll" +; File "C:\SDL-1.2.12\lib\SDL.dll" File "C:\Program Files\NVIDIA Corporation\Cg\bin\cg.dll" File "C:\Program Files\NVIDIA Corporation\Cg\bin\cgGL.dll" File "C:\Windows\system32\msvcp71.dll" @@ -287,42 +285,28 @@ File "..\src\openimagelib\plugins\sgi\Multi-threaded Debug DLL\openimagelib_sgi-vc80-d-${VERSION}.dll" File "..\src\openimagelib\plugins\tga\tga_plugin.opl" File "..\src\openimagelib\plugins\tga\Multi-threaded Debug DLL\openimagelib_tga-vc80-d-${VERSION}.dll" - File "..\src\openimagelib\plugins\qim\qim_plugin.opl" - File "..\src\openimagelib\plugins\qim\Multi-threaded Debug DLL\openimagelib_qim-vc80-d-${VERSION}.dll" File "..\src\openmedialib\plugins\avformat\avformat_plugin.opl" File "..\src\openmedialib\plugins\avformat\Multi-threaded Debug DLL\openmedialib_avformat-vc80-d-${VERSION}.dll" - File "..\src\openmedialib\plugins\glew\glew_plugin.opl" - File "..\src\openmedialib\plugins\glew\Multi-threaded Debug DLL\openmedialib_glew-vc80-d-${VERSION}.dll" File "..\src\openmedialib\plugins\oil\oil_plugin.opl" File "..\src\openmedialib\plugins\oil\Multi-threaded Debug DLL\openmedialib_oil-vc80-d-${VERSION}.dll" File "..\src\openmedialib\plugins\openal\openal_plugin.opl" File "..\src\openmedialib\plugins\openal\Multi-threaded Debug DLL\openmedialib_openal-vc80-d-${VERSION}.dll" - File "..\src\openmedialib\plugins\template\template_plugin.opl" - File "..\src\openmedialib\plugins\template\Multi-threaded Debug DLL\openmedialib_template-vc80-d-${VERSION}.dll" File "..\src\openmedialib\plugins\gensys\gensys_plugin.opl" File "..\src\openmedialib\plugins\gensys\Multi-threaded Debug DLL\openmedialib_gensys-vc80-d-${VERSION}.dll" File "..\src\openmedialib\plugins\quicktime\quicktime_plugin.opl" File "..\src\openmedialib\plugins\quicktime\Multi-threaded Debug DLL\openmedialib_quicktime-vc80-d-${VERSION}.dll" - File "..\src\openmedialib\plugins\sdl\sdl_plugin.opl" - File "..\src\openmedialib\plugins\sdl\Multi-threaded Debug DLL\openmedialib_sdl-vc80-d-${VERSION}.dll" - File "..\src\openobjectlib\plugins\3ds\3ds_plugin.opl" - File "..\src\openobjectlib\plugins\3ds\Multi-threaded Debug DLL\openobjectlib_3ds-vc80-d-${VERSION}.dll" - File "..\src\openobjectlib\plugins\model\model_plugin.opl" - File "..\src\openobjectlib\plugins\model\Multi-threaded Debug DLL\openobjectlib_model-vc80-d-${VERSION}.dll" +; File "..\src\openmedialib\plugins\sdl\sdl_plugin.opl" +; File "..\src\openmedialib\plugins\sdl\Multi-threaded Debug DLL\openmedialib_sdl-vc80-d-${VERSION}.dll" File "..\src\openobjectlib\plugins\obj\obj_plugin.opl" File "..\src\openobjectlib\plugins\obj\Multi-threaded Debug DLL\openobjectlib_obj-vc80-d-${VERSION}.dll" - File "..\src\openobjectlib\plugins\tsto\tsto_plugin.opl" - File "..\src\openobjectlib\plugins\tsto\Multi-threaded Debug DLL\openobjectlib_tsto-vc80-d-${VERSION}.dll" File "..\src\openobjectlib\plugins\X3D\x3d_plugin.opl" File "..\src\openobjectlib\plugins\X3D\Multi-threaded Debug DLL\openobjectlib_x3d-vc80-d-${VERSION}.dll" - File "..\src\openobjectlib\plugins\Collada\collada_plugin.opl" - File "..\src\openobjectlib\plugins\Collada\Multi-threaded Debug DLL\openobjectlib_collada-vc80-d-${VERSION}.dll" +; File "..\src\openobjectlib\plugins\Collada\collada_plugin.opl" +; File "..\src\openobjectlib\plugins\Collada\Multi-threaded Debug DLL\openobjectlib_collada-vc80-d-${VERSION}.dll" File "..\src\openeffectslib\plugins\tonemap\tonemap_plugin.opl" File "..\src\openeffectslib\plugins\tonemap\Multi-threaded Debug DLL\openeffectslib_tonemap-vc80-d-${VERSION}.dll" - File "..\src\openassetlib\plugins\filesystem_storage_plugin\filesystem_storage_plugin.opl" - File "..\src\openassetlib\plugins\filesystem_storage_plugin\Multi-threaded Debug DLL\openassetlib_filesystem-vc80-d-${VERSION}.dll" - File "..\src\openassetlib\plugins\sqlite3_metadata_plugin\sqlite3_metadata_plugin.opl" - File "..\src\openassetlib\plugins\sqlite3_metadata_plugin\Multi-threaded Debug DLL\openassetlib_sqlite3-vc80-d-${VERSION}.dll" + File "..\src\openassetlib\plugins\sqlite\sqlite3_metadata_plugin.opl" + File "..\src\openassetlib\plugins\sqlite\Multi-threaded Debug DLL\openassetlib_sqlite-vc80-d-${VERSION}.dll" SetOutPath $INSTDIR\plugins\release File "..\src\openimagelib\plugins\3D_lightmap\3D_lightmap_plugin.opl" @@ -341,44 +325,30 @@ File "..\src\openimagelib\plugins\sgi\Multi-threaded Release DLL\openimagelib_sgi-vc80-r-${VERSION}.dll" File "..\src\openimagelib\plugins\tga\tga_plugin.opl" File "..\src\openimagelib\plugins\tga\Multi-threaded Release DLL\openimagelib_tga-vc80-r-${VERSION}.dll" - File "..\src\openimagelib\plugins\qim\qim_plugin.opl" - File "..\src\openimagelib\plugins\qim\Multi-threaded Release DLL\openimagelib_qim-vc80-r-${VERSION}.dll" File "..\src\openmedialib\plugins\avformat\avformat_plugin.opl" File "..\src\openmedialib\plugins\avformat\Multi-threaded Release DLL\openmedialib_avformat-vc80-r-${VERSION}.dll" ;File "..\src\openmedialib\plugins\dshow\dshow_plugin.opl" ;File "..\src\openmedialib\plugins\dshow\Multi-threaded Release DLL\openmedialib_dshow-vc80-r-${VERSION}.dll" - File "..\src\openmedialib\plugins\glew\glew_plugin.opl" - File "..\src\openmedialib\plugins\glew\Multi-threaded Release DLL\openmedialib_glew-vc80-r-${VERSION}.dll" File "..\src\openmedialib\plugins\oil\oil_plugin.opl" File "..\src\openmedialib\plugins\oil\Multi-threaded Release DLL\openmedialib_oil-vc80-r-${VERSION}.dll" File "..\src\openmedialib\plugins\openal\openal_plugin.opl" File "..\src\openmedialib\plugins\openal\Multi-threaded Release DLL\openmedialib_openal-vc80-r-${VERSION}.dll" - File "..\src\openmedialib\plugins\template\template_plugin.opl" - File "..\src\openmedialib\plugins\template\Multi-threaded Release DLL\openmedialib_template-vc80-r-${VERSION}.dll" File "..\src\openmedialib\plugins\gensys\gensys_plugin.opl" File "..\src\openmedialib\plugins\gensys\Multi-threaded Release DLL\openmedialib_gensys-vc80-r-${VERSION}.dll" File "..\src\openmedialib\plugins\quicktime\quicktime_plugin.opl" File "..\src\openmedialib\plugins\quicktime\Multi-threaded Release DLL\openmedialib_quicktime-vc80-r-${VERSION}.dll" - File "..\src\openmedialib\plugins\sdl\sdl_plugin.opl" - File "..\src\openmedialib\plugins\sdl\Multi-threaded Release DLL\openmedialib_sdl-vc80-r-${VERSION}.dll" - File "..\src\openobjectlib\plugins\3ds\3ds_plugin.opl" - File "..\src\openobjectlib\plugins\3ds\Multi-threaded Release DLL\openobjectlib_3ds-vc80-r-${VERSION}.dll" - File "..\src\openobjectlib\plugins\model\model_plugin.opl" - File "..\src\openobjectlib\plugins\model\Multi-threaded Release DLL\openobjectlib_model-vc80-r-${VERSION}.dll" +; File "..\src\openmedialib\plugins\sdl\sdl_plugin.opl" +; File "..\src\openmedialib\plugins\sdl\Multi-threaded Release DLL\openmedialib_sdl-vc80-r-${VERSION}.dll" File "..\src\openobjectlib\plugins\obj\obj_plugin.opl" File "..\src\openobjectlib\plugins\obj\Multi-threaded Release DLL\openobjectlib_obj-vc80-r-${VERSION}.dll" - File "..\src\openobjectlib\plugins\tsto\tsto_plugin.opl" - File "..\src\openobjectlib\plugins\tsto\Multi-threaded Release DLL\openobjectlib_tsto-vc80-r-${VERSION}.dll" File "..\src\openobjectlib\plugins\X3D\x3d_plugin.opl" File "..\src\openobjectlib\plugins\X3D\Multi-threaded Release DLL\openobjectlib_x3d-vc80-r-${VERSION}.dll" - File "..\src\openobjectlib\plugins\Collada\collada_plugin.opl" - File "..\src\openobjectlib\plugins\Collada\Multi-threaded Release DLL\openobjectlib_collada-vc80-r-${VERSION}.dll" +; File "..\src\openobjectlib\plugins\Collada\collada_plugin.opl" +; File "..\src\openobjectlib\plugins\Collada\Multi-threaded Release DLL\openobjectlib_collada-vc80-r-${VERSION}.dll" File "..\src\openeffectslib\plugins\tonemap\tonemap_plugin.opl" File "..\src\openeffectslib\plugins\tonemap\Multi-threaded Release DLL\openeffectslib_tonemap-vc80-r-${VERSION}.dll" - File "..\src\openassetlib\plugins\filesystem_storage_plugin\filesystem_storage_plugin.opl" - File "..\src\openassetlib\plugins\filesystem_storage_plugin\Multi-threaded Release DLL\openassetlib_filesystem-vc80-r-${VERSION}.dll" - File "..\src\openassetlib\plugins\sqlite3_metadata_plugin\sqlite3_metadata_plugin.opl" - File "..\src\openassetlib\plugins\sqlite3_metadata_plugin\Multi-threaded Release DLL\openassetlib_sqlite3-vc80-r-${VERSION}.dll" + File "..\src\openassetlib\plugins\sqlite\sqlite3_metadata_plugin.opl" + File "..\src\openassetlib\plugins\sqlite\Multi-threaded Release DLL\openassetlib_sqlite-vc80-r-${VERSION}.dll" SetOutPath $INSTDIR\shaders File "..\effects\shaders\sepia.cg" Modified: trunk/openlibraries_vc8.sln =================================================================== --- trunk/openlibraries_vc8.sln 2007-10-28 13:35:43 UTC (rev 1318) +++ trunk/openlibraries_vc8.sln 2007-10-28 14:10:37 UTC (rev 1319) @@ -376,6 +376,16 @@ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "avformat", "src\openmedialib\plugins\avformat\avformat_vc8.vcproj", "{0C4F7499-83C6-4143-A392-56F299345E8A}" + ProjectSection(ProjectDependencies) = postProject + {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openal", "src\openmedialib\plugins\openal\openal_vc8.vcproj", "{68B4BE77-E59E-4A24-9AF5-D4CEFF132B51}" + ProjectSection(ProjectDependencies) = postProject + {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Multi-threaded Debug DLL|Win32 = Multi-threaded Debug DLL|Win32 @@ -606,6 +616,14 @@ {B2F0E6E4-4EA9-45BD-9CD9-E1B9A57E4E91}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32 {B2F0E6E4-4EA9-45BD-9CD9-E1B9A57E4E91}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32 {B2F0E6E4-4EA9-45BD-9CD9-E1B9A57E4E91}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32 + {0C4F7499-83C6-4143-A392-56F299345E8A}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32 + {0C4F7499-83C6-4143-A392-56F299345E8A}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32 + {0C4F7499-83C6-4143-A392-56F299345E8A}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32 + {0C4F7499-83C6-4143-A392-56F299345E8A}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32 + {68B4BE77-E59E-4A24-9AF5-D4CEFF132B51}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32 + {68B4BE77-E59E-4A24-9AF5-D4CEFF132B51}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32 + {68B4BE77-E59E-4A24-9AF5-D4CEFF132B51}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32 + {68B4BE77-E59E-4A24-9AF5-D4CEFF132B51}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -672,6 +690,8 @@ {A60E2710-2DA9-4641-AEF6-6488A6264723} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8} {C29BD9EC-EC1B-4D7F-8985-F85698CE66ED} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8} {1AC3D22B-175B-4169-B74A-276F9D5BA7AB} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8} + {0C4F7499-83C6-4143-A392-56F299345E8A} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8} + {68B4BE77-E59E-4A24-9AF5-D4CEFF132B51} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8} {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {BD86F550-C573-4A68-955B-6CEDCC8F595D} {AE1793B8-18EA-4277-BFDD-8C9F2AFA0096} = {9483FC7B-E396-43E6-84ED-EB021AC54252} {7A98C731-F651-4427-BD02-25133DEA7171} = {9483FC7B-E396-43E6-84ED-EB021AC54252} Modified: trunk/src/openimagelib/py/il.cpp =================================================================== --- trunk/src/openimagelib/py/il.cpp 2007-10-28 13:35:43 UTC (rev 1318) +++ trunk/src/openimagelib/py/il.cpp 2007-10-28 14:10:37 UTC (rev 1319) @@ -1,4 +1,3 @@ -/* -*- tab-width: 4; indent-tabs-mode: t -*- */ // il - A image library representation. Modified: trunk/src/openmedialib/plugins/quicktime/quicktime_vc8.vcproj =================================================================== --- trunk/src/openmedialib/plugins/quicktime/quicktime_vc8.vcproj 2007-10-28 13:35:43 UTC (rev 1318) +++ trunk/src/openmedialib/plugins/quicktime/quicktime_vc8.vcproj 2007-10-28 14:10:37 UTC (rev 1319) @@ -156,7 +156,7 @@ OutputFile="$(OutDir)\openmedialib_quicktime-vc80-r-0_5_0.dll" LinkIncremental="1" AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)";"C:\Program Files\QuickTime SDK\Libraries"" - IgnoreDefaultLibraryNames="libcmt.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gl...@us...> - 2007-10-28 15:23:12
|
Revision: 1320 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1320&view=rev Author: glslang Date: 2007-10-28 08:23:10 -0700 (Sun, 28 Oct 2007) Log Message: ----------- + merge cleanups and tidy-ups Added Paths: ----------- trunk/doc/ trunk/doc/CodingGuidelines.html trunk/doc/Installation.html trunk/doc/ReleaseNotes.html trunk/doc/oml.odt trunk/src/openmedialib/plugins/directshow/ trunk/src/openmedialib/plugins/directshow/config.hpp trunk/src/openmedialib/plugins/directshow/directshow_plugin.cpp trunk/src/openmedialib/plugins/directshow/directshow_plugin.hpp trunk/src/openmedialib/plugins/directshow/directshow_plugin.opl trunk/src/openmedialib/plugins/directshow/directshow_vc8.vcproj trunk/src/openmedialib/plugins/sdl/ trunk/src/openmedialib/plugins/sdl/Makefile.am trunk/src/openmedialib/plugins/sdl/sdl_plugin.cpp trunk/src/openmedialib/plugins/sdl/sdl_plugin.opl trunk/src/openmedialib/plugins/sdl/sdl_vc8.vcproj trunk/src/openobjectlib/plugins/Collada/ trunk/src/openobjectlib/plugins/Collada/Collada_vc8.vcproj trunk/src/openobjectlib/plugins/Collada/Makefile.am trunk/src/openobjectlib/plugins/Collada/actions/ trunk/src/openobjectlib/plugins/Collada/actions/dae_parser_action.cpp trunk/src/openobjectlib/plugins/Collada/actions/dae_parser_action.hpp trunk/src/openobjectlib/plugins/Collada/collada_plugin.opl trunk/src/openobjectlib/plugins/Collada/config.hpp trunk/src/openobjectlib/plugins/Collada/dae.cpp trunk/src/openobjectlib/plugins/Collada/dae_content_handler_libxml.cpp trunk/src/openobjectlib/plugins/Collada/dae_content_handler_libxml.hpp trunk/src/openobjectlib/plugins/Collada/dae_content_handler_msxml.cpp trunk/src/openobjectlib/plugins/Collada/dae_content_handler_msxml.hpp trunk/src/openobjectlib/plugins/Collada/dae_plugin.cpp trunk/src/openobjectlib/plugins/Collada/dae_plugin.hpp trunk/src/openobjectlib/plugins/Collada/xml_value_tokenizer.hpp Added: trunk/doc/CodingGuidelines.html =================================================================== --- trunk/doc/CodingGuidelines.html (rev 0) +++ trunk/doc/CodingGuidelines.html 2007-10-28 15:23:10 UTC (rev 1320) @@ -0,0 +1,139 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Strict//EN" "http://www.w3.org/TR/html4/strict.dtd"> +<html> +<head> + <title>OpenLibraries</title> + <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> + <meta name="GENERATOR" content="Quanta Plus"> +</head> +<body> + +<h1 align="center"> + OpenLibraries Coding Guidelines</h1> +<br> +<ol> + <li><a href="#intro">About</a></li> + <li><a href="#dependencies">Dependencies</a></li><li><a href="#repository">Repository Structure</a></li> + <li><a href="#start">Getting Started</a></li> + <li><a href="#trouble">Coding Conventions</a></li> + <li><a href="#faq">FAQ</a></li> +</ol> + +<h2><a name="intro">1. About</a></h2> + +<p>Welcome to the OpenLibraries! A unified framework to develop real-time editing, + visual effects and rich-media applications.</p> + <p> + OpenLibraries are free to be applied for any purpose, including commercial usage and +distribution. It's open-source software, released under LGPL. OpenLibraries + are a true community effort and anyone is welcome to participate. This document + describe some of the guidelines that the OpenLibraries team uses when developing + the code. They are not exhaustive and they don't take away your freedom of expression + when writing code. This document does not tell you where to put your curly braces. + It simply describes a simple set of conventions to allow for proper usage of CVS + and development of openlibraries aware code.</p> + +<p align="right"><a href="#top">back to top</a></p> + +<h2><a name="dependencies">2. Dependencies</a></h2> + <p> + The libraries depend heavily + on <a href="http://www.boost.org">Boost</a> and <a href="http://glew.sourceforge.net"> + GLEW</a>. RPMS for these dependencies are provided and they should be used. + The module dependencies in CVS contains the RPM spec files to build these RPMS. + However, other versions of Boost may be used for development and this is left to + the discretion of the programmer. It is recommended, however, that the latest versions + be used.</p> + <h3> + </h3> + + +<p align="right"><a href="#top">back to top</a></p> + +<h2><a name="repository">3. Repository Structure</a></h2> + <p> + The repository directory structure has src, test and doc directories. The top level + directory is for exclusive access of build scripts and global configuration files. + All the development should happen in the src directory under a library name directory + (e.g. src/openobjectlib). The developer manages the directory structure after that. + All unit tests will go into the test directory under a library name directory (e.g. + test/openobjectlib). The doc directory follows the same conventions and it should + hold users and developers guide for each of the libraries. Remember, lack of documentation + prevents adoption. Proper usage of CVS must be respected at all times. Code not + following these conventions will be deleted without warning. Also, it is illegal + to share CVS sanboxes between multiple OS due to well known end of line characters + translation issues.</p> + <p style="text-align: right"> + <a href="#top">back to top</a></p> + <h2> + 4<a name="start">. Getting Started</a></h2> + <p> + To build the libraries Visual Studio solution files, XCode 2.1 projects, and autoconf + based scripts are provided depending on each platform. + The best way of getting started as a developer is to download the source code and + have a look at the test directory to see how they are being used. It is our intention + to provide full developer documentation. Although much code has been written some + of it is not fully featured and is effectively entry point code for add-ons and + more advanced features (this is where you come + in!). Eventually all of it will be written hopefully with the + help of community effort.</p> + <p> + <strong>Source: </strong>source code tarballs are available from the OpenLibraries + SourceForge web site and the source code can also be downloaded from the CVS repository:</p> + <ol> + <li>cvs -z3 -d :pserver:ano...@cv...:/cvsroot/openlibraries login</li> + <li>cvs -z3 -d:pserver:ano...@cv...:/cvsroot/openlibraries co -P openlibraries</li> + </ol> + <p> + or, if running on Windows, with a CVS client such as TortoiseCVS.</p> + <p> + To build the libraries Visual Studio solution files, XCode 2.1 projects, and autoconf + based scripts are provided depending on each platform. Also, and to minimise the + number of dependencies, and elusive ports of external code to different platforms, + the OpenLibraries strive to use as much native functionality as possible. Currently + there is no unified build process on all platforms. On Linux, OpenLibraries make + use of the GOAT tools to manage the detection of platform characteristics and the + generation of Makefiles. On Windows, Visual Studio is being used and different libraries + have different solution files. At this point in time they will have to be built + separately in order of dependencies. On OSX, XCode 2.1 projects exist and xcodebuild + is used. In the future, however, scripts will be made available to simplify the + build process, but they will still depend on the native tools of each platform.</p> + <h3> + </h3> + +<p align="right"><a href="#top">back to top</a></p> + <h2> + 5<a name="trouble">. Coding Conventions</a></h2> + <p> + There are no strict coding conventions. The programmer is free to use its existing + conventions with a few exceptions. All OpenLibraries related source includes by + means of #include will be of the form #include <name_of_library/whatever>. + This allows us to keep the number of include directories specified on the command + line to a bare minimum. It will avoid conflicts between files with the same name + and has the potential to speed up compilation times. Namespaces are of the form + namespace olib { namespace library_name {. The programmer will manage its other + namespaces under this structure at will. Visual Studio solution files also follow + a particular set of conventions. The VC runtime is always the DLL multithreaded + version and the configuration name is Multi-threaded Debug DLL or Multi-threaded + Release DLL. Please check the openobjectlib for examples.</p> + <h2> + <a name="faq">6. FAQ</a></h2> + +<ol> + <li><span style="color: #0000ff; text-decoration: underline">What's the relationship + between Jahshaka and OpenLibraries?</span> </li> +</ol> + +<h3> + What's the relationship between Jahshaka and the OpenLibraries?<a name="faq_1">:</a></h3> + We're it! The OpenLibraries project forms the technological foundation for Jahshaka.<br /> + <br /> + +<hr> +<p>Thanks for reading, we hope you enjoy the OpenLibraries project!</p> + +<p><font size=-1>Document version 1.0, November 2005</font></p> + +<p align="right"><a href="#top">back to top</a></p> + +</body> +</html> Property changes on: trunk/doc/CodingGuidelines.html ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/doc/Installation.html =================================================================== --- trunk/doc/Installation.html (rev 0) +++ trunk/doc/Installation.html 2007-10-28 15:23:10 UTC (rev 1320) @@ -0,0 +1,144 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Strict//EN" "http://www.w3.org/TR/html4/strict.dtd"> +<html> + <head> + <title>OpenLibraries</title> + <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> + <meta name="GENERATOR" content="Quanta Plus"> + </head> + <body> + <h1 align="center"> + OpenLibraries Installation from Source Notes</h1> + <br> + <OL> + <li> + <a href="#intro">About</a> + <li> + <span style="COLOR: #0000ff; TEXT-DECORATION: underline">Download</span><a href="#pack"> + and Installation</a></li></OL> + <h2><a name="intro">1. About</a></h2> + <p>Welcome to the OpenLibraries! A unified framework to develop real-time editing, + visual effects and rich-media applications.</p> + <p> + OpenLibraries are free to be applied for any purpose, including commercial + usage and distribution. It's open-source software, released under LGPL. + OpenLibraries are a true community effort and anyone is welcome to participate.</p> + <p align="right"><a href="#top">back to top</a></p> + <h2><a name="pack">2. Download and Install</a>ation</h2> + <h3> + </h3> + <h3> + Downloading:</h3> + <p> + Installers for Windows and Linux distributions such as Fedora Core 4 and SUSE + 10 are available from both the OpenLibraries web site <a href="http://www.openlibraries.org"> + http://www.openlibraries.org</a> and from the OpenLibraries SourceForge web + site. Other distributions can use the src rpm or a tarball. The OpenLibraries + have hard (must be satisfied) dependencies on Boost (version 1.34) (<A href="http://www.boost.org">www.boost.org</A>) + and GLEW (<A href="http://glew.sourceforge.net">glew.sourceforge.net</A>). + These must be installed prior to OpenLibraries compilation. OpenLibraries + assumes, on Windows, these libraries are installed on its default locations (as + set by the respective projects). For reference purposes, GLEW goes into the + appropriate Visual Studio directory and Boost is installed in C:\Boost.</p> + <P>The plugins that are being provided have dependencies on other libraries. A + complete list is (in no particular order):</P> + <OL> + <LI> + NVIDIA's Cg 1.4</LI> + <LI> + FFMpeg</LI> + <LI> + Autodesk FBX SDK 200508</LI> + <LI> + NVIDIA Gelato</LI> + <LI> + OpenAL</LI></OL> + <P>Some of these dependencies can be disabled by either disabling the respective + project in the sln file or undefining the preprocessor symbol that controls its + inclusion (to be moved into a user_config.hpp file).</P> + <P>OpenLibraries source code can be accessed from its SourceForge (<A href="http://www.sf.net">www.sf.net</A>) + repository. For anonymous access,</P> + <OL> + <LI> + cvs -z3 -d :pserver:ano...@cv...:/cvsroot/openlibraries login + <LI> + cvs -z3 -d:pserver:ano...@cv...:/cvsroot/openlibraries co -P + openlibraries + </LI> + </OL> + <P>or, if running on Windows, with a CVS client such as TortoiseCVS.</P> + <h3> + Compilation <a name="start_install"> notes:</a></h3> + <p><b>Windows:</b> The current build system on Windows is based on Microsoft Visual + Studio. The official version of the Visual Studio compiler supported by the + OpenLibraries is 7.1 (or .NET 2003). However, OpenLibraries has build support + for VC8 and Intel 9. There is a VC sln file for each of the libraries. The + reason being is easy to manage per developer and minimises CVS conflicts. The + libraries have dependencies between each other and therefore must be built in + the appropriate order. In the future, a build script will be provided based on + VCBuildTool to automate this procedure. The current order to build the + libraries is the following:</p> + <OL> + <LI> + OpenPluginLib + <LI> + OpenImageLib + <LI> + OpenMediaLib + <LI> + OpenObjectLib + <LI> + OpenEffectsLib + <LI> + OpenAssetLib</LI></OL> + <P>The OpenMediaLib has further dependencies on FFmpeg (<A href="http://ffmpeg.sourceforge.net">ffmpeg.sourceforge.net</A>) and + OpenAL (<A href="http://www.openal.org">www.openal.org</A>). OpenEffectsLib and + OpenObjectLib also depend on NVIDIA's Cg toolkit (<A href="http://developer.nvidia.com/page/cg_main.html">developer.nvidia.com/page/cg_main.html</A>). + The version is 1.4 (or any of its release candidates).</P> + <P>Installation on Windows is based on NSIS (<A href="http://nsis.sourceforge.net">nsis.sourceforge.net</A>). + Unfortunately, the NSIS build is still not functional (it will be very soon) so + the installation is a bit broken at the moment. However, and to run the + unit tests (and this includes the OpenLibraries media player) all of the + libraries main *.dlls need to be copied onto the working directory of the test + or somewhere in your PATH variable. Each plugin has its own XML description + file. This is due to how the build system is set and not a limitation of the + OpenPluginLib itself. Nothing prevents the use of a single XML file and binary + installation will rely on a single XML file on Windows in the future. For each + unit test there is a plugins directory onto which the plugins *.opl files and + *.dll files must be copied. This is needed since the unit tests on Windows rely + on a particular path to discover and initialise the plugins. Applications based + on the OpenLibraries will use the installed one and plugin discovery will be + based on the installed directory.</P> + <p><b>Linux:</b> The Linux build uses the standard autoconf and automake tools. + Installations (from CVS) must first call the bootstrap script, followed by + configure. To compile do a make. Installation is done by a make install. + All the usual configure script options are available. Some custom options may + have to be specified depending on your linux distribution and package setup. + The options --with-boostprefix, --with--boostversion and --with-boosttoolset. + For example, with boost 1.34 in /usr/local and gcc, use --with-boostprefix= + /usr/local --with-boostversion= 1_34 --with-boosttoolset= gcc. A make check + will compile the unit tests. You can test the libraries functionality by + running these tests.</p> + <P><b>OSX:</b> Not all OpenLibraries are currently supported on Tiger (10.4). + However, the build system is also be based on XCode 2.2. Needless to say + the OSX platform is fully supported.</P> + <P> + <br> + Currently, in CVS you can find a unit test used to exercise the OpenMediaLib + player functionality. It is called store and can be found in test/openmedialib. + The syntax for the player is the following: store < input > < store + > where input is any string which can be mapped to an installed plugin (for + example, file.avi, file.mpg, /path/*.jpg/sequence: etc) and store is any string + which can be mapped to an installed store (for example, glew:, caca:, openal:, + file.jpg/sequence: etc).</P> + <P>There is a more comprehensive player example called qtplayer which has to be + manually built and uses the QT toolkit. To build it, you need to change + directory to test/openmedialib/qtplayer and run qmake && make. The + usage is simply ./qtplayer [ < input > ].</P> + <P> + <hr> + <P></P> + <p>Thanks for reading, we hope you enjoy the OpenLibraries project!</p> + <p><font size="-1">Document version 1.0, 11 January 2006</font></p> + <p align="right"><a href="#top">back to top</a></p> + </body> +</html> Property changes on: trunk/doc/Installation.html ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/doc/ReleaseNotes.html =================================================================== --- trunk/doc/ReleaseNotes.html (rev 0) +++ trunk/doc/ReleaseNotes.html 2007-10-28 15:23:10 UTC (rev 1320) @@ -0,0 +1,142 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Strict//EN" "http://www.w3.org/TR/html4/strict.dtd"> +<html> +<head> + <title>OpenLibraries</title> + <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> + <meta name="GENERATOR" content="Quanta Plus"> +</head> +<body> + +<h1 align="center"> + OpenLibraries v0.1.0 Release Notes</h1> +<br> +<ol> + <li><a href="#intro">About</a></li> + <li><span style="color: #0000ff; text-decoration: underline">Download</span><a href="#pack"> + and Installation</a></li><li><a href="#start">Getting Started</a></li><li><a href="#trouble">Troubleshooting</a></li> + <li><a href="#faq">FAQ</a></li> +</ol> + +<h2><a name="intro">1. About</a></h2> + +<p>Welcome to the OpenLibraries! A unified framework to develop real-time editing, + visual effects and rich-media applications.</p> + <p> + OpenLibraries are free to be applied for any purpose, including commercial usage and +distribution. It's open-source software, released under LGPL. OpenLibraries + are a true community effort and anyone is welcome to participate.</p> + +<p align="right"><a href="#top">back to top</a></p> + +<h2><a name="pack">2. Download and Install</a>ation</h2> + <h3> + </h3> + +<h3> + Downloading:</h3> + <p> + Installers for Windows and Linux distributions such as Fedora Core 4 and SUSE 10 + are available from both the OpenLibraries web site <a href="http://www.openlibraries.org"> + http://www.openlibraries.org</a> and from the OpenLibraries SourceForge web + site. Other distributions can use the src rpm or a tarball.</p> + <h3> + <a name="start_install">Installation notes:</a></h3> + +<p><b>Windows:</b> the .msi installer handles both the runtime and development environment + needed to run applications based on the OpenLibraries. Additionally, it sets your + PATH environment variable. The installer is self contained and it doesn't install + any files outside its installation directory.</p> + +<p><b>Linux:</b> the linux RPMs can be used to install both the runtime and development + versions. Additionally, an optional RPM is available that includes sample media + files.</p> + +<p><b>OSX:</b> there is no installer for OSX, although the OpenLibraries are supported + on Tiger (10.4).</p> + +<p> + <strong>Source: </strong>source code tarballs are available from the OpenLibraries + SourceForge web site and the source code can also be downloaded from the CVS repository:</p> + <ol> + <li>cvs -z3 -d :pserver:ano...@cv...:/cvsroot/openlibraries login</li> + <li>cvs -z3 -d:pserver:ano...@cv...:/cvsroot/openlibraries co -P openlibraries</li> + </ol> + <p> + or, if running on Windows, with a CVS client such as TortoiseCVS.</p> + <p> + To build the libraries Visual Studio solution files, XCode 2.1 projects, and autoconf + based scripts are provided depending on each platform. The libraries depend heavily + on <a href="http://www.boost.org">Boost</a> and <a href="http://glew.sourceforge.net"> + GLEW</a>.</p> + <p> + </p> + <p> + </p> + <p> + </p> + + +<p align="right"><a href="#top">back to top</a></p> + +<h2><a name="start">3. Getting Started</a></h2> + <p> + The best way of getting started as a developer is to download the source code and + have a look at the test directory to see how they are being used. It is our intention + to provide full developer documentation. Although much code has been written some + of it is not fully featured and is effectively entry point code for add-ons and + more advanced features. Eventually all of it will be written hopefully with the + help of community effort.</p> + <h3> + </h3> + +<p align="right"><a href="#top">back to top</a></p> + +<h2><a name="trouble">5. Troubleshooting</a></h2> + +<h3><a name="trouble_bugt">The Bug Tracker</a></h3> + +<p> + All bug reports will be followed and taken very seriously. There is no excuse for + not reporting a bug. If something doesn't work tell us using the bug tracker in SourceForge + or in the OpenLibraries web site forums.</p> + <h3> + The Fixed Function Pipeline</h3> + <p> + The OpenLibraries was primarily designed to take advantage of modern GPUs. +Most of its functionality is based on programmable shaders, most notably by means of + the OpenGL Shading Language and in the future Cg and CgFX. However, there is initial + support to fallback to the fixed function pipeline when possible. Initial means + that some functionality may not be available or simply buggy. Please help us fix these problems by submitting patches (the best way of solving bugs), or your original + files or test samples that cause the erratic behaviour.</p> + <h3> + </h3> + <h3> + </h3> + <h3> + </h3> + <h3> + </h3> + +<p align="right"><a href="#top">back to top</a></p> + +<h2><a name="faq">6. FAQ</a></h2> + +<ol> + <li><span style="color: #0000ff; text-decoration: underline">What's the relationship + between Jahshaka and OpenLibraries?</span> </li> +</ol> + +<h3> + What's the relationship between Jahshaka and the OpenLibraries?<a name="faq_1">:</a></h3> + We're it! The OpenLibraries project forms the technological foundation for Jahshaka.<br /> + <br /> + +<hr> +<p>Thanks for reading, we hope you enjoy the OpenLibraries project!</p> + +<p><font size=-1>Document version 1.0, November 2005</font></p> + +<p align="right"><a href="#top">back to top</a></p> + +</body> +</html> Property changes on: trunk/doc/ReleaseNotes.html ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/doc/oml.odt =================================================================== (Binary files differ) Property changes on: trunk/doc/oml.odt ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/openmedialib/plugins/directshow/config.hpp =================================================================== --- trunk/src/openmedialib/plugins/directshow/config.hpp (rev 0) +++ trunk/src/openmedialib/plugins/directshow/config.hpp 2007-10-28 15:23:10 UTC (rev 1320) @@ -0,0 +1,24 @@ +// config.hpp for filesystem storage plugin +// +// Copyright (C) 2005-2006 VM Inc. +// Released under the LGPL. +// For more information, see http://www.openlibraries.org. + +#ifndef FILESYSTEM_STORAGE_PLUGIN_CONFIG_INC_ +#define FILESYSTEM_STORAGE_PLUGIN_CONFIG_INC_ + +#ifdef WIN32 +# ifdef FILESYSTEM_STORAGE_PLUGIN_EXPORTS +# define AL_FILESYSTEM_DECLSPEC __declspec( dllexport ) +# else +# define AL_FILESYSTEM_DECLSPEC __declspec( dllimport ) +# endif +#else +# ifdef FILESYSTEM_STORAGE_PLUGIN_EXPORTS +# define AL_FILESYSTEM_DECLSPEC extern +# else +# define AL_FILESYSTEM_DECLSPEC +# endif +#endif + +#endif Property changes on: trunk/src/openmedialib/plugins/directshow/config.hpp ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/src/openmedialib/plugins/directshow/directshow_plugin.cpp =================================================================== --- trunk/src/openmedialib/plugins/directshow/directshow_plugin.cpp (rev 0) +++ trunk/src/openmedialib/plugins/directshow/directshow_plugin.cpp 2007-10-28 15:23:10 UTC (rev 1320) @@ -0,0 +1,1798 @@ +// directshow_plugin.cpp +// +// Copyright (C) 2005-2006 VM Inc. +// Released under the LGPL. +// For more information, see http://www.openlibraries.org. + +#pragma warning ( push ) +#pragma warning ( disable: 4251 ) + +#include <deque> +#include <boost/lexical_cast.hpp> +#include <openmedialib/plugins/directshow/directshow_plugin.hpp> + +//-------------------------------------------------------------------------- + +namespace olib { namespace openmedialib { namespace ml { + +namespace +{ + void parse_BITMAPINFOHEADER(const BITMAPINFOHEADER& bmi) + { +#if defined(_DEBUG) + try + { + OutputDebugStringA((std::string("BITMAPINFOHEADER.biSize: ") + boost::lexical_cast<std::string>(bmi.biSize) + std::string("\n")).c_str()); + OutputDebugStringA((std::string("BITMAPINFOHEADER.biWidth: ") + boost::lexical_cast<std::string>(bmi.biWidth) + std::string("\n")).c_str()); + OutputDebugStringA((std::string("BITMAPINFOHEADER.biHeight: ") + boost::lexical_cast<std::string>(bmi.biHeight) + std::string("\n")).c_str()); + OutputDebugStringA((std::string("BITMAPINFOHEADER.biPlanes: ") + boost::lexical_cast<std::string>(bmi.biPlanes) + std::string("\n")).c_str()); + OutputDebugStringA((std::string("BITMAPINFOHEADER.biBitCount: ") + boost::lexical_cast<std::string>(bmi.biBitCount) + std::string("\n")).c_str()); + OutputDebugStringA((std::string("BITMAPINFOHEADER.biCompression: 0x") + boost::lexical_cast<std::string>(bmi.biCompression) + std::string("\n")).c_str()); + OutputDebugStringA((std::string("BITMAPINFOHEADER.biSizeImage: ") + boost::lexical_cast<std::string>(bmi.biSizeImage) + std::string("\n")).c_str()); + OutputDebugStringA((std::string("BITMAPINFOHEADER.biXPelsPerMeter: ") + boost::lexical_cast<std::string>(bmi.biXPelsPerMeter) + std::string("\n")).c_str()); + OutputDebugStringA((std::string("BITMAPINFOHEADER.biYPelsPerMeter: ") + boost::lexical_cast<std::string>(bmi.biYPelsPerMeter) + std::string("\n")).c_str()); + OutputDebugStringA((std::string("BITMAPINFOHEADER.biClrUsed: ") + boost::lexical_cast<std::string>(bmi.biClrUsed) + std::string("\n")).c_str()); + OutputDebugStringA((std::string("BITMAPINFOHEADER.biClrImportant: ") + boost::lexical_cast<std::string>(bmi.biClrImportant) + std::string("\n")).c_str()); + } + catch(const boost::bad_lexical_cast&) + { + } +#endif + } + + void parse_VIDEOINFOHEADER(const VIDEOINFOHEADER& videoinfo) + { +#if defined(_DEBUG) + try + { + OutputDebugStringA((std::string("VIDEOINFOHEADER.rcSource: left=") + boost::lexical_cast<std::string>(videoinfo.rcSource.left) + std::string(" top=") + boost::lexical_cast<std::string>(videoinfo.rcSource.top) + std::string(" right=") + boost::lexical_cast<std::string>(videoinfo.rcSource.right) + std::string(" bottom=") + boost::lexical_cast<std::string>(videoinfo.rcSource.bottom) + std::string("\n")).c_str()); + OutputDebugStringA((std::string("VIDEOINFOHEADER.rcTarget: left=") + boost::lexical_cast<std::string>(videoinfo.rcTarget.left) + std::string(" top=") + boost::lexical_cast<std::string>(videoinfo.rcTarget.top) + std::string(" right=") + boost::lexical_cast<std::string>(videoinfo.rcTarget.right) + std::string(" bottom=") + boost::lexical_cast<std::string>(videoinfo.rcTarget.bottom) + std::string("\n")).c_str()); + OutputDebugStringA((std::string("VIDEOINFOHEADER.dwBitRate: ") + boost::lexical_cast<std::string>(videoinfo.dwBitRate) + std::string("\n")).c_str()); + OutputDebugStringA((std::string("VIDEOINFOHEADER.dwBitErrorRate: ") + boost::lexical_cast<std::string>(videoinfo.dwBitErrorRate) + std::string("\n")).c_str()); + OutputDebugStringA((std::string("VIDEOINFOHEADER.AvgTimePerFrame: ") + boost::lexical_cast<std::string>(videoinfo.AvgTimePerFrame) + std::string("\n")).c_str()); + } + catch(const boost::bad_lexical_cast&) + { + } + + parse_BITMAPINFOHEADER(videoinfo.bmiHeader); +#endif + } + + void parse_VIDEOINFOHEADER2(const VIDEOINFOHEADER2& videoinfo2) + { +#if defined(_DEBUG) + try + { + OutputDebugStringA((std::string("VIDEOINFOHEADER2.rcSource: left=") + boost::lexical_cast<std::string>(videoinfo2.rcSource.left) + std::string(" top=") + boost::lexical_cast<std::string>(videoinfo2.rcSource.top) + std::string(" right=") + boost::lexical_cast<std::string>(videoinfo2.rcSource.right) + std::string(" bottom=") + boost::lexical_cast<std::string>(videoinfo2.rcSource.bottom) + std::string("\n")).c_str()); + OutputDebugStringA((std::string("VIDEOINFOHEADER2.rcTarget: left=") + boost::lexical_cast<std::string>(videoinfo2.rcTarget.left) + std::string(" top=") + boost::lexical_cast<std::string>(videoinfo2.rcTarget.top) + std::string(" right=") + boost::lexical_cast<std::string>(videoinfo2.rcTarget.right) + std::string(" bottom=") + boost::lexical_cast<std::string>(videoinfo2.rcTarget.bottom) + std::string("\n")).c_str()); + OutputDebugStringA((std::string("VIDEOINFOHEADER2.dwBitRate: ") + boost::lexical_cast<std::string>(videoinfo2.dwBitRate) + std::string("\n")).c_str()); + OutputDebugStringA((std::string("VIDEOINFOHEADER2.dwBitErrorRate: ") + boost::lexical_cast<std::string>(videoinfo2.dwBitErrorRate) + std::string("\n")).c_str()); + OutputDebugStringA((std::string("VIDEOINFOHEADER2.AvgTimePerFrame: ") + boost::lexical_cast<std::string>(videoinfo2.AvgTimePerFrame) + std::string("\n")).c_str()); + OutputDebugStringA((std::string("VIDEOINFOHEADER2.dwInterlaceFlags: 0x") + boost::lexical_cast<std::string>(videoinfo2.dwInterlaceFlags) + std::string("\n")).c_str()); + OutputDebugStringA((std::string("VIDEOINFOHEADER2.dwCopyProtectFlags: 0x") + boost::lexical_cast<std::string>(videoinfo2.dwCopyProtectFlags) + std::string("\n")).c_str()); + OutputDebugStringA((std::string("VIDEOINFOHEADER2.dwPictAspectRatioX: ") + boost::lexical_cast<std::string>(videoinfo2.dwPictAspectRatioX) + std::string("\n")).c_str()); + OutputDebugStringA((std::string("VIDEOINFOHEADER2.dwPictAspectRatioY: ") + boost::lexical_cast<std::string>(videoinfo2.dwPictAspectRatioY) + std::string("\n")).c_str()); + OutputDebugStringA((std::string("VIDEOINFOHEADER2.dwControlFlags: 0x") + boost::lexical_cast<std::string>(videoinfo2.dwControlFlags) + std::string("\n")).c_str()); + OutputDebugStringA((std::string("VIDEOINFOHEADER2.dwReserved2: 0x") + boost::lexical_cast<std::string>(videoinfo2.dwReserved2) + std::string("\n")).c_str()); + } + catch(const boost::bad_lexical_cast&) + { + } + + parse_BITMAPINFOHEADER(videoinfo2.bmiHeader); +#endif + } + + void parse_WAVEFORMATEX(const WAVEFORMATEX& waveformat) + { +#if defined(_DEBUG) + try + { + OutputDebugStringA((std::string("WAVEFORMATEX.wFormatTag: ") + boost::lexical_cast<std::string>(waveformat.wFormatTag) + std::string("\n")).c_str()); + OutputDebugStringA((std::string("WAVEFORMATEX.nChannels: ") + boost::lexical_cast<std::string>(waveformat.nChannels) + std::string("\n")).c_str()); + OutputDebugStringA((std::string("WAVEFORMATEX.nSamplesPerSec: ") + boost::lexical_cast<std::string>(waveformat.nSamplesPerSec) + std::string("\n")).c_str()); + OutputDebugStringA((std::string("WAVEFORMATEX.nAvgBytesPerSec: ") + boost::lexical_cast<std::string>(waveformat.nAvgBytesPerSec) + std::string("\n")).c_str()); + OutputDebugStringA((std::string("WAVEFORMATEX.nBlockAlign: ") + boost::lexical_cast<std::string>(waveformat.nBlockAlign) + std::string("\n")).c_str()); + OutputDebugStringA((std::string("WAVEFORMATEX.wBitsPerSample: ") + boost::lexical_cast<std::string>(waveformat.wBitsPerSample) + std::string("\n")).c_str()); + OutputDebugStringA((std::string("WAVEFORMATEX.cbSize: ") + boost::lexical_cast<std::string>(waveformat.cbSize) + std::string("\n")).c_str()); + } + catch(const boost::bad_lexical_cast&) + { + } +#endif + } + + void parse_AM_MEDIA_TYPE(const AM_MEDIA_TYPE& mediatype) + { +#if defined(_DEBUG) + if(mediatype.majortype == MEDIATYPE_Video) + { + OutputDebugStringA("AM_MEDIA_TYPE.majortype: MEDIATYPE_Video\n"); + + if(mediatype.formattype == FORMAT_VideoInfo) + { + OutputDebugStringA("AM_MEDIA_TYPE.formattype: FORMAT_VideoInfo\n"); + if( (mediatype.pbFormat) + && (mediatype.cbFormat >= sizeof(VIDEOINFOHEADER)) ) + { + parse_VIDEOINFOHEADER(*reinterpret_cast<VIDEOINFOHEADER*>(mediatype.pbFormat)); + } + } + else if(mediatype.formattype == FORMAT_VideoInfo2) + { + OutputDebugStringA("AM_MEDIA_TYPE.formattype: FORMAT_VideoInfo2\n"); + if( (mediatype.pbFormat) + && (mediatype.cbFormat >= sizeof(VIDEOINFOHEADER2)) ) + { + parse_VIDEOINFOHEADER2(*reinterpret_cast<VIDEOINFOHEADER2*>(mediatype.pbFormat)); + } + } + else if(mediatype.formattype == FORMAT_DvInfo) + { + } + else if(mediatype.formattype == FORMAT_MPEG2Video) + { + } + else if(mediatype.formattype == FORMAT_MPEGStreams) + { + } + else if(mediatype.formattype == FORMAT_MPEGVideo) + { + } + } + else if(mediatype.majortype == MEDIATYPE_Audio) + { + OutputDebugStringA("AM_MEDIA_TYPE.majortype: MEDIATYPE_Audio\n"); + + if(mediatype.formattype == FORMAT_WaveFormatEx) + { + OutputDebugStringA("AM_MEDIA_TYPE.formattype: FORMAT_WaveFormatEx\n"); + if( (mediatype.pbFormat) + && (mediatype.cbFormat >= sizeof(WAVEFORMATEX)) ) + parse_WAVEFORMATEX(*reinterpret_cast<WAVEFORMATEX*>(mediatype.pbFormat)); + } + } + + try + { + OutputDebugStringA((std::string("AM_MEDIA_TYPE.subtype: 0x") + boost::lexical_cast<std::string>((void*)*((long*)&mediatype.subtype)) + std::string("\n")).c_str()); + OutputDebugStringA((std::string("AM_MEDIA_TYPE.bFixedSizeSamples: ") + boost::lexical_cast<std::string>(mediatype.bFixedSizeSamples) + std::string("\n")).c_str()); + OutputDebugStringA((std::string("AM_MEDIA_TYPE.bTemporalCompression: ") + boost::lexical_cast<std::string>(mediatype.bTemporalCompression) + std::string("\n")).c_str()); + OutputDebugStringA((std::string("AM_MEDIA_TYPE.lSampleSize: ") + boost::lexical_cast<std::string>(mediatype.lSampleSize) + std::string("\n")).c_str()); + OutputDebugStringA((std::string("AM_MEDIA_TYPE.cbFormat: ") + boost::lexical_cast<std::string>(mediatype.cbFormat) + std::string("\n")).c_str()); + } + catch(const boost::bad_lexical_cast&) + { + } +#endif + } + + //--------------------------------------------------------------------------------------------- + + opl::string fourcc_descriptor(unsigned long fourcc_format) + { + opl::string format; + format += (char)(fourcc_format & 0x000000FF); + format += (char)((fourcc_format & 0x0000FF00) >> 8); + format += (char)((fourcc_format & 0x00FF0000) >> 16); + format += (char)((fourcc_format & 0xFF000000) >> 24); + return format; + } + + // FOURCC to openimagelib format convertion + // Format converter base class... + typedef boost::shared_ptr<class format_converter> format_converter_ptr; + + class format_converter + { + public: + explicit format_converter(unsigned long fourcc_format); + virtual ~format_converter(); + + opl::string get_source_format() const; + virtual opl::wstring get_target_format() const = 0; + virtual void convert(unsigned char* src_buffer, unsigned long src_buffer_size, image_type_ptr image) const = 0; + + private: + unsigned long fourcc_format_; + }; + + format_converter::format_converter(unsigned long fourcc_format) + : fourcc_format_(fourcc_format) + { + } + + format_converter::~format_converter() + { + } + + opl::string format_converter::get_source_format() const + { + return fourcc_descriptor(fourcc_format_); + } + + // FOURCC Y41P converter... + class Y41P_converter : public format_converter + { + public: + explicit Y41P_converter(); + ~Y41P_converter(); + + opl::wstring get_target_format() const; + void convert(unsigned char* src_buffer, unsigned long src_buffer_size, image_type_ptr image) const; + }; + + typedef boost::shared_ptr<Y41P_converter> Y41P_converter_ptr; + Y41P_converter::Y41P_converter() + : format_converter( FCC('Y41P') ) + { + } + + Y41P_converter::~Y41P_converter() + { + } + + opl::wstring Y41P_converter::get_target_format() const + { + return opl::wstring(L"yuv411p"); + } + + void Y41P_converter::convert(unsigned char* src_buffer, unsigned long src_buffer_size, image_type_ptr image) const + { +#if 1 + // Macropixel: u0 y0 v0 y1 u4 y2 v4 y3 y4 y5 y6 y7 + const unsigned long bytes_per_macropixel = 12; + const unsigned long luma_per_macropixel = 8; + unsigned long num_macropixels = src_buffer_size/bytes_per_macropixel; + unsigned char* src = src_buffer; + unsigned char* dest_Y = (unsigned char*)image->data(0); + unsigned char* dest_U = (unsigned char*)image->data(1); + unsigned char* dest_V = (unsigned char*)image->data(2); + + for(unsigned long idx = 0; idx < num_macropixels; idx++) + { + *dest_U++ = *src++; + *dest_Y++ = *src++; + *dest_V++ = *src++; + *dest_Y++ = *src++; + *dest_U++ = *src++; + *dest_Y++ = *src++; + *dest_V++ = *src++; + *dest_Y++ = *src++; + *dest_Y++ = *src++; + *dest_Y++ = *src++; + *dest_Y++ = *src++; + *dest_Y++ = *src++; + } +#else + memcpy( (unsigned char*)(image->data(0)), + src_buffer, + image->width()*image->height() ); + memset((unsigned char*)(image->data(1)), 128, image->width(1)*image->height(1)); + memset((unsigned char*)(image->data(2)), 128, image->width(2)*image->height(2)); +#endif + } + + // FOURCC YV12 converter... + class YV12_converter : public format_converter + { + public: + explicit YV12_converter(); + ~YV12_converter(); + + opl::wstring get_target_format() const; + void convert(unsigned char* src_buffer, unsigned long src_buffer_size, image_type_ptr image) const; + }; + + typedef boost::shared_ptr<YV12_converter> YV12_converter_ptr; + YV12_converter::YV12_converter() + : format_converter( FCC('YV12') ) + { + } + + YV12_converter::~YV12_converter() + { + } + + opl::wstring YV12_converter::get_target_format() const + { + return opl::wstring(L"yuv420p"); + } + + void YV12_converter::convert(unsigned char* src_buffer, unsigned long src_buffer_size, image_type_ptr image) const + { + // Note: YV12 plane order is Y, V then U. + // Is this the case for a yuv420p olib image? + memcpy( (unsigned char*)(image->data(0)), + src_buffer, + image->size() ); + } + + // RGB24 converter... + class RGB24_converter : public format_converter + { + public: + explicit RGB24_converter(); + ~RGB24_converter(); + + opl::wstring get_target_format() const; + void convert(unsigned char* src_buffer, unsigned long src_buffer_size, image_type_ptr image) const; + }; + + typedef boost::shared_ptr<RGB24_converter> RGB24_converter_ptr; + RGB24_converter::RGB24_converter() + : format_converter( 0x00000000/*FCC('RGB ')*/ ) + { + } + + RGB24_converter::~RGB24_converter() + { + } + + opl::wstring RGB24_converter::get_target_format() const + { + // http://msdn2.microsoft.com/en-us/library/ms787838.aspx + return opl::wstring(L"b8g8r8"); + } + + void RGB24_converter::convert(unsigned char* src_buffer, unsigned long src_buffer_size, image_type_ptr image) const + { + memcpy( (unsigned char*)(image->data(0)), + src_buffer, + image->size() ); + } + + // FOURCC RGB32 converter... + class RGBA32_converter : public format_converter + { + public: + explicit RGBA32_converter(); + ~RGBA32_converter(); + + opl::wstring get_target_format() const; + void convert(unsigned char* src_buffer, unsigned long src_buffer_size, image_type_ptr image) const; + }; + + typedef boost::shared_ptr<RGBA32_converter> RGBA32_converter_ptr; + RGBA32_converter::RGBA32_converter() + : format_converter( FCC('RGBA') ) + { + } + + RGBA32_converter::~RGBA32_converter() + { + } + + opl::wstring RGBA32_converter::get_target_format() const + { + // http://msdn2.microsoft.com/en-us/library/ms787838.aspx + return opl::wstring(L"b8g8r8a8"); + } + + void RGBA32_converter::convert(unsigned char* src_buffer, unsigned long src_buffer_size, image_type_ptr image) const + { + memcpy( (unsigned char*)(image->data(0)), + src_buffer, + image->size() ); + } + + // FOURCC to oil format converter factory function + format_converter_ptr get_format_converter(unsigned long fourcc_format) + { + switch(fourcc_format) + { + case 0x00000000: // BI_RGB + // return format_converter_ptr(new RGB24_converter()); + //case FCC('RGBA'): + return format_converter_ptr(new RGBA32_converter()); + case FCC('Y41P'): + return format_converter_ptr(new Y41P_converter()); + case FCC('YV12'): + return format_converter_ptr(new YV12_converter()); + default: + return format_converter_ptr(); + } + } + + //--------------------------------------------------------------------------------------------- + + // Move these to anonymous namespace. No need to be part of class. + HRESULT get_pin(IBaseFilter *pFilter, PIN_DIRECTION direction, IPin** ppPin) + { + if(!pFilter) + return E_POINTER; + if(!ppPin) + return E_POINTER; + + CComPtr<IEnumPins> pEnumPins; + HRESULT hr = pFilter->EnumPins(&pEnumPins); + if(FAILED(hr)) + return hr; + + CComPtr<IPin> pPin; + while(pEnumPins->Next(1, &pPin.p, 0) == S_OK) + { + PIN_DIRECTION dir; + hr = pPin->QueryDirection(&dir); + if(FAILED(hr)) + break; + + if(dir == direction) + { + *ppPin = pPin; + break; + } + } + + return hr; + } + + HRESULT get_pins(IBaseFilter *pFilter, PIN_DIRECTION direction, std::deque< CComPtr<IPin> >& pin_container) + { + if(!pFilter) + return E_POINTER; + + pin_container.clear(); + + CComPtr<IEnumPins> pEnumPins; + HRESULT hr = pFilter->EnumPins(&pEnumPins); + if(FAILED(hr)) + return hr; + + CComPtr<IPin> pPin; + while(pEnumPins->Next(1, &pPin.p, 0) == S_OK) + { + PIN_DIRECTION dir; + hr = pPin->QueryDirection(&dir); + if(FAILED(hr)) + break; + + if(dir == direction) + pin_container.push_back(pPin); + } + + return hr; + } + + //--------------------------------------------------------------------------------------------- + +#if defined(_DEBUG) + void print_native_video_format(const opl::wstring& uri) + { + CComPtr<IMediaDet> pIMediaDet; + HRESULT hr = pIMediaDet.CoCreateInstance(CLSID_MediaDet, NULL, CLSCTX_INPROC_SERVER); + if(SUCCEEDED(hr)) + hr = pIMediaDet->put_Filename(BSTR(uri.c_str())); + + long num_output_streams = 0; + if(SUCCEEDED(hr)) + hr = pIMediaDet->get_OutputStreams(&num_output_streams); + + if(SUCCEEDED(hr)) + { + for(long idx = 0; idx < num_output_streams; idx++) + { + hr = pIMediaDet->put_CurrentStream(idx); + if(FAILED(hr)) + continue; + + AM_MEDIA_TYPE mt; + hr = pIMediaDet->get_StreamMediaType(&mt); + if(FAILED(hr)) + continue; + + if(mt.formattype != FORMAT_VideoInfo) + continue; + + OutputDebugStringA((std::string("Native FOURCC format: ") + fourcc_descriptor((*reinterpret_cast<VIDEOINFOHEADER*>(mt.pbFormat)).bmiHeader.biCompression).c_str() + std::string("\n")).c_str()); + } + } + } + + void print_num_filters_in_filter_graph(const CComPtr<IGraphBuilder>& pGraph) + { + CComPtr<IEnumFilters> pEnumFilters; + HRESULT hr = pGraph->EnumFilters(&pEnumFilters); + if(SUCCEEDED(hr)) + { + const int FILTERS_TO_REQUEST = 100; + CComPtr<IBaseFilter> pFiltersArray[FILTERS_TO_REQUEST]; + ULONG num_got = 0; + hr = pEnumFilters->Next(FILTERS_TO_REQUEST, &pFiltersArray[0], &num_got); + if(SUCCEEDED(hr)) + { + try + { + OutputDebugStringA((std::string("Filters in filter graph: ") + boost::lexical_cast<std::string>(num_got) + std::string("\n")).c_str()); + } + catch(const boost::bad_lexical_cast&) + { + } + } + } + } + +#endif +} + +//################################################################################################# + +class SampleGrabberCallbackDelegate : public ISampleGrabberCB +{ +public: + explicit SampleGrabberCallbackDelegate(directshow_input* input); + ~SampleGrabberCallbackDelegate(); + + // IUnknown overrides + HRESULT STDMETHODCALLTYPE QueryInterface( REFIID iid, void** ppvObject ); + ULONG STDMETHODCALLTYPE AddRef(); + ULONG STDMETHODCALLTYPE Release(); + + // ISampleGrabberCB overrides + virtual HRESULT STDMETHODCALLTYPE SampleCB(double SampleTime, IMediaSample *pSample) = 0; + virtual HRESULT STDMETHODCALLTYPE BufferCB(double SampleTime, BYTE *pBuffer, long BufferLen) = 0; + +protected: + unsigned long refcount_; + directshow_input* input_; +}; + +SampleGrabberCallbackDelegate::SampleGrabberCallbackDelegate(directshow_input* input) + : input_(input) + , refcount_(0) +{ +} + +SampleGrabberCallbackDelegate::~SampleGrabberCallbackDelegate() +{ +} + +HRESULT STDMETHODCALLTYPE SampleGrabberCallbackDelegate::QueryInterface( REFIID iid, void** ppv ) +{ + if(!ppv) + return E_POINTER; + + if(iid == IID_IUnknown) + *ppv = dynamic_cast<IUnknown*>( this ); + else if(iid == IID_ISampleGrabberCB) + *ppv = dynamic_cast<ISampleGrabberCB*>( this ); + else + { + // It didn't match an interface + *ppv = NULL; + return E_NOINTERFACE; + } + + // Increment refcount on the pointer we're about to return + AddRef(); + // Return success + return S_OK; +} + +ULONG STDMETHODCALLTYPE SampleGrabberCallbackDelegate::AddRef() +{ + return(++refcount_); +} + +ULONG STDMETHODCALLTYPE SampleGrabberCallbackDelegate::Release() +{ + if(--refcount_ <= 0) + delete this; + + return refcount_; +} + +//------------------------------------------------------------------------------------------------- + +class VideoCallbackDelegate : public SampleGrabberCallbackDelegate +{ +public: + explicit VideoCallbackDelegate(directshow_input* input); + ~VideoCallbackDelegate(); + + // ISampleGrabberCB overrides + HRESULT STDMETHODCALLTYPE SampleCB(double SampleTime, IMediaSample *pSample); + HRESULT STDMETHODCALLTYPE BufferCB(double SampleTime, BYTE *pBuffer, long BufferLen); +}; + +VideoCallbackDelegate::VideoCallbackDelegate(directshow_input* input) + : SampleGrabberCallbackDelegate(input) +{ +} + +VideoCallbackDelegate::~VideoCallbackDelegate() +{ +} + +HRESULT STDMETHODCALLTYPE VideoCallbackDelegate::SampleCB(double SampleTime, IMediaSample *pSample) +{ +#ifdef BUFFER_MEDIA_SAMPLES + return E_FAIL; +#else + if(!pSample) + return E_INVALIDARG; + if(pSample->IsPreroll() == S_OK) + return S_FALSE; + + CAutoLock mutex(&input_->video_container_cs_); +#if defined(_DEBUG) + try + { + std::string msg("Received video callback: SampleTime: "); + msg += boost::lexical_cast<std::string>(SampleTime); + msg += " (frame: "; + msg += boost::lexical_cast<std::string>(static_cast<long long>((SampleTime * 10000000)/reinterpret_cast<VIDEOINFOHEADER*>(input_->video_mediatype_.pbFormat)->AvgTimePerFrame)); + msg += ") pSample: 0x"; + msg += boost::lexical_cast<std::string>(pSample); + msg += "\n"; + OutputDebugStringA(msg.c_str()); + } + catch(const boost::bad_lexical_cast&) + { + OutputDebugStringA("Received video callback\n"); + } +#endif + input_->video_container_[SampleTime] = pSample; + SetEvent(input_->hVideoReceivedEvent_); + return S_OK; +#endif +} + +HRESULT STDMETHODCALLTYPE VideoCallbackDelegate::BufferCB(double SampleTime, BYTE *pBuffer, long BufferLen) +{ +#ifdef BUFFER_MEDIA_SAMPLES + if(!pBuffer) + return E_INVALIDARG; + + media_sample_ptr pMS = boost::shared_ptr<media_sample>(new media_sample); + pMS->SampleTime = SampleTime; + pMS->pBuffer = pBuffer; + pMS->BufferLen = BufferLen; + + CAutoLock mutex(&input_->video_container_cs_); +#if defined(_DEBUG) + try + { + std::string msg("Received video callback: SampleTime: "); + msg += boost::lexical_cast<std::string>(SampleTime); + msg += " (frame: "; + msg += boost::lexical_cast<std::string>(static_cast<long long>((SampleTime * 10000000)/reinterpret_cast<VIDEOINFOHEADER*>(input_->video_mediatype_.pbFormat)->AvgTimePerFrame)); + msg += ") pBuffer: 0x"; + msg += boost::lexical_cast<std::string>(pBuffer); + msg += ", buffer size:"; + msg += boost::lexical_cast<std::string>(BufferLen); + msg += "\n"; + OutputDebugStringA(msg.c_str()); + } + catch(const boost::bad_lexical_cast&) + { + OutputDebugStringA("Received video frame\n"); + } +#endif + input_->video_container_[SampleTime] = pMS; + SetEvent(input_->hVideoReceivedEvent_); + return S_OK; +#else + return E_FAIL; +#endif +} + +//------------------------------------------------------------------------------------------------- + +class AudioCallbackDelegate : public SampleGrabberCallbackDelegate +{ +public: + explicit AudioCallbackDelegate(directshow_input* input); + ~AudioCallbackDelegate(); + + // ISampleGrabberCB overrides + HRESULT STDMETHODCALLTYPE SampleCB(double SampleTime, IMediaSample *pSample); + HRESULT STDMETHODCALLTYPE BufferCB(double SampleTime, BYTE *pBuffer, long BufferLen); +}; + +AudioCallbackDelegate::AudioCallbackDelegate(directshow_input* input) + : SampleGrabberCallbackDelegate(input) +{ +} + +AudioCallbackDelegate::~AudioCallbackDelegate() +{ +} + +HRESULT STDMETHODCALLTYPE AudioCallbackDelegate::SampleCB(double SampleTime, IMediaSample *pSample) +{ +#ifdef BUFFER_MEDIA_SAMPLES + return E_FAIL; +#else + if(!pSample) + return S_FALSE; + if(pSample->IsPreroll() == S_OK) + return S_FALSE; + CAutoLock mutex(&input_->audio_container_cs_); +#if defined(_DEBUG) + HRESULT hr = E_FAIL; +//#define DEBUG_GET_MEDIA_TIME +#ifdef DEBUG_GET_MEDIA_TIME + long long startTime = 0, + endTime = 0; + hr = pSample->GetMediaTime(&startTime, &endTime); + if(hr == VFW_E_MEDIA_TIME_NOT_SET) + { + startTime = -1; + endTime = -1; + } +#endif + long long frame = static_cast<long long>((SampleTime * 10000000)/reinterpret_cast<VIDEOINFOHEADER*>(input_->video_mediatype_.pbFormat)->AvgTimePerFrame); +//#define DEBUG_CONVERT_TIME_FORMAT +#ifdef DEBUG_CONVERT_TIME_FORMAT + long long targetTime = 0; + //hr = input_->pMediaSeeking_->ConvertTimeFormat(&targetTime, &TIME_FORMAT_MEDIA_TIME, frame, NULL/*&TIME_FORMAT_FRAME*/); + //hr = input_->pMediaSeeking_->ConvertTimeFormat(&targetTime, &TIME_FORMAT_SAMPLE, long long(SampleTime*10000000), &TIME_FORMAT_MEDIA_TIME); + //hr = input_->pMediaSeeking_->ConvertTimeFormat(&targetTime, &TIME_FORMAT_SAMPLE, long long(SampleTime*10000000), &TIME_FORMAT_MEDIA_TIME); + hr = input_->pMediaSeeking_->ConvertTimeFormat(&targetTime, &TIME_FORMAT_SAMPLE, SampleTime, NULL/*&TIME_FORMAT_FRAME*/); +#endif + try + { + std::string msg("Received audio callback: SampleTime: "); + msg += boost::lexical_cast<std::string>(SampleTime); + msg += " (frame: "; + msg += boost::lexical_cast<std::string>(frame); + msg += ") "; +#ifdef DEBUG_GET_MEDIA_TIME + msg += "startTime: "; + msg += boost::lexical_cast<std::string>(startTime); + msg += "; endTime: "; + msg += boost::lexical_cast<std::string>(endTime); + msg += "; "; +#endif +#ifdef DEBUG_CONVERT_TIME_FORMAT + msg += "targetTime: "; +// msg += boost::lexical_cast<std::string>(double(targetTime)/10000000); + msg += boost::lexical_cast<std::string>(targetTime); + msg += "; "; +#endif + msg += "pSample: 0x"; + msg += boost::lexical_cast<std::string>(pSample); + msg += "\n"; + OutputDebugStringA(msg.c_str()); + } + catch(const boost::bad_lexical_cast&) + { + OutputDebugStringA("Received audio callback\n"); + } +#endif + input_->audio_container_[SampleTime] = pSample; + SetEvent(input_->hAudioReceivedEvent_); + return S_OK; +#endif +} + +HRESULT STDMETHODCALLTYPE AudioCallbackDelegate::BufferCB(double SampleTime, BYTE *pBuffer, long BufferLen) +{ +#ifdef BUFFER_MEDIA_SAMPLES + if(!pBuffer) + return S_FALSE; + + media_sample_ptr pMS = boost::shared_ptr<media_sample>(new media_sample); + pMS->SampleTime = SampleTime; + pMS->pBuffer = pBuffer; + pMS->BufferLen = BufferLen; + + CAutoLock mutex(&input_->audio_container_cs_); +#if defined(_DEBUG) + try + { + std::string msg("Received audio callback: SampleTime: "); + msg += boost::lexical_cast<std::string>(SampleTime); + msg += " (frame: "; + msg += boost::lexical_cast<std::string>(static_cast<long long>((SampleTime * 10000000)/reinterpret_cast<VIDEOINFOHEADER*>(input_->video_mediatype_.pbFormat)->AvgTimePerFrame)); + msg += ") pBuffer: 0x"; + msg += boost::lexical_cast<std::string>(pBuffer); + msg += ", buffer size:"; + msg += boost::lexical_cast<std::string>(BufferLen); + msg += "\n"; + OutputDebugStringA(msg.c_str()); + } + catch(const boost::bad_lexical_cast&) + { + OutputDebugStringA("Received audio frame\n"); + } +#endif + input_->audio_container_[SampleTime] = pMS; + SetEvent(input_->hAudioReceivedEvent_); + return S_OK; +#else + return E_FAIL; +#endif +} + +//################################################################################################# + +directshow_input::directshow_input( opl::wstring resource, const opl::wstring mime_type ) + : input_type( ) + , uri_( resource ) + , mime_type_( mime_type ) + , valid_(false) + , total_frames_(0) + , hVideoReceivedEvent_(NULL) + , hAudioReceivedEvent_(NULL) + , video_callback_delegate_(NULL) + , audio_callback_delegate_(NULL) +{ + // parse the resource path replacing forward slashes with back slashes. + opl::string res(opl::to_string(resource)); + for(opl::string::iterator it = res.begin(); + it != res.end(); + it++) + { + if(*it == '/') + *it = '\\'; + } + uri_ = opl::to_wstring(res); + + // initialize video & audio mediatype cache + memset(&video_mediatype_, 0, sizeof(AM_MEDIA_TYPE)); + memset(&audio_mediatype_, 0, sizeof(AM_MEDIA_TYPE)); + + // create events for video & audio callbacks to indicate new data has been received + hVideoReceivedEvent_ = CreateEvent(NULL, false, false, NULL); + if(!hVideoReceivedEvent_) + return; + + hAudioReceivedEvent_ = CreateEvent(NULL, false, false, NULL); + if(!hAudioReceivedEvent_) + return; + + // Create callback delegates for receiving media samples from the sample grabber filters + video_callback_delegate_ = new VideoCallbackDelegate(this); + if(!video_callback_delegate_) + return; + video_callback_delegate_->AddRef(); + + audio_callback_delegate_ = new AudioCallbackDelegate(this); + if(!audio_callback_delegate_) + return; + audio_callback_delegate_->AddRef(); + +#if defined(_DEBUG) + print_native_video_format(uri_); +#endif + + HRESULT hr = build_graph(); + +#if defined(_DEBUG) + if(SUCCEEDED(hr)) + print_num_filters_in_filter_graph(pGraph_); +#endif + + // Obtain and cache an IMediaSeeking i/f, set the time format to be frame based and read the media duration + if(SUCCEEDED(hr)) + { + hr = pGraph_->QueryInterface(IID_IMediaSeeking, (void**)&pMediaSeeking_); + if(SUCCEEDED(hr)) + { + hr = pMediaSeeking_->SetTimeFormat(&TIME_FORMAT_FRAME); + } +#if defined(_DEBUG) + if(SUCCEEDED(hr)) + { + if(pMediaSeeking_->IsUsingTimeFormat(&TIME_FORMAT_NONE) == S_OK) + OutputDebugStringA("TimeFormat: No format\n"); + else if(pMediaSeeking_->IsUsingTimeFormat(&TIME_FORMAT_FRAME) == S_OK) + OutputDebugStringA("TimeFormat: Video frames\n"); + else if(pMediaSeeking_->IsUsingTimeFormat(&TIME_FORMAT_SAMPLE) == S_OK) + OutputDebugStringA("TimeFormat: Samples in the stream\n"); + else if(pMediaSeeking_->IsUsingTimeFormat(&TIME_FORMAT_FIELD) == S_OK) + OutputDebugStringA("TimeFormat: Interlaced video fields\n"); + else if(pMediaSeeking_->IsUsingTimeFormat(&TIME_FORMAT_BYTE) == S_OK) + OutputDebugStringA("TimeFormat: Byte offset within the stream\n"); + else if(pMediaSeeking_->IsUsingTimeFormat(&TIME_FORMAT_MEDIA_TIME) == S_OK) + OutputDebugStringA("TimeFormat: Reference time (100-nanosecond units)\n"); + } +#endif + if(SUCCEEDED(hr)) + { + LONGLONG duration; + hr = pMediaSeeking_->GetDuration(&duration); + if(SUCCEEDED(hr)) + total_frames_ = static_cast<long long>(duration); + } + } + + // Obtain and cache an IVideoFrameStep i/f. See if the filter will support stepping. + if(SUCCEEDED(hr)) + { + HRESULT hr = pGraph_->QueryInterface(IID_IVideoFrameStep, (void**)&pIVideoFrameStep_); + if(SUCCEEDED(hr)) + if(pIVideoFrameStep_->CanStep(0, NULL) != S_OK) + pIVideoFrameStep_ = NULL; + } + + // start the filter graph going either paused or running - not sure whats the best at this stage + if(SUCCEEDED(hr)) + { + hr = pGraph_->QueryInterface(IID_IMediaControl, (void**)&pMediaControl_); + if(SUCCEEDED(hr)) + { +#define RUN_FILTER_GRAPH +#if defined(RUN_FILTER_GRAPH) + hr = pMediaControl_->Run(); +#else + hr = pMediaControl_->Pause(); +#endif + if(SUCCEEDED(hr)) + { + OAFilterState state = State_Stopped; + int count = 0; + while(++count <= 5) + { + hr = pMediaControl_->GetState(1000, &state); + if(hr == VFW_S_STATE_INTERMEDIATE) + continue; + else if(hr == VFW_S_CANT_CUE) + break; + else + break; + } + + if( (SUCCEEDED(hr)) +#if defined(RUN_FILTER_GRAPH) + && (state == State_Running) ) +#else + && (state == State_Paused) ) +#endif + { +#if defined(RUN_FILTER_GRAPH) + OutputDebugStringA("filter graph is running!\n"); +#else + OutputDebugStringA("filter graph is paused!\n"); +#endif + valid_ = true; + } + } + } + } + + if(!valid_) + OutputDebugStringA("directshow plugin is NOT valid!\n"); +} + +directshow_input::~directshow_input( ) +{ + HRESULT hr = E_FAIL; + + // Stop the graph if not already stopped + OAFilterState state; + if(pMediaControl_) + { + hr = pMediaControl_->GetState(1000, &state); + if(SUCCEEDED(hr) && state != State_Stopped) + { + hr = pMediaControl_->Stop(); + if(SUCCEEDED(hr)) + { + int count = 0; + while(++count <= 5) + { + hr = pMediaControl_->GetState(1000, &state); + if(hr == VFW_S_STATE_INTERMEDIATE) + continue; + else if(hr == VFW_S_CANT_CUE) + break; + else + break; + } + + if( (SUCCEEDED(hr)) + && (state == State_Stopped) ) + { + OutputDebugStringA("filter graph is stopped!\n"); + } + } + } + } + +#ifdef BUFFER_MEDIA_SAMPLES + if(pISampleGrabberVideo_) + pISampleGrabberVideo_->SetCallback(NULL, 1); +#else + if(pISampleGrabberVideo_) + pISampleGrabberVideo_->SetCallback(NULL, 0); +#endif + + valid_ = false; + + { + CAutoLock video_mutex(&video_container_cs_); + video_container_.clear(); + } + + { + CAutoLock video_mutex(&audio_container_cs_); + audio_container_.clear(); + } + + // Remove all filters from the filter graph + CComPtr<IEnumFilters> pEnumFilters; + hr = pGraph_->EnumFilters(&pEnumFilters); + if(SUCCEEDED(hr)) + { + typedef std::deque<IBaseFilter*> FilterContainer; + typedef FilterContainer::const_iterator FilterContainerIterator; + + FilterContainer filterContainer; + IBaseFilter* pFilter; + + while(pEnumFilters->Next(1, &pFilter, NULL) == S_OK) + { + filterContainer.push_back(pFilter); + } + + for(FilterContainerIterator it = filterContainer.begin(); + it != filterContainer.end(); + it++) + { + pGraph_->RemoveFilter(*it); + } + } + +#if defined(_DEBUG) + if(SUCCEEDED(hr)) + print_num_filters_in_filter_graph(pGraph_); +#endif + + if(video_callback_delegate_) + video_callback_delegate_->Release(); + + if(audio_callback_delegate_) + audio_callback_delegate_->Release(); + + if(hVideoReceivedEvent_) + { + CloseHandle(hVideoReceivedEvent_); + hVideoReceivedEvent_ = NULL; + } + + if(hAudioReceivedEvent_) + { + CloseHandle(hAudioReceivedEvent_); + hAudioReceivedEvent_ = NULL; + } + + if(get_video_streams()) + FreeMediaType(video_mediatype_); + + if(get_audio_streams()) + FreeMediaType(audio_mediatype_); +} + +inline bool directshow_input::is_valid() const +{ + return valid_; +} + +inline bool directshow_input::is_seekable( ) const... [truncated message content] |
From: <gl...@us...> - 2007-10-28 15:33:21
|
Revision: 1321 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1321&view=rev Author: glslang Date: 2007-10-28 08:33:18 -0700 (Sun, 28 Oct 2007) Log Message: ----------- + merge cleanups and tidy-ups Modified Paths: -------------- trunk/configure.ac trunk/src/openobjectlib/Makefile.am Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2007-10-28 15:23:10 UTC (rev 1320) +++ trunk/configure.ac 2007-10-28 15:33:18 UTC (rev 1321) @@ -1,3 +1,6 @@ +dnl +dnl Configure.ac for openlibraries +dnl AC_INIT AC_CONFIG_SRCDIR([src/openobjectlib/sg/core.hpp]) @@ -37,6 +40,35 @@ AC_PROG_INSTALL AC_PROG_LN_S +dnl Check if specific olibs should be disabled +AC_ARG_ENABLE(glew, AC_HELP_STRING([--disable-glew], [disable GLEW dependent parts]), [enableglew=$enableval], [enableglew=yes]) +if test "$enableglew" = "no" ; then + AC_MSG_WARN([*** GLEW is disabled - continuing build with non-opengl dependent components ***]) +fi + +AC_ARG_ENABLE(openassetlib, AC_HELP_STRING([--with-openassetlib], [disable openassetlib]), [enableassetlib=$enableval], [enableassetlib=yes]) +if test "x$enableassetlib" = "xyes" && test "x$enableglew" = "xyes" ; then + AC_DEFINE(HAVE_OPENASSETLIB,1,[Defined if you have openassetlib]) +fi +AM_CONDITIONAL(HAVE_OPENASSETLIB, [test "x$enableassetlib" = "xyes" && test "x$enableglew" = "xyes"]) + +AC_ARG_ENABLE(openeffectlib, AC_HELP_STRING([--with-openeffectlib], [disable openeffectlib]), [enableeffectlib=$enableval], [enableeffectlib=yes]) +if test "x$enableeffectlib" = "xyes" && test "x$enableglew" = "xyes" ; then + AC_DEFINE(HAVE_OPENEFFECTLIB,1,[Defined if you have openeffectlib]) +fi +AM_CONDITIONAL(HAVE_OPENEFFECTLIB, [test "x$enableeffectlib" = "xyes" && test "x$enableglew" = "xyes"]) + +AC_ARG_ENABLE(openobjectlib, AC_HELP_STRING([--with-openobjectlib], [disable openobjectlib]), [enableobjectlib=$enableval], [enableobjectlib=yes]) +if test "x$enableobjectlib" = "xyes" && test "x$enableglew" = "xyes" ; then + AC_DEFINE(HAVE_OPENOBJECTLIB, 1,[Defined if you have openobjectlib]) +fi +AM_CONDITIONAL(HAVE_OPENOBJECTLIB, [test "x$enableobjectlib" = "xyes" && test "x$enableglew" = "xyes"]) + +AC_ARG_ENABLE(pool, AC_HELP_STRING([--disable-pool], [disable memory pooling]), [enablepool=$enableval], [enablepool=yes]) +if test "$enablepool" = "yes" ; then + AC_DEFINE(HAVE_POOLING, 1,[Define this if you want memory pooling]) +fi + dnl libtool AC_LIBTOOL_DLOPEN AC_DISABLE_STATIC @@ -101,24 +133,34 @@ AM_CONDITIONAL(HAVE_X11, [test x"$no_x" != "xyes"]) dnl OpenGL, GLU, GLUT support +OPL_EXTRA_LIBS="" AC_MSG_CHECKING([the OpenGL environment]) case $host in *-*-linux*) AC_CHECK_OPENGL( ) ;; *-apple-darwin*) - AC_MSG_RESULT([Apple Darwin build. OpenGL defaults on OSX...]) - AM_CONDITIONAL(HAVE_GL_GL_H, [test x"yes" = x"yes"] ) - AM_CONDITIONAL(HAVE_GL_GLUT_H, [test x"yes" = x"yes"] ) - OPENGL_LIBS="-Xlinker -framework -Xlinker OpenGL" - GLUT_LIBS="-Xlinker -framework -Xlinker GLUT" + if test "x$enableglew" = "xyes" ; then + AC_MSG_RESULT([Apple Darwin build. OpenGL defaults on OSX...]) + AM_CONDITIONAL(HAVE_GL_GL_H, [test x"yes" = x"yes"] ) + AM_CONDITIONAL(HAVE_GL_GLUT_H, [test x"yes" = x"yes"] ) + OPENGL_LIBS="-Xlinker -framework -Xlinker OpenGL" + GLUT_LIBS="-Xlinker -framework -Xlinker GLUT" + else + OPL_EXTRA_LIBS="-Xlinker -framework -Xlinker Carbon" + AM_CONDITIONAL(HAVE_GL_GL_H, [false]) + AM_CONDITIONAL(HAVE_GL_GLUT_H, [false]) + fi AC_SUBST(OPENGL_LIBS) AC_SUBST(GLUT_LIBS) ;; *) AC_MSG_RESULT([OpenGL configuration not tested.]) + AM_CONDITIONAL(HAVE_GL_GL_H, [false]) + AM_CONDITIONAL(HAVE_GL_GLUT_H, [false]) ;; esac +AC_SUBST(OPL_EXTRA_LIBS) dnl GLEW support AC_CHECK_GLEW( ) @@ -154,6 +196,8 @@ AC_SUBST(XML2_CXXFLAGS) AC_SUBST(XML2_LIBS) +dnl OpenImageLib support +AC_MSG_NOTICE([*** Configuring OpenImageLib ***]) AC_CHECK_OPENIMAGELIB( ) AC_CHECK_TIFF( ) @@ -204,16 +248,19 @@ AM_CONDITIONAL(HAVE_LIBAVFORMAT, [test x"$libavformat" = "xyes"]) dnl mlt support -AC_PATH_PROG(MLT_CONFIG, mlt-config, no) -if test "x$MLT_CONFIG" = "xno" ; then - AC_MSG_RESULT([*** mlt support is not available ***]) -else - AC_DEFINE(HAVE_LIBMLT,1,[Define this for mlt support]) - MLT_CXXFLAGS=`$MLT_CONFIG --cflags` - MLT_LIBS="-lmlt++ `$MLT_CONFIG --libs`" - AC_SUBST(MLT_CXXFLAGS) - AC_SUBST(MLT_LIBS) - have_libmlt="yes" +AC_ARG_ENABLE(mlt, AC_HELP_STRING([--disable-mlt], [disable mlt dependent parts]), [enablemlt=$enableval], [enablemlt=yes]) +if test "$enablemlt" = "yes" ; then + AC_PATH_PROG(MLT_CONFIG, mlt-config, no) + if test "x$MLT_CONFIG" = "xno" ; then + AC_MSG_RESULT([*** mlt support is not available ***]) + else + AC_DEFINE(HAVE_LIBMLT,1,[Define this for mlt support]) + MLT_CXXFLAGS=`$MLT_CONFIG --cflags` + MLT_LIBS="-lmlt++ `$MLT_CONFIG --libs`" + AC_SUBST(MLT_CXXFLAGS) + AC_SUBST(MLT_LIBS) + have_libmlt="yes" + fi fi AM_CONDITIONAL(HAVE_LIBMLT, [test x"$have_libmlt" = "xyes"]) @@ -324,7 +371,34 @@ ;; esac +dnl pkg config link flags +OPENOBJECTLIB_LDFLAGS="" +if test "x$enableobjectlib" = "xyes" && test "x$enableglew" = "xyes" ; then + OPENOBJECTLIB_LDFLAGS="$OPENOBJECTLIB_RPATH -L$OPENLIBRARIES_LIBPATH/openobjectlib/$OL_LIBNAME -lopenobjectlib_sg" +else + OPENOBJECTLIB_RPATH="" +fi AC_SUBST(OPENPLUGINLIB_RPATH) +AC_SUBST(OPENOBJECTLIB_LDFLAGS) + +OPENASSETLIB_LDFLAGS="" +if test "x$enableassetlib" = "xyes" && test "x$enableglew" = "xyes" ; then + OPENASSETLIB_LDFLAGS="$OPENASSETLIB_RPATH -L$OPENLIBRARIES_LIBPATH/openassetlib/$OL_LIBNAME -lopenassetlib_al" +else + OPENASSETLIB_RPATH="" +fi +AC_SUBST(OPENASSETLIB_RPATH) +AC_SUBST(OPENASSETLIB_LDFLAGS) + +OPENMEDIALIB_LDFLAGS="$OPENMEDIALIB_RPATH -L$OPENLIBRARIES_LIBPATH/openmedialib/$OL_LIBNAME -lopenmedialib_ml" +AC_SUBST(OPENMEDIALIB_LDFLAGS) + +OPENIMAGELIB_LDFLAGS="$OPENIMAGELIB_RPATH -L$OPENLIBRARIES_LIBPATH/openimagelib/$OL_LIBNAME -lopenimagelib_il" +AC_SUBST(OPENIMAGELIB_LDFLAGS) + +OPENPLUGINLIB_LDFLAGS="$OPENPLUGINLIB_RPATH -L$OPENLIBRARIES_LIBPATH/openpluginlib/$OL_LIBNAME -lopenpluginlib_pl" +AC_SUBST(OPENPLUGINLIB_LDFLAGS) + AC_SUBST(OPENIMAGELIB_RPATH) AC_SUBST(OPENMEDIALIB_RPATH) AC_SUBST(OPENOBJECTLIB_RPATH) @@ -357,7 +431,12 @@ src/openmedialib/Makefile src/openmedialib/ml/Makefile src/openmedialib/plugins/Makefile +src/openmedialib/plugins/avformat/Makefile src/openmedialib/plugins/oil/Makefile +src/openmedialib/plugins/openal/Makefile +src/openmedialib/plugins/sdl/Makefile +src/openmedialib/plugins/gensys/Makefile +src/openmedialib/plugins/quicktime/Makefile src/openmedialib/plugins/ofx/Makefile src/openmedialib/py/Makefile src/openeffectslib/Makefile @@ -366,7 +445,6 @@ src/openobjectlib/Makefile src/openobjectlib/sg/Makefile src/openobjectlib/plugins/Makefile -src/openobjectlib/plugins/3ds/Makefile src/openobjectlib/plugins/obj/Makefile src/openobjectlib/plugins/X3D/Makefile src/openassetlib/Makefile @@ -374,8 +452,9 @@ src/openassetlib/py/Makefile src/openassetlib/plugins/Makefile src/openassetlib/plugins/sqlite/Makefile -src/umbrella_framework/Makefile -m4/Makefile +src/openeffectslib/Makefile +src/openeffectslib/plugins/Makefile +src/openeffectslib/plugins/tonemap/Makefile media/Makefile effects/Makefile test/Makefile @@ -413,6 +492,7 @@ test/openobjectlib/GL/obj_draw/Makefile test/openobjectlib/GL/texture_draw/Makefile test/openassetlib/Makefile +test/openassetlib/al_testharness/Makefile openlibraries.pc ]) AC_OUTPUT Modified: trunk/src/openobjectlib/Makefile.am =================================================================== --- trunk/src/openobjectlib/Makefile.am 2007-10-28 15:23:10 UTC (rev 1320) +++ trunk/src/openobjectlib/Makefile.am 2007-10-28 15:33:18 UTC (rev 1321) @@ -3,6 +3,10 @@ # # +if HAVE_OPENOBJECTLIB + SUBDIRS = \ sg \ plugins + +#endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gl...@us...> - 2007-10-28 15:36:30
|
Revision: 1322 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1322&view=rev Author: glslang Date: 2007-10-28 08:36:28 -0700 (Sun, 28 Oct 2007) Log Message: ----------- + merge cleanups and tidy-ups Added Paths: ----------- trunk/installer/openlibraries_fc5.spec Property Changed: ---------------- trunk/bootstrap Property changes on: trunk/bootstrap ___________________________________________________________________ Name: svn:executable + * Added: trunk/installer/openlibraries_fc5.spec =================================================================== --- trunk/installer/openlibraries_fc5.spec (rev 0) +++ trunk/installer/openlibraries_fc5.spec 2007-10-28 15:36:28 UTC (rev 1322) @@ -0,0 +1,96 @@ + +# +# RPM spec file for OpenLibraries +# + +%define _prefix /usr + +Summary: OpenLibraries - a library suite for non-linear editing, visual effects and rich media applications. +Name: openlibraries +Version: 0.2.0 +Release: 4 +License: LGPL +Group: Development/Frameworks +Source: openlibraries-%{version}.tar.gz +Vendor: OpenLibraries +Packager: Goncalo de Carvalho <go...@vm...> +URL: http://www.openlibraries.org +BuildRoot: %{_tmppath}/%name-%{version}-root +Requires: olib-glew >= 1.3.4-3 olib-mlt >= 0.2.1-4 olib-mlt++ >= 0.2.1-4 +BuildRequires: olib-glew-devel >= 1.3.4-3 olib-mlt-devel >= 0.2.1-4 olib-mlt++-devel >= 0.2.1-4 +Prefix: %{_prefix} + +%description +OpenLibraries - a library suite for non-linear editing, visual effects and rich media applications. + +%package devel +Summary: OpenLibraries development headers. +Group: Development/Frameworks +Requires: openlibraries = %{version} +Requires: olib-glew >= 1.3.4-3 olib-mlt >= 0.2.1-4 olib-mlt++ >= 0.2.1-4 +BuildRequires: olib-glew-devel >= 1.3.4-3 olib-mlt-devel >= 0.2.1-4 olib-mlt++-devel >= 0.2.1-4 + +%description devel +OpenLibraries development headers/libs. + +%package media +Summary: OpenLibraries sample media files. +Group: Development/Frameworks +Requires: openlibraries = %{version} + +%description media +OpenLibraries sample media files. + +%prep +rm -rf $RPM_BUILD_ROOT + +%setup -q -n openlibraries-%{version} + +%build +%configure "LDFLAGS=-Wl,--rpath=/usr/olib/0.2.0/lib" --prefix=%{_prefix} --enable-gpl --disable-cg --with-qtinclude=/usr/lib/qt-3.3/include --with-qtlib=/usr/lib/qt-3.3/lib --with-glewprefix=/usr/olib/0.2.0/ +make +#find . -name "*.so" -exec strip {} \; + +%install +OPENLIBRARIES_INCLUDEPATH="$RPM_BUILD_ROOT$OPENLIBRARIES_INCLUDEPATH" OPENLIBRARIES_LIBPATH="$RPM_BUILD_ROOT$OPENLIBRARIES_LIBPATH" DESTDIR=$RPM_BUILD_ROOT make install + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +/sbin/ldconfig + +%postun +/sbin/ldconfig + +%files devel +%defattr(-,root,root) +%{_prefix}/include/openlibraries-%{version}/ +%{_prefix}/lib/openlibraries-%{version}/include/ +%{_prefix}/lib/pkgconfig/openlibraries.pc + +%files media +%defattr(-,root,root) +%{_prefix}/share/openlibraries-%{version}/ + +%files +%defattr(-,root,root) +%{_prefix}/lib/openlibraries-%{version}/openpluginlib +%{_prefix}/lib/openlibraries-%{version}/openimagelib +%{_prefix}/lib/openlibraries-%{version}/openmedialib +%{_prefix}/lib/openlibraries-%{version}/openobjectlib +%{_prefix}/lib/openlibraries-%{version}/openassetlib +%{_prefix}/lib/openlibraries-%{version}/openeffectslib +%{_prefix}/lib/python2.4/site-packages/openpluginlib.so +%{_prefix}/lib/python2.4/site-packages/openimagelib.so +%{_prefix}/lib/python2.4/site-packages/openassetlib.so + +%changelog +* Mon Jul 24 2006 Goncalo de Carvalho <go...@vm...> +- increased the release number for Jahshaka 2.0 RC4 +* Mon Nov 21 2005 Goncalo de Carvalho <go...@vm...> +- fixes to for installation on FC4 +* Sun Nov 20 2005 Goncalo de Carvalho <go...@vm...> +- fixes to allow for custom built Boost and GLEW rpms +* Wed Nov 12 2005 Goncalo de Carvalho <go...@vm...> +- initial packaging Property changes on: trunk/installer/openlibraries_fc5.spec ___________________________________________________________________ Name: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gl...@us...> - 2007-10-28 16:15:49
|
Revision: 1324 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1324&view=rev Author: glslang Date: 2007-10-28 09:15:47 -0700 (Sun, 28 Oct 2007) Log Message: ----------- +build fixes Modified Paths: -------------- trunk/configure.ac trunk/src/openimagelib/il/utility.hpp trunk/src/openmedialib/ml/audio.hpp trunk/src/openmedialib/ml/frame.hpp trunk/src/openmedialib/ml/input.hpp trunk/src/openmedialib/plugins/gensys/gensys_plugin.cpp trunk/src/openmedialib/plugins/quicktime/quicktime_input.h trunk/src/openobjectlib/Makefile.am trunk/src/openobjectlib/plugins/Makefile.am trunk/src/umbrella_framework/openlibraries.hpp Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2007-10-28 15:47:52 UTC (rev 1323) +++ trunk/configure.ac 2007-10-28 16:15:47 UTC (rev 1324) @@ -168,9 +168,6 @@ dnl NVIDIA Cg runtime support AC_CHECK_CG_RUNTIME( ) -dnl NVIDIA Gelato(tm) runtime support -AC_CHECK_GELATO_RUNTIME( ) - dnl OFX support AC_CHECK_OFX( ) @@ -452,11 +449,10 @@ src/openassetlib/py/Makefile src/openassetlib/plugins/Makefile src/openassetlib/plugins/sqlite/Makefile -src/openeffectslib/Makefile -src/openeffectslib/plugins/Makefile -src/openeffectslib/plugins/tonemap/Makefile +src/umbrella_framework/Makefile media/Makefile effects/Makefile +m4/Makefile test/Makefile test/openeffectslib/Makefile test/openeffectslib/tm_bench/Makefile @@ -492,7 +488,6 @@ test/openobjectlib/GL/obj_draw/Makefile test/openobjectlib/GL/texture_draw/Makefile test/openassetlib/Makefile -test/openassetlib/al_testharness/Makefile openlibraries.pc ]) AC_OUTPUT Modified: trunk/src/openimagelib/il/utility.hpp =================================================================== --- trunk/src/openimagelib/il/utility.hpp 2007-10-28 15:47:52 UTC (rev 1323) +++ trunk/src/openimagelib/il/utility.hpp 2007-10-28 16:15:47 UTC (rev 1324) @@ -51,7 +51,7 @@ IL_DECLSPEC image_type_ptr deinterlace( const image_type_ptr &im ); IL_DECLSPEC image_type_ptr extract_alpha( const image_type_ptr &im ); -enum IL_DECLSPEC rescale_filter { POINT_SAMPLING, BILINEAR_SAMPLING, BICUBIC_SAMPLING, TRILINEAR_SAMPLING }; +enum rescale_filter { POINT_SAMPLING, BILINEAR_SAMPLING, BICUBIC_SAMPLING, TRILINEAR_SAMPLING }; IL_DECLSPEC image_type_ptr rescale( const image_type_ptr &im, int new_w, int new_h, int new_d = 1, rescale_filter filter = POINT_SAMPLING ); @@ -92,7 +92,7 @@ typedef std::vector<unsigned int> histogram_type; -enum IL_DECLSPEC histogram_filter { LUMINANCE, RED, GREEN, BLUE, ALPHA }; // RED, GREEN, BLUE and ALPHA do relate to channels rather than actual pixel format being rgba. +enum histogram_filter { LUMINANCE, RED, GREEN, BLUE, ALPHA }; // RED, GREEN, BLUE and ALPHA do relate to channels rather than actual pixel format being rgba. IL_DECLSPEC void histogram( const image_type_ptr& im, int size, float mask[ ], histogram_type& hist ); IL_DECLSPEC void histogram( const image_type_ptr& im, int size, histogram_filter filter, histogram_type& hist ); Modified: trunk/src/openmedialib/ml/audio.hpp =================================================================== --- trunk/src/openmedialib/ml/audio.hpp 2007-10-28 15:47:52 UTC (rev 1323) +++ trunk/src/openmedialib/ml/audio.hpp 2007-10-28 16:15:47 UTC (rev 1324) @@ -166,8 +166,8 @@ size_type eom_; }; -typedef ML_DECLSPEC audio<unsigned char, audio_format> audio_type; -typedef ML_DECLSPEC boost::shared_ptr<audio_type> audio_type_ptr; +typedef audio<unsigned char, audio_format> audio_type; +typedef boost::shared_ptr<audio_type> audio_type_ptr; template<typename T, class storage = olib::openimagelib::il::default_storage<T> > class pcm16 : public audio_format<T, storage> Modified: trunk/src/openmedialib/ml/frame.hpp =================================================================== --- trunk/src/openmedialib/ml/frame.hpp 2007-10-28 15:47:52 UTC (rev 1323) +++ trunk/src/openmedialib/ml/frame.hpp 2007-10-28 16:15:47 UTC (rev 1324) @@ -17,11 +17,11 @@ namespace pcos = olib::openpluginlib::pcos; -typedef ML_DECLSPEC olib::openimagelib::il::image_type image_type; -typedef ML_DECLSPEC olib::openimagelib::il::image_type_ptr image_type_ptr; +typedef olib::openimagelib::il::image_type image_type; +typedef olib::openimagelib::il::image_type_ptr image_type_ptr; -class ML_DECLSPEC frame_type; -typedef ML_DECLSPEC boost::shared_ptr< frame_type > frame_type_ptr; +class frame_type; +typedef boost::shared_ptr< frame_type > frame_type_ptr; class ML_DECLSPEC frame_type { Modified: trunk/src/openmedialib/ml/input.hpp =================================================================== --- trunk/src/openmedialib/ml/input.hpp 2007-10-28 15:47:52 UTC (rev 1323) +++ trunk/src/openmedialib/ml/input.hpp 2007-10-28 16:15:47 UTC (rev 1324) @@ -47,7 +47,7 @@ process_flags; // Forward declarations -class ML_DECLSPEC input_type; +class input_type; typedef boost::shared_ptr< input_type > input_type_ptr; // The input abstract class - implementations will extend this class and (minimally) Modified: trunk/src/openmedialib/plugins/gensys/gensys_plugin.cpp =================================================================== --- trunk/src/openmedialib/plugins/gensys/gensys_plugin.cpp 2007-10-28 15:47:52 UTC (rev 1323) +++ trunk/src/openmedialib/plugins/gensys/gensys_plugin.cpp 2007-10-28 16:15:47 UTC (rev 1324) @@ -629,8 +629,8 @@ properties( ).append( prop_mix_ = 1.0 ); properties( ).append( prop_interp_ = opl::wstring( L"bilinear" ) ); properties( ).append( prop_slot_ = 0 ); - properties( ).append( prop_frame_rescale_cb_ = unsigned int( 0 ) ); - properties( ).append( prop_image_rescale_cb_ = unsigned int( 0 ) ); + properties( ).append( prop_frame_rescale_cb_ = ( void *) 0 ); + properties( ).append( prop_image_rescale_cb_ = ( void *) 0 ); } virtual const opl::wstring get_uri( ) const { return L"composite"; } @@ -785,8 +785,8 @@ background = frame_convert( background, L"yuv420p" ); foreground = frame_convert( foreground, background->get_image( )->pf( ) ); - frame_rescale_type f_rescale = reinterpret_cast< frame_rescale_type >( prop_frame_rescale_cb_.value< unsigned int >( ) ); - image_rescale_type i_rescale = reinterpret_cast< image_rescale_type >( prop_image_rescale_cb_.value< unsigned int >( ) ); + frame_rescale_type f_rescale = reinterpret_cast< frame_rescale_type >( prop_frame_rescale_cb_.value< void* >( ) ); + image_rescale_type i_rescale = reinterpret_cast< image_rescale_type >( prop_image_rescale_cb_.value< void* >( ) ); if( !f_rescale ) f_rescale = ml::frame_rescale; Modified: trunk/src/openmedialib/plugins/quicktime/quicktime_input.h =================================================================== --- trunk/src/openmedialib/plugins/quicktime/quicktime_input.h 2007-10-28 15:47:52 UTC (rev 1323) +++ trunk/src/openmedialib/plugins/quicktime/quicktime_input.h 2007-10-28 16:15:47 UTC (rev 1324) @@ -17,7 +17,6 @@ #include <QuickTimeComponents.h> #else #include <Quicktime/qtml.h> -#include <Quicktime/Gestalt.h> #include <Quicktime/QuickTimeComponents.h> #endif Modified: trunk/src/openobjectlib/Makefile.am =================================================================== --- trunk/src/openobjectlib/Makefile.am 2007-10-28 15:47:52 UTC (rev 1323) +++ trunk/src/openobjectlib/Makefile.am 2007-10-28 16:15:47 UTC (rev 1324) @@ -9,4 +9,4 @@ sg \ plugins -#endif +endif Modified: trunk/src/openobjectlib/plugins/Makefile.am =================================================================== --- trunk/src/openobjectlib/plugins/Makefile.am 2007-10-28 15:47:52 UTC (rev 1323) +++ trunk/src/openobjectlib/plugins/Makefile.am 2007-10-28 16:15:47 UTC (rev 1324) @@ -3,4 +3,4 @@ # # -SUBDIRS = 3ds obj X3D +SUBDIRS = obj X3D Modified: trunk/src/umbrella_framework/openlibraries.hpp =================================================================== --- trunk/src/umbrella_framework/openlibraries.hpp 2007-10-28 15:47:52 UTC (rev 1323) +++ trunk/src/umbrella_framework/openlibraries.hpp 2007-10-28 16:15:47 UTC (rev 1324) @@ -8,10 +8,18 @@ #ifndef OPENLIBRARIES_INC_ #define OPENLIBRARIES_INC_ +#ifdef HAVE_CONFIG_H +#include <openlibraries_global_config.hpp> +#endif + +#ifdef HAVE_PYTHON + #ifndef __OBJC__ #include <boost/python.hpp> #endif +#endif + #include <GL/glew.h> #include <boost/algorithm/string.hpp> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gl...@us...> - 2007-11-06 20:15:10
|
Revision: 1333 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1333&view=rev Author: glslang Date: 2007-11-06 12:15:06 -0800 (Tue, 06 Nov 2007) Log Message: ----------- + some win installer updates + linux compilation fix (courtesy of rexbron) Modified Paths: -------------- trunk/installer/openlibraries_sdk.nsi trunk/src/openpluginlib/pl/shlib.cpp Modified: trunk/installer/openlibraries_sdk.nsi =================================================================== --- trunk/installer/openlibraries_sdk.nsi 2007-11-04 11:18:20 UTC (rev 1332) +++ trunk/installer/openlibraries_sdk.nsi 2007-11-06 20:15:06 UTC (rev 1333) @@ -84,7 +84,7 @@ ;MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION ;"OpenLibraries v${VERSION} is already installed. $\n$\nClick `OK` to remove the - ;previous version or `Cancel` to cancel this upgrade. + ;previous version or `Cancel` to cancel this upgrade." ;/SD IDOK IDOK uninst ;Abort Modified: trunk/src/openpluginlib/pl/shlib.cpp =================================================================== --- trunk/src/openpluginlib/pl/shlib.cpp 2007-11-04 11:18:20 UTC (rev 1332) +++ trunk/src/openpluginlib/pl/shlib.cpp 2007-11-06 20:15:06 UTC (rev 1333) @@ -15,6 +15,8 @@ #include <windows.h> #elif defined __APPLE__ #include <CoreFoundation/CoreFoundation.h> +#else +#include <dlfcn.h> #endif #include <openpluginlib/pl/utf8_utils.hpp> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gl...@us...> - 2007-11-06 22:12:28
|
Revision: 1335 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1335&view=rev Author: glslang Date: 2007-11-06 14:12:26 -0800 (Tue, 06 Nov 2007) Log Message: ----------- + portability fixes Modified Paths: -------------- trunk/configure.ac trunk/openlibraries_vc8.sln trunk/src/openobjectlib/plugins/Makefile.am Added Paths: ----------- trunk/src/openobjectlib/plugins/wavefront/ Removed Paths: ------------- trunk/src/openobjectlib/plugins/obj/ Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2007-11-06 21:21:50 UTC (rev 1334) +++ trunk/configure.ac 2007-11-06 22:12:26 UTC (rev 1335) @@ -442,8 +442,8 @@ src/openobjectlib/Makefile src/openobjectlib/sg/Makefile src/openobjectlib/plugins/Makefile -src/openobjectlib/plugins/obj/Makefile src/openobjectlib/plugins/X3D/Makefile +src/openobjectlib/plugins/wavefront/Makefile src/openassetlib/Makefile src/openassetlib/al/Makefile src/openassetlib/py/Makefile Modified: trunk/openlibraries_vc8.sln =================================================================== --- trunk/openlibraries_vc8.sln 2007-11-06 21:21:50 UTC (rev 1334) +++ trunk/openlibraries_vc8.sln 2007-11-06 22:12:26 UTC (rev 1335) @@ -226,12 +226,6 @@ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "obj", "src\openobjectlib\plugins\obj\obj_vc8.vcproj", "{AE1793B8-18EA-4277-BFDD-8C9F2AFA0096}" - ProjectSection(ProjectDependencies) = postProject - {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} - {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "X3D", "src\openobjectlib\plugins\X3D\X3D_vc8.vcproj", "{7A98C731-F651-4427-BD02-25133DEA7171}" ProjectSection(ProjectDependencies) = postProject {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} @@ -386,6 +380,10 @@ {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "obj", "src\openobjectlib\plugins\wavefront\obj_vc8.vcproj", "{AE1793B8-18EA-4277-BFDD-8C9F2AFA0096}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Collada", "src\openobjectlib\plugins\Collada\Collada_vc8.vcproj", "{2A6A73A9-B72D-48ED-BDD5-48840A5DED6A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Multi-threaded Debug DLL|Win32 = Multi-threaded Debug DLL|Win32 @@ -524,10 +522,6 @@ {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32 {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32 {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32 - {AE1793B8-18EA-4277-BFDD-8C9F2AFA0096}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32 - {AE1793B8-18EA-4277-BFDD-8C9F2AFA0096}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32 - {AE1793B8-18EA-4277-BFDD-8C9F2AFA0096}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32 - {AE1793B8-18EA-4277-BFDD-8C9F2AFA0096}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32 {7A98C731-F651-4427-BD02-25133DEA7171}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32 {7A98C731-F651-4427-BD02-25133DEA7171}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32 {7A98C731-F651-4427-BD02-25133DEA7171}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32 @@ -624,6 +618,14 @@ {68B4BE77-E59E-4A24-9AF5-D4CEFF132B51}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32 {68B4BE77-E59E-4A24-9AF5-D4CEFF132B51}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32 {68B4BE77-E59E-4A24-9AF5-D4CEFF132B51}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32 + {AE1793B8-18EA-4277-BFDD-8C9F2AFA0096}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32 + {AE1793B8-18EA-4277-BFDD-8C9F2AFA0096}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32 + {AE1793B8-18EA-4277-BFDD-8C9F2AFA0096}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32 + {AE1793B8-18EA-4277-BFDD-8C9F2AFA0096}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32 + {2A6A73A9-B72D-48ED-BDD5-48840A5DED6A}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32 + {2A6A73A9-B72D-48ED-BDD5-48840A5DED6A}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32 + {2A6A73A9-B72D-48ED-BDD5-48840A5DED6A}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32 + {2A6A73A9-B72D-48ED-BDD5-48840A5DED6A}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -693,8 +695,9 @@ {0C4F7499-83C6-4143-A392-56F299345E8A} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8} {68B4BE77-E59E-4A24-9AF5-D4CEFF132B51} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8} {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {BD86F550-C573-4A68-955B-6CEDCC8F595D} + {7A98C731-F651-4427-BD02-25133DEA7171} = {9483FC7B-E396-43E6-84ED-EB021AC54252} {AE1793B8-18EA-4277-BFDD-8C9F2AFA0096} = {9483FC7B-E396-43E6-84ED-EB021AC54252} - {7A98C731-F651-4427-BD02-25133DEA7171} = {9483FC7B-E396-43E6-84ED-EB021AC54252} + {2A6A73A9-B72D-48ED-BDD5-48840A5DED6A} = {9483FC7B-E396-43E6-84ED-EB021AC54252} {BD346E41-BEBD-43E7-9801-8EC1158355C4} = {D3688A41-2908-41C0-8BF1-4AB6E3DFDBC4} {ECEDB34E-A863-420F-BFC6-F294AC078892} = {D3688A41-2908-41C0-8BF1-4AB6E3DFDBC4} {4B89FC29-D7E8-4E1A-99D7-17561B89DBEA} = {56A6ABC4-51B3-45A3-ADDD-D22A50AA55F9} Modified: trunk/src/openobjectlib/plugins/Makefile.am =================================================================== --- trunk/src/openobjectlib/plugins/Makefile.am 2007-11-06 21:21:50 UTC (rev 1334) +++ trunk/src/openobjectlib/plugins/Makefile.am 2007-11-06 22:12:26 UTC (rev 1335) @@ -3,4 +3,4 @@ # # -SUBDIRS = obj X3D +SUBDIRS = X3D wavefront Copied: trunk/src/openobjectlib/plugins/wavefront (from rev 1326, trunk/src/openobjectlib/plugins/obj) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gl...@us...> - 2007-11-06 22:58:19
|
Revision: 1338 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1338&view=rev Author: glslang Date: 2007-11-06 14:58:18 -0800 (Tue, 06 Nov 2007) Log Message: ----------- + win32 build fixes Modified Paths: -------------- trunk/openlibraries_vc8.sln trunk/src/openobjectlib/plugins/Collada/Collada_vc8.vcproj Modified: trunk/openlibraries_vc8.sln =================================================================== --- trunk/openlibraries_vc8.sln 2007-11-06 22:50:57 UTC (rev 1337) +++ trunk/openlibraries_vc8.sln 2007-11-06 22:58:18 UTC (rev 1338) @@ -381,8 +381,14 @@ EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "obj", "src\openobjectlib\plugins\wavefront\obj_vc8.vcproj", "{AE1793B8-18EA-4277-BFDD-8C9F2AFA0096}" + ProjectSection(ProjectDependencies) = postProject + {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Collada", "src\openobjectlib\plugins\Collada\Collada_vc8.vcproj", "{2A6A73A9-B72D-48ED-BDD5-48840A5DED6A}" + ProjectSection(ProjectDependencies) = postProject + {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Modified: trunk/src/openobjectlib/plugins/Collada/Collada_vc8.vcproj =================================================================== --- trunk/src/openobjectlib/plugins/Collada/Collada_vc8.vcproj 2007-11-06 22:50:57 UTC (rev 1337) +++ trunk/src/openobjectlib/plugins/Collada/Collada_vc8.vcproj 2007-11-06 22:58:18 UTC (rev 1338) @@ -43,7 +43,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""C:\Boost\include\boost-1_34_1";"$(SolutionDir)\src";"C:\Program Files\NVIDIA Corporation\Cg\include"" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DAE_EXPORTS;HAVE_OPENIMAGELIB;HAVE_CG_RUNTIME;OPENOBJECTLIB_BUILD;HAVE_BOOST_FILESYSTEM;HAVE_GL_GLEW_H" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DAE_EXPORTS;HAVE_OPENIMAGELIB;HAVE_CG_RUNTIME;OPENOBJECTLIB_BUILD;HAVE_BOOST_FILESYSTEM;HAVE_GL_GLEW_H;HAVE_FLEX_STRING" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -127,7 +127,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories=""C:\Boost\include\boost-1_34_1";"$(SolutionDir)\src";"C:\Program Files\NVIDIA Corporation\Cg\include"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DAE_EXPORTS;HAVE_OPENIMAGELIB;HAVE_CG_RUNTIME;OPENOBJECTLIB_BUILD;HAVE_BOOST_FILESYSTEM;HAVE_GL_GLEW_H" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DAE_EXPORTS;HAVE_OPENIMAGELIB;HAVE_CG_RUNTIME;OPENOBJECTLIB_BUILD;HAVE_BOOST_FILESYSTEM;HAVE_GL_GLEW_H;HAVE_FLEX_STRING" RuntimeLibrary="2" BufferSecurityCheck="false" TreatWChar_tAsBuiltInType="true" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gl...@us...> - 2007-11-10 16:39:05
|
Revision: 1339 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1339&view=rev Author: glslang Date: 2007-11-10 08:39:01 -0800 (Sat, 10 Nov 2007) Log Message: ----------- + removes rpath references and png fixes for leopard when X11 is installed Modified Paths: -------------- trunk/configure.ac trunk/m4/boost.m4 trunk/m4/glew.m4 trunk/m4/openal.m4 trunk/m4/openimagelib.m4 trunk/m4/qt.m4 trunk/openlibraries.pc.in trunk/src/openimagelib/plugins/png/Makefile.am Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2007-11-06 22:58:18 UTC (rev 1338) +++ trunk/configure.ac 2007-11-10 16:39:01 UTC (rev 1339) @@ -347,60 +347,28 @@ AC_SUBST(OPENASSETLIB_PLUGINPATH) AC_SUBST(OPENPLUGINLIB_LIBPATH) -# -# RPATHS -# - -case $host in - *-*-linux*) - OPENPLUGINLIB_RPATH="-Wl,-rpath=${OPENLIBRARIES_LIBPATH}/openpluginlib/$OL_LIBNAME" - OPENIMAGELIB_RPATH="-Wl,-rpath=${OPENLIBRARIES_LIBPATH}/openimagelib/$OL_LIBNAME" - OPENMEDIALIB_RPATH="-Wl,-rpath=${OPENLIBRARIES_LIBPATH}/openmedialib/$OL_LIBNAME" - OPENOBJECTLIB_RPATH="-Wl,-rpath=${OPENLIBRARIES_LIBPATH}/openobjectlib/$OL_LIBNAME" - OPENASSETLIB_RPATH="-Wl,-rpath=${OPENLIBRARIES_LIBPATH}/openassetlib/$OL_LIBNAME" - ;; - *) - OPENPLUGINLIB_RPATH="" - OPENIMAGELIB_RPATH="" - OPENMEDIALIB_RPATH="" - OPENOBJECTLIB_RPATH="" - OPENASSETLIB_RPATH="" - ;; -esac - dnl pkg config link flags OPENOBJECTLIB_LDFLAGS="" if test "x$enableobjectlib" = "xyes" && test "x$enableglew" = "xyes" ; then - OPENOBJECTLIB_LDFLAGS="$OPENOBJECTLIB_RPATH -L$OPENLIBRARIES_LIBPATH/openobjectlib/$OL_LIBNAME -lopenobjectlib_sg" -else - OPENOBJECTLIB_RPATH="" + OPENOBJECTLIB_LDFLAGS="-L$OPENLIBRARIES_LIBPATH/openobjectlib/$OL_LIBNAME -lopenobjectlib_sg" fi -AC_SUBST(OPENPLUGINLIB_RPATH) AC_SUBST(OPENOBJECTLIB_LDFLAGS) OPENASSETLIB_LDFLAGS="" if test "x$enableassetlib" = "xyes" && test "x$enableglew" = "xyes" ; then - OPENASSETLIB_LDFLAGS="$OPENASSETLIB_RPATH -L$OPENLIBRARIES_LIBPATH/openassetlib/$OL_LIBNAME -lopenassetlib_al" -else - OPENASSETLIB_RPATH="" + OPENASSETLIB_LDFLAGS="-L$OPENLIBRARIES_LIBPATH/openassetlib/$OL_LIBNAME -lopenassetlib_al" fi -AC_SUBST(OPENASSETLIB_RPATH) AC_SUBST(OPENASSETLIB_LDFLAGS) -OPENMEDIALIB_LDFLAGS="$OPENMEDIALIB_RPATH -L$OPENLIBRARIES_LIBPATH/openmedialib/$OL_LIBNAME -lopenmedialib_ml" +OPENMEDIALIB_LDFLAGS="-L$OPENLIBRARIES_LIBPATH/openmedialib/$OL_LIBNAME -lopenmedialib_ml" AC_SUBST(OPENMEDIALIB_LDFLAGS) -OPENIMAGELIB_LDFLAGS="$OPENIMAGELIB_RPATH -L$OPENLIBRARIES_LIBPATH/openimagelib/$OL_LIBNAME -lopenimagelib_il" +OPENIMAGELIB_LDFLAGS="-L$OPENLIBRARIES_LIBPATH/openimagelib/$OL_LIBNAME -lopenimagelib_il" AC_SUBST(OPENIMAGELIB_LDFLAGS) -OPENPLUGINLIB_LDFLAGS="$OPENPLUGINLIB_RPATH -L$OPENLIBRARIES_LIBPATH/openpluginlib/$OL_LIBNAME -lopenpluginlib_pl" +OPENPLUGINLIB_LDFLAGS="-L$OPENLIBRARIES_LIBPATH/openpluginlib/$OL_LIBNAME -lopenpluginlib_pl" AC_SUBST(OPENPLUGINLIB_LDFLAGS) -AC_SUBST(OPENIMAGELIB_RPATH) -AC_SUBST(OPENMEDIALIB_RPATH) -AC_SUBST(OPENOBJECTLIB_RPATH) -AC_SUBST(OPENASSETLIB_RPATH) - dnl dnl Output configuration files dnl Modified: trunk/m4/boost.m4 =================================================================== --- trunk/m4/boost.m4 2007-11-06 22:58:18 UTC (rev 1338) +++ trunk/m4/boost.m4 2007-11-10 16:39:01 UTC (rev 1339) @@ -48,16 +48,6 @@ BOOST_LIB_PATH="-L$with_boostprefix/$OL_LIBNAME" ,,) - BOOST_LIB_RPATH="" - - if test "x$with_boostprefix" != "x" ; then - case $host in - *-*-linux*) - BOOST_LIB_RPATH="-Wl,-rpath=$with_boostprefix/$OL_LIBNAME" - ;; - esac - fi - BOOST_LIBNAMESUFFIX="$BOOST_LIB_TOOLSET$BOOST_LIB_RUNTIME$BOOST_LIB_VERSION" BOOST_FILESYSTEM_LIBS="-lboost_filesystem$BOOST_LIB_TOOLSET$BOOST_LIB_RUNTIME$BOOST_LIB_VERSION" @@ -95,7 +85,6 @@ AC_SUBST(BOOST_LIB_TOOLSET) AC_SUBST(BOOST_INCLUDE_PATH) AC_SUBST(BOOST_LIB_PATH) - AC_SUBST(BOOST_LIB_RPATH) AC_SUBST(BOOST_FILESYSTEM_LIBS) AM_CONDITIONAL(HAVE_BOOST_FILESYSTEM, [test x$ac_use_boost_filesystem = "xyes"]) Modified: trunk/m4/glew.m4 =================================================================== --- trunk/m4/glew.m4 2007-11-06 22:58:18 UTC (rev 1338) +++ trunk/m4/glew.m4 2007-11-10 16:39:01 UTC (rev 1339) @@ -10,7 +10,6 @@ GLEW_PREFIX="$with_glewprefix" GLEW_INCLUDE_PATH="" GLEW_LIB_PATH="" - GLEW_LIB_RPATH="" GLEW_LIBS="" if test x$enableglew = "xyes" ; then @@ -31,23 +30,12 @@ [ac_have_glew="yes" GLEW_LIBS="-lGLEW" AC_DEFINE(HAVE_GL_GLEW_H, 1,[Define this if you have GLEW support])], [AC_MSG_ERROR([*** GLEW support is not available. Please install GLEW to proceed. ***])])] - LDFLAGS="$save_LDFLAGS", [AC_MSG_ERROR([*** GLEW support is not available. Please install GLEW to proceed. ***])],[]) - - if test x$ac_have_glew = "xyes"; then - ac_use_glew=yes - if test "x$with_glewprefix" != "x" ; then - case $host in - *-*-linux*) - GLEW_LIB_RPATH="-Wl,-rpath=$with_glewprefix/$OL_LIBNAME" - esac - fi - fi + LDFLAGS="$save_LDFLAGS", [AC_MSG_ERROR([*** GLEW support is not available. Please install GLEW to proceed. ***])],[]) fi AC_SUBST(GLEW_PREFIX) AC_SUBST(GLEW_INCLUDE_PATH) AC_SUBST(GLEW_LIB_PATH) - AC_SUBST(GLEW_LIB_RPATH) AC_SUBST(GLEW_LIBS) if test x$ac_use_glew = "xyes"; then Modified: trunk/m4/openal.m4 =================================================================== --- trunk/m4/openal.m4 2007-11-06 22:58:18 UTC (rev 1338) +++ trunk/m4/openal.m4 2007-11-10 16:39:01 UTC (rev 1339) @@ -18,7 +18,6 @@ OPENAL_PREFIX="$with_openalprefix" OPENAL_INCLUDE_PATH="" OPENAL_LIB_PATH="" - OPENAL_LIB_RPATH="" OPENAL_LIBS="" if test x$enableopenal = "xyes" ; then @@ -66,7 +65,6 @@ AC_SUBST(OPENAL_INCLUDE_PATH) AC_SUBST(OPENAL_LIB_PATH) - AC_SUBST(OPENAL_LIB_RPATH) AC_SUBST(OPENAL_LIBS) AM_CONDITIONAL(HAVE_OPENAL, [test x$ac_use_openal = "xyes"]) Modified: trunk/m4/openimagelib.m4 =================================================================== --- trunk/m4/openimagelib.m4 2007-11-06 22:58:18 UTC (rev 1338) +++ trunk/m4/openimagelib.m4 2007-11-10 16:39:01 UTC (rev 1339) @@ -21,14 +21,14 @@ AC_MSG_RESULT([*** PNG support is not available ***])) else PNG_CFLAGS=`$LIBPNG_CONFIG --cflags` - PNG_LIBS=`$LIBPNG_CONFIG --libs` + PNG_LDFLAGS=`$LIBPNG_CONFIG --ldflags` have_libpng="yes" AC_DEFINE(HAVE_LIBPNG,1,[Define this for PNG support]) fi AM_CONDITIONAL(HAVE_LIBPNG, test x"$have_libpng" = "xyes") AC_SUBST(PNG_CFLAGS) - AC_SUBST(PNG_LIBS) + AC_SUBST(PNG_LDFLAGS) dnl libjpeg support AC_CHECK_LIB(jpeg, jpeg_read_header, Modified: trunk/m4/qt.m4 =================================================================== --- trunk/m4/qt.m4 2007-11-06 22:58:18 UTC (rev 1338) +++ trunk/m4/qt.m4 2007-11-10 16:39:01 UTC (rev 1339) @@ -9,7 +9,6 @@ QT_INCLUDE_PATH="-I${with_qtinclude}" QT_LIB_PATH="-L${with_qtlib}" - QT_LIB_RPATH="" QT_LIBS="" case $host in @@ -52,7 +51,6 @@ AC_SUBST(QT_INCLUDE_PATH) AC_SUBST(QT_LIB_PATH) - AC_SUBST(QT_LIB_RPATH) AC_SUBST(QT_LIBS) AM_CONDITIONAL(HAVE_QT, [test x$ac_use_qt = "xyes"]) Modified: trunk/openlibraries.pc.in =================================================================== --- trunk/openlibraries.pc.in 2007-11-06 22:58:18 UTC (rev 1338) +++ trunk/openlibraries.pc.in 2007-11-10 16:39:01 UTC (rev 1339) @@ -18,9 +18,7 @@ Description: OpenLibraries - a library suite for non-linear editing, visual effects and rich media applications. Version: @OL_MAJOR@.@OL_MINOR@.@OL_SUB@ -Libs: @OPENPLUGINLIB_RPATH@ @OPENIMAGELIB_RPATH@ @OPENMEDIALIB_RPATH@ @OPENOBJECTLIB_RPATH@ \ - @OPENASSETLIB_RPATH@ @BOOST_LIB_RPATH@ @GLEW_LIB_RPATH@ \ - -L${libdir}/openlibraries-@OL_MAJOR@.@OL_MINOR@.@OL_SUB@/openobjectlib/@OL_LIBNAME@ -lopenobjectlib_sg \ +Libs: -L${libdir}/openlibraries-@OL_MAJOR@.@OL_MINOR@.@OL_SUB@/openobjectlib/@OL_LIBNAME@ -lopenobjectlib_sg \ -L${libdir}/openlibraries-@OL_MAJOR@.@OL_MINOR@.@OL_SUB@/openimagelib/@OL_LIBNAME@ -lopenimagelib_il \ -L${libdir}/openlibraries-@OL_MAJOR@.@OL_MINOR@.@OL_SUB@/openmedialib/@OL_LIBNAME@ -lopenmedialib_ml \ -L${libdir}/openlibraries-@OL_MAJOR@.@OL_MINOR@.@OL_SUB@/openpluginlib/@OL_LIBNAME@ -lopenpluginlib_pl \ Modified: trunk/src/openimagelib/plugins/png/Makefile.am =================================================================== --- trunk/src/openimagelib/plugins/png/Makefile.am 2007-11-06 22:58:18 UTC (rev 1338) +++ trunk/src/openimagelib/plugins/png/Makefile.am 2007-11-10 16:39:01 UTC (rev 1339) @@ -13,16 +13,17 @@ libopenimagelib_png_la_CXXFLAGS = \ $(OLIB_CXXFLAGS) \ + $(PNG_CFLAGS) \ $(BOOST_INCLUDE_PATH) \ -DIL_EXPORTS libopenimagelib_png_la_LIBADD = \ $(top_builddir)/src/openpluginlib/pl/libopenpluginlib_pl.la \ - $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la \ - $(PNG_LIBS) + $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la libopenimagelib_png_la_LDFLAGS = \ $(OLIB_LDFLAGS) \ + $(PNG_LDFLAGS) \ $(BOOST_LIB_PATH) \ -version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gl...@us...> - 2007-11-10 16:55:30
|
Revision: 1340 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1340&view=rev Author: glslang Date: 2007-11-10 08:55:23 -0800 (Sat, 10 Nov 2007) Log Message: ----------- + removes rpath references Modified Paths: -------------- trunk/src/openassetlib/al/Makefile.am trunk/src/openassetlib/plugins/sqlite/Makefile.am trunk/src/openassetlib/py/Makefile.am trunk/src/openimagelib/py/Makefile.am trunk/src/openmedialib/plugins/openal/Makefile.am trunk/src/openmedialib/py/Makefile.am trunk/src/openobjectlib/sg/Makefile.am trunk/src/openpluginlib/pl/Makefile.am trunk/src/openpluginlib/py/Makefile.am trunk/test/openeffectslib/tm_bench/Makefile.am trunk/test/openimagelib/GL/_2D/Makefile.am trunk/test/openimagelib/GL/_2D_compressed/Makefile.am trunk/test/openimagelib/GL/_2D_compressed_cubemap/Makefile.am trunk/test/openimagelib/GL/_2D_crop/Makefile.am trunk/test/openimagelib/GL/_2D_crop2/Makefile.am trunk/test/openimagelib/GL/_2D_exr/Makefile.am trunk/test/openimagelib/GL/_2D_scale/Makefile.am trunk/test/openimagelib/GL/_2D_sgi/Makefile.am trunk/test/openmedialib/player/Makefile.am trunk/test/openmedialib/store/Makefile.am trunk/test/openobjectlib/GL/multipass_draw/Makefile.am trunk/test/openobjectlib/GL/noise_volume/Makefile.am trunk/test/openobjectlib/GL/obj_draw/Makefile.am trunk/test/openobjectlib/GL/texture_draw/Makefile.am trunk/test/openpluginlib/discovery/Makefile.am trunk/test/openpluginlib/enumerate/Makefile.am trunk/test/openpluginlib/gettimeofday/Makefile.am trunk/test/openpluginlib/gpu_timer_query/Makefile.am trunk/test/openpluginlib/initialization/Makefile.am trunk/test/openpluginlib/pcos/key/Makefile.am trunk/test/openpluginlib/pcos/property/Makefile.am trunk/test/openpluginlib/pcos/property_container/Makefile.am trunk/test/openpluginlib/pcos/subject-observer/Makefile.am trunk/test/openpluginlib/rdtsc/Makefile.am Modified: trunk/src/openassetlib/al/Makefile.am =================================================================== --- trunk/src/openassetlib/al/Makefile.am 2007-11-10 16:39:01 UTC (rev 1339) +++ trunk/src/openassetlib/al/Makefile.am 2007-11-10 16:55:23 UTC (rev 1340) @@ -32,7 +32,6 @@ libopenassetlib_al_la_LDFLAGS = \ $(OLIB_LDFLAGS) \ - $(BOOST_LIB_PATH) \ $(XML2_LIBS) \ -version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE) Modified: trunk/src/openassetlib/plugins/sqlite/Makefile.am =================================================================== --- trunk/src/openassetlib/plugins/sqlite/Makefile.am 2007-11-10 16:39:01 UTC (rev 1339) +++ trunk/src/openassetlib/plugins/sqlite/Makefile.am 2007-11-10 16:55:23 UTC (rev 1340) @@ -32,7 +32,6 @@ libopenassetlib_sqlite3_plugin_la_LDFLAGS = \ $(OLIB_LDFLAGS) \ $(BOOST_LIB_PATH) \ - $(BOOST_LIB_RPATH) \ -version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE) libopenassetlib_sqlite3_plugin_ladir = $(OPENASSETLIB_PLUGINPATH) Modified: trunk/src/openassetlib/py/Makefile.am =================================================================== --- trunk/src/openassetlib/py/Makefile.am 2007-11-10 16:39:01 UTC (rev 1339) +++ trunk/src/openassetlib/py/Makefile.am 2007-11-10 16:55:23 UTC (rev 1340) @@ -32,7 +32,6 @@ libopenassetlib_py_la_LDFLAGS = \ $(OLIB_LDFLAGS) \ $(BOOST_LIB_PATH) \ - $(BOOST_LIB_RPATH) \ -version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE) endif Modified: trunk/src/openimagelib/py/Makefile.am =================================================================== --- trunk/src/openimagelib/py/Makefile.am 2007-11-10 16:39:01 UTC (rev 1339) +++ trunk/src/openimagelib/py/Makefile.am 2007-11-10 16:55:23 UTC (rev 1340) @@ -26,7 +26,6 @@ libopenimagelib_py_la_LDFLAGS = \ $(OLIB_LDFLAGS) \ $(BOOST_LIB_PATH) \ - $(BOOST_LIB_RPATH) \ -version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE) endif Modified: trunk/src/openmedialib/plugins/openal/Makefile.am =================================================================== --- trunk/src/openmedialib/plugins/openal/Makefile.am 2007-11-10 16:39:01 UTC (rev 1339) +++ trunk/src/openmedialib/plugins/openal/Makefile.am 2007-11-10 16:55:23 UTC (rev 1340) @@ -28,9 +28,7 @@ libopenmedialib_openal_la_LDFLAGS = \ $(OLIB_LDFLAGS) \ $(BOOST_LIB_PATH) \ - $(BOOST_LIB_RPATH) \ $(OPENAL_LIB_PATH) \ - $(OPENAL_LIB_RPATH) \ -version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE) libopenmedialib_openal_ladir = $(OPENMEDIALIB_PLUGINPATH) Modified: trunk/src/openmedialib/py/Makefile.am =================================================================== --- trunk/src/openmedialib/py/Makefile.am 2007-11-10 16:39:01 UTC (rev 1339) +++ trunk/src/openmedialib/py/Makefile.am 2007-11-10 16:55:23 UTC (rev 1340) @@ -26,7 +26,6 @@ libopenmedialib_py_la_LDFLAGS = \ $(OLIB_LDFLAGS) \ $(BOOST_LIB_PATH) \ - $(BOOST_LIB_RPATH) \ -version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE) endif Modified: trunk/src/openobjectlib/sg/Makefile.am =================================================================== --- trunk/src/openobjectlib/sg/Makefile.am 2007-11-10 16:39:01 UTC (rev 1339) +++ trunk/src/openobjectlib/sg/Makefile.am 2007-11-10 16:55:23 UTC (rev 1340) @@ -57,8 +57,6 @@ $(OLIB_LDFLAGS) \ $(BOOST_LIB_PATH) \ $(GLEW_LIB_PATH) \ - $(BOOST_LIB_RPATH) \ - $(GLEW_LIB_RPATH) \ -version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE) library_includedir = $(OPENLIBRARIES_INCLUDEPATH)/openobjectlib/sg Modified: trunk/src/openpluginlib/pl/Makefile.am =================================================================== --- trunk/src/openpluginlib/pl/Makefile.am 2007-11-10 16:39:01 UTC (rev 1339) +++ trunk/src/openpluginlib/pl/Makefile.am 2007-11-10 16:55:23 UTC (rev 1340) @@ -93,8 +93,6 @@ $(OLIB_LDFLAGS) \ $(BOOST_LIB_PATH) \ $(GLEW_LIB_PATH) \ - $(BOOST_LIB_RPATH) \ - $(GLEW_LIB_RPATH) \ -version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE) library_includedir = $(OPENLIBRARIES_INCLUDEPATH)/openpluginlib/pl Modified: trunk/src/openpluginlib/py/Makefile.am =================================================================== --- trunk/src/openpluginlib/py/Makefile.am 2007-11-10 16:39:01 UTC (rev 1339) +++ trunk/src/openpluginlib/py/Makefile.am 2007-11-10 16:55:23 UTC (rev 1340) @@ -46,8 +46,6 @@ $(OLIB_LDFLAGS) \ $(BOOST_LIB_PATH) \ $(GLEW_LIB_PATH) \ - $(BOOST_LIB_RPATH) \ - $(GLEW_LIB_RPATH) \ -version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE) endif Modified: trunk/test/openeffectslib/tm_bench/Makefile.am =================================================================== --- trunk/test/openeffectslib/tm_bench/Makefile.am 2007-11-10 16:39:01 UTC (rev 1339) +++ trunk/test/openeffectslib/tm_bench/Makefile.am 2007-11-10 16:55:23 UTC (rev 1340) @@ -15,8 +15,7 @@ tm_bench_LDFLAGS = \ $(OLIB_LDFLAGS) \ - $(BOOST_LIB_PATH) \ - $(BOOST_LIB_RPATH) + $(BOOST_LIB_PATH) tm_bench_LDADD = \ $(BOOST_FILESYSTEM_LIBS) \ Modified: trunk/test/openimagelib/GL/_2D/Makefile.am =================================================================== --- trunk/test/openimagelib/GL/_2D/Makefile.am 2007-11-10 16:39:01 UTC (rev 1339) +++ trunk/test/openimagelib/GL/_2D/Makefile.am 2007-11-10 16:55:23 UTC (rev 1340) @@ -17,9 +17,7 @@ _2D_LDFLAGS = \ $(OLIB_LDFLAGS) \ $(BOOST_LIB_PATH) \ - $(GLEW_LIB_PATH) \ - $(BOOST_LIB_RPATH) \ - $(GLEW_LIB_RPATH) + $(GLEW_LIB_PATH) _2D_LDADD = \ $(OPENGL_LIBS) \ Modified: trunk/test/openimagelib/GL/_2D_compressed/Makefile.am =================================================================== --- trunk/test/openimagelib/GL/_2D_compressed/Makefile.am 2007-11-10 16:39:01 UTC (rev 1339) +++ trunk/test/openimagelib/GL/_2D_compressed/Makefile.am 2007-11-10 16:55:23 UTC (rev 1340) @@ -17,9 +17,7 @@ _2D_compressed_LDFLAGS = \ $(OLIB_LDFLAGS) \ $(BOOST_LIB_PATH) \ - $(GLEW_LIB_PATH) \ - $(BOOST_LIB_RPATH) \ - $(GLEW_LIB_RPATH) + $(GLEW_LIB_PATH) _2D_compressed_LDADD = \ $(OPENGL_LIBS) \ Modified: trunk/test/openimagelib/GL/_2D_compressed_cubemap/Makefile.am =================================================================== --- trunk/test/openimagelib/GL/_2D_compressed_cubemap/Makefile.am 2007-11-10 16:39:01 UTC (rev 1339) +++ trunk/test/openimagelib/GL/_2D_compressed_cubemap/Makefile.am 2007-11-10 16:55:23 UTC (rev 1340) @@ -17,9 +17,7 @@ _2D_compressed_cubemap_LDFLAGS = \ $(OLIB_LDFLAGS) \ $(BOOST_LIB_PATH) \ - $(GLEW_LIB_PATH) \ - $(BOOST_LIB_RPATH) \ - $(GLEW_LIB_RPATH) + $(GLEW_LIB_PATH) _2D_compressed_cubemap_LDADD = \ $(OPENGL_LIBS) \ Modified: trunk/test/openimagelib/GL/_2D_crop/Makefile.am =================================================================== --- trunk/test/openimagelib/GL/_2D_crop/Makefile.am 2007-11-10 16:39:01 UTC (rev 1339) +++ trunk/test/openimagelib/GL/_2D_crop/Makefile.am 2007-11-10 16:55:23 UTC (rev 1340) @@ -17,9 +17,7 @@ _2D_crop_LDFLAGS = \ $(OLIB_LDFLAGS) \ $(BOOST_LIB_PATH) \ - $(GLEW_LIB_PATH) \ - $(BOOST_LIB_RPATH) \ - $(GLEW_LIB_RPATH) + $(GLEW_LIB_PATH) _2D_crop_LDADD = \ $(OPENGL_LIBS) \ Modified: trunk/test/openimagelib/GL/_2D_crop2/Makefile.am =================================================================== --- trunk/test/openimagelib/GL/_2D_crop2/Makefile.am 2007-11-10 16:39:01 UTC (rev 1339) +++ trunk/test/openimagelib/GL/_2D_crop2/Makefile.am 2007-11-10 16:55:23 UTC (rev 1340) @@ -17,9 +17,7 @@ _2D_crop2_LDFLAGS = \ $(OLIB_LDFLAGS) \ $(BOOST_LIB_PATH) \ - $(GLEW_LIB_PATH) \ - $(BOOST_LIB_RPATH) \ - $(GLEW_LIB_RPATH) + $(GLEW_LIB_PATH) _2D_crop2_LDADD = \ $(OPENGL_LIBS) \ Modified: trunk/test/openimagelib/GL/_2D_exr/Makefile.am =================================================================== --- trunk/test/openimagelib/GL/_2D_exr/Makefile.am 2007-11-10 16:39:01 UTC (rev 1339) +++ trunk/test/openimagelib/GL/_2D_exr/Makefile.am 2007-11-10 16:55:23 UTC (rev 1340) @@ -17,9 +17,7 @@ _2D_exr_LDFLAGS = \ $(OLIB_LDFLAGS) \ $(BOOST_LIB_PATH) \ - $(GLEW_LIB_PATH) \ - $(BOOST_LIB_RPATH) \ - $(GLEW_LIB_RPATH) + $(GLEW_LIB_PATH) _2D_exr_LDADD = \ $(OPENGL_LIBS) \ Modified: trunk/test/openimagelib/GL/_2D_scale/Makefile.am =================================================================== --- trunk/test/openimagelib/GL/_2D_scale/Makefile.am 2007-11-10 16:39:01 UTC (rev 1339) +++ trunk/test/openimagelib/GL/_2D_scale/Makefile.am 2007-11-10 16:55:23 UTC (rev 1340) @@ -16,9 +16,7 @@ _2D_scale_LDFLAGS = \ $(OLIB_LDFLAGS) \ $(BOOST_LIB_PATH) \ - $(GLEW_LIB_PATH) \ - $(BOOST_LIB_RPATH) \ - $(GLEW_LIB_RPATH) + $(GLEW_LIB_PATH) _2D_scale_LDADD = \ $(OPENGL_LIBS) \ Modified: trunk/test/openimagelib/GL/_2D_sgi/Makefile.am =================================================================== --- trunk/test/openimagelib/GL/_2D_sgi/Makefile.am 2007-11-10 16:39:01 UTC (rev 1339) +++ trunk/test/openimagelib/GL/_2D_sgi/Makefile.am 2007-11-10 16:55:23 UTC (rev 1340) @@ -17,9 +17,7 @@ _2D_sgi_LDFLAGS = \ $(OLIB_LDFLAGS) \ $(BOOST_LIB_PATH) \ - $(GLEW_LIB_PATH) \ - $(BOOST_LIB_RPATH) \ - $(GLEW_LIB_RPATH) + $(GLEW_LIB_PATH) _2D_sgi_LDADD = \ $(OPENGL_LIBS) \ Modified: trunk/test/openmedialib/player/Makefile.am =================================================================== --- trunk/test/openmedialib/player/Makefile.am 2007-11-10 16:39:01 UTC (rev 1339) +++ trunk/test/openmedialib/player/Makefile.am 2007-11-10 16:55:23 UTC (rev 1340) @@ -20,9 +20,7 @@ player_LDFLAGS = \ $(OLIB_LDFLAGS) \ $(BOOST_LIB_PATH) \ - $(GLEW_LIB_PATH) \ - $(BOOST_LIB_RPATH) \ - $(GLEW_LIB_RPATH) + $(GLEW_LIB_PATH) player_LDADD = \ $(OPENGL_LIBS) \ Modified: trunk/test/openmedialib/store/Makefile.am =================================================================== --- trunk/test/openmedialib/store/Makefile.am 2007-11-10 16:39:01 UTC (rev 1339) +++ trunk/test/openmedialib/store/Makefile.am 2007-11-10 16:55:23 UTC (rev 1340) @@ -10,8 +10,7 @@ -DOPENMEDIALIB_PLUGINS=\"$(OPENMEDIALIB_PLUGINPATH)\" store_LDFLAGS = \ - $(OLIB_LDFLAGS) \ - $(BOOST_LIB_RPATH) + $(OLIB_LDFLAGS) store_LDADD = \ $(BOOST_FILESYSTEM_LIBS) \ Modified: trunk/test/openobjectlib/GL/multipass_draw/Makefile.am =================================================================== --- trunk/test/openobjectlib/GL/multipass_draw/Makefile.am 2007-11-10 16:39:01 UTC (rev 1339) +++ trunk/test/openobjectlib/GL/multipass_draw/Makefile.am 2007-11-10 16:55:23 UTC (rev 1340) @@ -16,9 +16,7 @@ -DOPENPLUGINS=\"$(OPENIMAGELIB_PLUGINPATH):$(OPENOBJECTLIB_PLUGINPATH)\" multipass_draw_LDFLAGS = \ - $(OLIB_LDFLAGS) \ - $(BOOST_LIB_RPATH) \ - $(GLEW_LIB_RPATH) + $(OLIB_LDFLAGS) multipass_draw_LDADD = \ $(OPENGL_LIBS) \ Modified: trunk/test/openobjectlib/GL/noise_volume/Makefile.am =================================================================== --- trunk/test/openobjectlib/GL/noise_volume/Makefile.am 2007-11-10 16:39:01 UTC (rev 1339) +++ trunk/test/openobjectlib/GL/noise_volume/Makefile.am 2007-11-10 16:55:23 UTC (rev 1340) @@ -16,9 +16,7 @@ -DOPENPLUGINS=\"$(OPENIMAGELIB_PLUGINPATH):$(OPENOBJECTLIB_PLUGINPATH)\" noise_volume_LDFLAGS = \ - $(OLIB_LDFLAGS) \ - $(BOOST_LIB_RPATH) \ - $(GLEW_LIB_RPATH) + $(OLIB_LDFLAGS) noise_volume_LDADD = \ $(OPENGL_LIBS) \ Modified: trunk/test/openobjectlib/GL/obj_draw/Makefile.am =================================================================== --- trunk/test/openobjectlib/GL/obj_draw/Makefile.am 2007-11-10 16:39:01 UTC (rev 1339) +++ trunk/test/openobjectlib/GL/obj_draw/Makefile.am 2007-11-10 16:55:23 UTC (rev 1340) @@ -16,9 +16,7 @@ -DOPENPLUGINS=\"$(OPENIMAGELIB_PLUGINPATH):$(OPENOBJECTLIB_PLUGINPATH)\" obj_draw_LDFLAGS = \ - $(OLIB_LDFLAGS) \ - $(BOOST_LIB_RPATH) \ - $(GLEW_LIB_RPATH) + $(OLIB_LDFLAGS) obj_draw_LDADD = \ $(OPENGL_LIBS) \ Modified: trunk/test/openobjectlib/GL/texture_draw/Makefile.am =================================================================== --- trunk/test/openobjectlib/GL/texture_draw/Makefile.am 2007-11-10 16:39:01 UTC (rev 1339) +++ trunk/test/openobjectlib/GL/texture_draw/Makefile.am 2007-11-10 16:55:23 UTC (rev 1340) @@ -15,9 +15,7 @@ $(OIL_CXXFLAGS) texture_draw_LDFLAGS = \ - $(OLIB_LDFLAGS) \ - $(BOOST_LIB_RPATH) \ - $(GLEW_LIB_RPATH) + $(OLIB_LDFLAGS) texture_draw_LDADD = \ $(OPENGL_LIBS) \ Modified: trunk/test/openpluginlib/discovery/Makefile.am =================================================================== --- trunk/test/openpluginlib/discovery/Makefile.am 2007-11-10 16:39:01 UTC (rev 1339) +++ trunk/test/openpluginlib/discovery/Makefile.am 2007-11-10 16:55:23 UTC (rev 1340) @@ -13,8 +13,7 @@ $(BOOST_INCLUDE_PATH) discovery_LDFLAGS = \ - $(OLIB_LDFLAGS) \ - $(BOOST_LIB_RPATH) + $(OLIB_LDFLAGS) discovery_LDADD = \ $(BOOST_FILESYSTEM_LIBS) \ Modified: trunk/test/openpluginlib/enumerate/Makefile.am =================================================================== --- trunk/test/openpluginlib/enumerate/Makefile.am 2007-11-10 16:39:01 UTC (rev 1339) +++ trunk/test/openpluginlib/enumerate/Makefile.am 2007-11-10 16:55:23 UTC (rev 1340) @@ -13,8 +13,7 @@ $(BOOST_INCLUDE_PATH) enumerate_LDFLAGS = \ - $(OLIB_LDFLAGS) \ - $(BOOST_LIB_RPATH) + $(OLIB_LDFLAGS) enumerate_LDADD = \ $(BOOST_FILESYSTEM_LIBS) \ Modified: trunk/test/openpluginlib/gettimeofday/Makefile.am =================================================================== --- trunk/test/openpluginlib/gettimeofday/Makefile.am 2007-11-10 16:39:01 UTC (rev 1339) +++ trunk/test/openpluginlib/gettimeofday/Makefile.am 2007-11-10 16:55:23 UTC (rev 1340) @@ -15,9 +15,7 @@ gettimeofday_LDFLAGS = \ $(OLIB_LDFLAGS) \ - $(GLEW_LIB_PATH) \ - $(BOOST_LIB_RPATH) \ - $(GLEW_LIB_RPATH) + $(GLEW_LIB_PATH) gettimeofday_LDADD = \ $(BOOST_FILESYSTEM_LIBS) \ Modified: trunk/test/openpluginlib/gpu_timer_query/Makefile.am =================================================================== --- trunk/test/openpluginlib/gpu_timer_query/Makefile.am 2007-11-10 16:39:01 UTC (rev 1339) +++ trunk/test/openpluginlib/gpu_timer_query/Makefile.am 2007-11-10 16:55:23 UTC (rev 1340) @@ -18,9 +18,7 @@ gpu_timer_query_LDFLAGS = \ $(OLIB_LDFLAGS) \ $(BOOST_LIB_PATH) \ - $(GLEW_LIB_PATH) \ - $(BOOST_LIB_RPATH) \ - $(GLEW_LIB_RPATH) + $(GLEW_LIB_PATH) gpu_timer_query_LDADD = \ $(OPENGL_LIBS) \ Modified: trunk/test/openpluginlib/initialization/Makefile.am =================================================================== --- trunk/test/openpluginlib/initialization/Makefile.am 2007-11-10 16:39:01 UTC (rev 1339) +++ trunk/test/openpluginlib/initialization/Makefile.am 2007-11-10 16:55:23 UTC (rev 1340) @@ -14,8 +14,7 @@ # end initialization_LDFLAGS = \ - $(OLIB_LDFLAGS) \ - $(BOOST_LIB_RPATH) + $(OLIB_LDFLAGS) initialization_LDADD = \ $(BOOST_FILESYSTEM_LIBS) \ Modified: trunk/test/openpluginlib/pcos/key/Makefile.am =================================================================== --- trunk/test/openpluginlib/pcos/key/Makefile.am 2007-11-10 16:39:01 UTC (rev 1339) +++ trunk/test/openpluginlib/pcos/key/Makefile.am 2007-11-10 16:55:23 UTC (rev 1340) @@ -13,8 +13,7 @@ $(BOOST_INCLUDE_PATH) key_LDFLAGS = \ - $(OLIB_LDFLAGS) \ - $(BOOST_LIB_RPATH) + $(OLIB_LDFLAGS) key_LDADD = \ $(top_builddir)/src/openpluginlib/pl/libopenpluginlib_pl.la \ Modified: trunk/test/openpluginlib/pcos/property/Makefile.am =================================================================== --- trunk/test/openpluginlib/pcos/property/Makefile.am 2007-11-10 16:39:01 UTC (rev 1339) +++ trunk/test/openpluginlib/pcos/property/Makefile.am 2007-11-10 16:55:23 UTC (rev 1340) @@ -13,8 +13,7 @@ $(BOOST_INCLUDE_PATH) property_LDFLAGS = \ - $(OLIB_LDFLAGS) \ - $(BOOST_LIB_RPATH) + $(OLIB_LDFLAGS) property_LDADD = \ $(top_builddir)/src/openpluginlib/pl/libopenpluginlib_pl.la \ Modified: trunk/test/openpluginlib/pcos/property_container/Makefile.am =================================================================== --- trunk/test/openpluginlib/pcos/property_container/Makefile.am 2007-11-10 16:39:01 UTC (rev 1339) +++ trunk/test/openpluginlib/pcos/property_container/Makefile.am 2007-11-10 16:55:23 UTC (rev 1340) @@ -13,8 +13,7 @@ $(BOOST_INCLUDE_PATH) property_container_LDFLAGS = \ - $(OLIB_LDFLAGS) \ - $(BOOST_LIB_RPATH) + $(OLIB_LDFLAGS) property_container_LDADD = \ $(top_builddir)/src/openpluginlib/pl/libopenpluginlib_pl.la \ Modified: trunk/test/openpluginlib/pcos/subject-observer/Makefile.am =================================================================== --- trunk/test/openpluginlib/pcos/subject-observer/Makefile.am 2007-11-10 16:39:01 UTC (rev 1339) +++ trunk/test/openpluginlib/pcos/subject-observer/Makefile.am 2007-11-10 16:55:23 UTC (rev 1340) @@ -13,8 +13,7 @@ $(BOOST_INCLUDE_PATH) subjectobserver_LDFLAGS = \ - $(OLIB_LDFLAGS) \ - $(BOOST_LIB_RPATH) + $(OLIB_LDFLAGS) subjectobserver_LDADD = \ $(top_builddir)/src/openpluginlib/pl/libopenpluginlib_pl.la \ Modified: trunk/test/openpluginlib/rdtsc/Makefile.am =================================================================== --- trunk/test/openpluginlib/rdtsc/Makefile.am 2007-11-10 16:39:01 UTC (rev 1339) +++ trunk/test/openpluginlib/rdtsc/Makefile.am 2007-11-10 16:55:23 UTC (rev 1340) @@ -15,9 +15,7 @@ rdtsc_LDFLAGS = \ $(OLIB_LDFLAGS) \ - $(GLEW_LIB_PATH) \ - $(BOOST_LIB_RPATH) \ - $(GLEW_LIB_RPATH) + $(GLEW_LIB_PATH) rdtsc_LDADD = \ $(BOOST_FILESYSTEM_LIBS) \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gl...@us...> - 2007-11-11 14:37:54
|
Revision: 1342 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1342&view=rev Author: glslang Date: 2007-11-11 06:37:51 -0800 (Sun, 11 Nov 2007) Log Message: ----------- + adds ogg to the formats + updated win installers Modified Paths: -------------- trunk/installer/openlibraries_runtime.nsi trunk/installer/openlibraries_sdk.nsi trunk/src/openmedialib/plugins/avformat/avformat_plugin.opl Modified: trunk/installer/openlibraries_runtime.nsi =================================================================== --- trunk/installer/openlibraries_runtime.nsi 2007-11-10 20:11:49 UTC (rev 1341) +++ trunk/installer/openlibraries_runtime.nsi 2007-11-11 14:37:51 UTC (rev 1342) @@ -156,18 +156,21 @@ File "C:\Program Files\FFmpeg\lib\avformat-51.dll" File "C:\Program Files\FFmpeg\lib\avutil-49.dll" ; File "C:\Program Files\FFmpeg\lib\libogg-0.dll" - File "C:\OpenEXR\bin\Debug\Half.dll" - File "C:\OpenEXR\bin\Debug\Iex.dll" - File "C:\OpenEXR\bin\Debug\IlmImf.dll" - File "C:\OpenEXR\bin\Debug\Half.dll" - File "C:\OpenEXR\bin\Debug\IlmThread.dll" - File "C:\OpenEXR\bin\Debug\Imath.dll" + File "C:\OpenEXR\bin\Release\Half.dll" + File "C:\OpenEXR\bin\Release\Iex.dll" + File "C:\OpenEXR\bin\Release\IlmImf.dll" + File "C:\OpenEXR\bin\Release\Half.dll" + File "C:\OpenEXR\bin\Release\IlmThread.dll" + File "C:\OpenEXR\bin\Release\Imath.dll" ; File "C:\SDL-1.2.11\lib\SDL.dll" File "C:\Program Files\NVIDIA Corporation\Cg\bin\cg.dll" File "C:\Program Files\NVIDIA Corporation\Cg\bin\cgGL.dll" File "C:\Windows\system32\glew32.dll" File "c:\Windows\system32\python25.dll" File "c:\boost\lib\boost_python-vc80-mt-1_34_1.dll" + File "c:\boost\lib\boost_thread-vc80-mt-1_34_1.dll" + File "c:\boost\lib\boost_regex-vc80-mt-1_34_1.dll" + File "c:\boost\lib\boost_iostreams-vc80-mt-1_34_1.dll" File "C:\zlib\lib\zlib1.dll" ; Python Modified: trunk/installer/openlibraries_sdk.nsi =================================================================== --- trunk/installer/openlibraries_sdk.nsi 2007-11-10 20:11:49 UTC (rev 1341) +++ trunk/installer/openlibraries_sdk.nsi 2007-11-11 14:37:51 UTC (rev 1342) @@ -298,8 +298,8 @@ File "..\src\openmedialib\plugins\quicktime\Multi-threaded Debug DLL\openmedialib_quicktime-vc80-d-${VERSION}.dll" ; File "..\src\openmedialib\plugins\sdl\sdl_plugin.opl" ; File "..\src\openmedialib\plugins\sdl\Multi-threaded Debug DLL\openmedialib_sdl-vc80-d-${VERSION}.dll" - File "..\src\openobjectlib\plugins\obj\obj_plugin.opl" - File "..\src\openobjectlib\plugins\obj\Multi-threaded Debug DLL\openobjectlib_obj-vc80-d-${VERSION}.dll" + File "..\src\openobjectlib\plugins\wavefront\obj_plugin.opl" + File "..\src\openobjectlib\plugins\wavefront\Multi-threaded Debug DLL\openobjectlib_obj-vc80-d-${VERSION}.dll" File "..\src\openobjectlib\plugins\X3D\x3d_plugin.opl" File "..\src\openobjectlib\plugins\X3D\Multi-threaded Debug DLL\openobjectlib_x3d-vc80-d-${VERSION}.dll" ; File "..\src\openobjectlib\plugins\Collada\collada_plugin.opl" @@ -340,8 +340,8 @@ File "..\src\openmedialib\plugins\quicktime\Multi-threaded Release DLL\openmedialib_quicktime-vc80-r-${VERSION}.dll" ; File "..\src\openmedialib\plugins\sdl\sdl_plugin.opl" ; File "..\src\openmedialib\plugins\sdl\Multi-threaded Release DLL\openmedialib_sdl-vc80-r-${VERSION}.dll" - File "..\src\openobjectlib\plugins\obj\obj_plugin.opl" - File "..\src\openobjectlib\plugins\obj\Multi-threaded Release DLL\openobjectlib_obj-vc80-r-${VERSION}.dll" + File "..\src\openobjectlib\plugins\wavefront\obj_plugin.opl" + File "..\src\openobjectlib\plugins\wavefront\Multi-threaded Release DLL\openobjectlib_obj-vc80-r-${VERSION}.dll" File "..\src\openobjectlib\plugins\X3D\x3d_plugin.opl" File "..\src\openobjectlib\plugins\X3D\Multi-threaded Release DLL\openobjectlib_x3d-vc80-r-${VERSION}.dll" ; File "..\src\openobjectlib\plugins\Collada\collada_plugin.opl" Modified: trunk/src/openmedialib/plugins/avformat/avformat_plugin.opl =================================================================== --- trunk/src/openmedialib/plugins/avformat/avformat_plugin.opl 2007-11-10 20:11:49 UTC (rev 1341) +++ trunk/src/openmedialib/plugins/avformat/avformat_plugin.opl 2007-11-11 14:37:51 UTC (rev 1342) @@ -2,8 +2,8 @@ <openlibraries version="1.0"> <!-- plugins go here --> <openmedialib name="oml" version="0.1.0"> - <plugin name="OpenLibraries avformat plugin" type="input" in_filter="*.avi *.dv *.dif *.mpg *.mpeg *.mp3 *.mp2 *.wav *.aif" extension='"oml:.*", ".*\.avi", ".*\.dv", ".*\.dif", ".*\.mp4", ".*\.mov", ".*\.mpg", ".*\.mpeg", ".*\.mp3", ".*\.mp2", ".*\.mxf", ".*\.wav", ".*\.wmv", ".*\.aif", "/dev/.*1394/.*", "dv:-", "mpeg:-", ".*\.flv", ".*\.swf", ".*\.asf", ".*\.ts", ".*\.vob"' merit="5" filename='"libopenmedialib_avformat.so", "libopenmedialib_avformat.dylib", "openmedialib_avformat-vc80-d-0_5_0.dll", "openmedialib_avformat-vc80-r-0_5_0.dll"'/> - <plugin name="OpenLibraries avformat plugin" type="output" extension='"pipe:", ".*\.mpg", ".*\.avi", ".*\.dv", ".*\.mov", ".*\.ogg", ".*\.mp2", ".*\.mp3", ".*\.mp4", ".*\.vob", ".*\.wav", ".*\.flv", ".*\.swf", ".*\.swf"' merit="5" filename='"libopenmedialib_avformat.so", "libopenmedialib_avformat.dylib", "openmedialib_avformat-vc80-d-0_5_0.dll", "openmedialib_avformat-vc80-r-0_5_0.dll"'/> + <plugin name="OpenLibraries avformat plugin" type="input" in_filter="*.avi *.dv *.dif *.mpg *.mpeg *.mp3 *.mp2 *.wav *.aif" extension='"oml:.*", ".*\.avi", ".*\.dv", ".*\.dif", ".*\.mp4", ".*\.mov", ".*\.mpg", ".*\.mpeg", ".*\.mp3", ".*\.mp2", ".*\.mxf", ".*\.wav", ".*\.wmv", ".*\.aif", "/dev/.*1394/.*", "dv:-", "mpeg:-", ".*\.flv", ".*\.swf", ".*\.asf", ".*\.ts", ".*\.vob", ".*\.ogg"' merit="5" filename='"libopenmedialib_avformat.so", "libopenmedialib_avformat.dylib", "openmedialib_avformat-vc80-d-0_5_0.dll", "openmedialib_avformat-vc80-r-0_5_0.dll"'/> + <plugin name="OpenLibraries avformat plugin" type="output" extension='"pipe:", ".*\.mpg", ".*\.avi", ".*\.dv", ".*\.mov", ".*\.ogg", ".*\.mp2", ".*\.mp3", ".*\.mp4", ".*\.vob", ".*\.wav", ".*\.flv", ".*\.swf", ".*\.swf", ".*\.ogg"' merit="5" filename='"libopenmedialib_avformat.so", "libopenmedialib_avformat.dylib", "openmedialib_avformat-vc80-d-0_5_0.dll", "openmedialib_avformat-vc80-r-0_5_0.dll"'/> <plugin name="OpenLibraries avformat plugin" type="filter" extension='"resampler"' merit="0" filename='"libopenmedialib_avformat.so", "libopenmedialib_avformat.dylib", "openmedialib_avformat-vc80-d-0_5_0.dll", "openmedialib_avformat-vc80-r-0_5_0.dll"'/> </openmedialib> </openlibraries> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gl...@us...> - 2007-11-18 18:19:48
|
Revision: 1345 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1345&view=rev Author: glslang Date: 2007-11-18 10:19:46 -0800 (Sun, 18 Nov 2007) Log Message: ----------- + bug fixes Modified Paths: -------------- trunk/installer/openlibraries_runtime.nsi trunk/src/openassetlib/al/al.cpp trunk/src/openassetlib/plugins/sqlite/sqlite3_metadata_plugin.cpp Modified: trunk/installer/openlibraries_runtime.nsi =================================================================== --- trunk/installer/openlibraries_runtime.nsi 2007-11-15 22:59:27 UTC (rev 1344) +++ trunk/installer/openlibraries_runtime.nsi 2007-11-18 18:19:46 UTC (rev 1345) @@ -171,6 +171,7 @@ File "c:\boost\lib\boost_thread-vc80-mt-1_34_1.dll" File "c:\boost\lib\boost_regex-vc80-mt-1_34_1.dll" File "c:\boost\lib\boost_iostreams-vc80-mt-1_34_1.dll" + File "c:\boost\lib\boost_filesystem-vc80-mt-1_34_1.dll" File "C:\zlib\lib\zlib1.dll" ; Python Modified: trunk/src/openassetlib/al/al.cpp =================================================================== --- trunk/src/openassetlib/al/al.cpp 2007-11-15 22:59:27 UTC (rev 1344) +++ trunk/src/openassetlib/al/al.cpp 2007-11-18 18:19:46 UTC (rev 1345) @@ -415,7 +415,7 @@ try { - MSXML2::IXMLDOMDocument2Ptr pXMLDoc(__uuidof(MSXML2::DOMDocument40)); + MSXML2::IXMLDOMDocument2Ptr pXMLDoc(__uuidof(MSXML2::DOMDocument60)); pXMLDoc->validateOnParse = VARIANT_FALSE; MSXML2::IXMLDOMProcessingInstructionPtr pIXMLDOMProcessingInstruction = pXMLDoc->createProcessingInstruction(L"xml", L"version='1.0' encoding='UTF-8'"); @@ -492,7 +492,7 @@ try { - MSXML2::IXMLDOMDocument2Ptr pXMLDoc(__uuidof(MSXML2::DOMDocument40)); + MSXML2::IXMLDOMDocument2Ptr pXMLDoc(__uuidof(MSXML2::DOMDocument60)); pXMLDoc->validateOnParse = VARIANT_FALSE; if(pXMLDoc->load(_variant_t(xmlfile.c_str())) == VARIANT_FALSE) return set_ptr(); Modified: trunk/src/openassetlib/plugins/sqlite/sqlite3_metadata_plugin.cpp =================================================================== --- trunk/src/openassetlib/plugins/sqlite/sqlite3_metadata_plugin.cpp 2007-11-15 22:59:27 UTC (rev 1344) +++ trunk/src/openassetlib/plugins/sqlite/sqlite3_metadata_plugin.cpp 2007-11-18 18:19:46 UTC (rev 1345) @@ -168,7 +168,7 @@ try { // Create XML DOM and load up with string passed in - MSXML2::IXMLDOMDocument2Ptr pXMLDoc(__uuidof(MSXML2::DOMDocument40)); + MSXML2::IXMLDOMDocument2Ptr pXMLDoc(__uuidof(MSXML2::DOMDocument60)); pXMLDoc->validateOnParse = VARIANT_FALSE; if(pXMLDoc->loadXML(_bstr_t(query_xml.c_str())) == VARIANT_FALSE) return al::set_ptr(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gl...@us...> - 2007-12-02 20:00:54
|
Revision: 1346 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1346&view=rev Author: glslang Date: 2007-12-02 12:00:46 -0800 (Sun, 02 Dec 2007) Log Message: ----------- + generate OS/X frameworks script. From www.hdrflow.com Modified Paths: -------------- trunk/src/umbrella_framework/Makefile.am Added Paths: ----------- trunk/unity.sh Modified: trunk/src/umbrella_framework/Makefile.am =================================================================== --- trunk/src/umbrella_framework/Makefile.am 2007-11-18 18:19:46 UTC (rev 1345) +++ trunk/src/umbrella_framework/Makefile.am 2007-12-02 20:00:46 UTC (rev 1346) @@ -1,41 +1,42 @@ - -# -# -# - -libdir = $(OPENMEDIALIB_LIBPATH) - -if HAVE_UMBRELLAFRAMEWORK - -lib_LTLIBRARIES = libumbrella_framework.la - -libumbrella_framework_la_SOURCES = \ - openlibraries.cpp \ - openlibraries.hpp - -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 \ - $(BOOST_PYTHON_LIBS) \ - $(GLEW_LIBS) - -libumbrella_framework_la_LDFLAGS = \ - $(OLIB_LDFLAGS) \ - $(BOOST_LIB_PATH) \ - -version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE) - -library_includedir = $(OPENLIBRARIES_INCLUDEPATH)/openmedialib/ml - -library_include_HEADERS = \ - openlibraries.hpp - -endif - - + +# +# +# + +libdir = $(OPENMEDIALIB_LIBPATH) + +if HAVE_UMBRELLAFRAMEWORK + +lib_LTLIBRARIES = libumbrella_framework.la + +libumbrella_framework_la_SOURCES = \ + openlibraries.cpp \ + openlibraries.hpp + +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/openassetlib/al/libopenassetlib_al.la \ + $(BOOST_PYTHON_LIBS) \ + $(GLEW_LIBS) + +libumbrella_framework_la_LDFLAGS = \ + $(OLIB_LDFLAGS) \ + $(BOOST_LIB_PATH) \ + -version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE) + +library_includedir = $(OPENLIBRARIES_INCLUDEPATH)/openmedialib/ml + +library_include_HEADERS = \ + openlibraries.hpp + +endif + + Added: trunk/unity.sh =================================================================== --- trunk/unity.sh (rev 0) +++ trunk/unity.sh 2007-12-02 20:00:46 UTC (rev 1346) @@ -0,0 +1,609 @@ +#!/bin/sh +# Copyright (c) 2007 Editopia. +# From the script in HDRFlow - www.hdrflow.com +# Released under the GPLv3 or later. +# 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( ) +{ + if [ $1 = 0 ] + then + echo " succeeded." + else + echo " failed. Aborting..." + exit 1 + fi +} + +if [ $# -eq "0" ] +then + echo "usage: `basename $0` options (-evbfioxupasmd)" + echo " -e ) update Boost version (Win32 only)" + echo " -v ) boost old version" + echo " -b ) boost new version" + echo " -f ) build OS/X frameworks" + echo " -x ) framework version" + echo " -o ) output_directory" + echo " -i ) install name prefix" + echo " -u ) build OS/X umbrella framework" + echo " -p ) build installer" + echo " -s ) strip symbols" + echo " -d ) update OpenLibraries version" + echo + echo " Examples:" + echo " sh ./unity.sh -fu - build OS/X umbrella framework" + exit 1 +fi + +PLATFORM=`uname -s` + +update_boost_version=0 +boost_old_version=1_34 +boost_new_version=1_34_1 + +update_olibs_version=0 +olibs_old_version=0_4_0 +olibs_new_version=0_5_0 + +build_frameworks=0 +build_umbrella=0 +build_installer=0 +build_application=0 +build_maya_plugins=0 +framework_version="A" +install_name_prefix="/Library/Frameworks" +strip_symbols=0 + +output_directory="." + +openlibraries_configure_options="--with-boostprefix=/usr/local --with-boostversion=1_34_1 --with-pythonversion=2.3 --with-boostthreadruntime=mt --enable-universalbinaries --disable-dependency-tracking --with-glewprefix=/usr/local --with-tiffprefix=/usr/local" + +while getopts "v:b:efi:o:x:upasmd" option +do + case $option in + e ) update_boost_version=1;; + v ) boost_old_version="$OPTARG";; + b ) boost_new_version="$OPTARG";; + f ) build_frameworks=1;; + x ) framework_version="$OPTARG";; + o ) output_directory="$OPTARG";; + i ) install_name_prefix="$OPTARG";; + u ) build_umbrella=1;; + p ) build_installer=1;; + a ) build_application=1;; + s ) strip_symbols=1;; + m ) build_maya_plugins=1;; + d ) update_olibs_version=1;; + esac +done + +shift $(($OPTIND - 1)) + +if [ "$update_boost_version" -eq 1 ] +then + find . -type f -name '*.vcproj' -print | while read i + do cp $i $i.unity.bak && + sed -e "s|boost-$boost_old_version|boost-$boost_new_version|g" -e "s|$boost_old_version.lib|$boost_new_version.lib|g" $i.unity.bak > $i && + rm -f $i.unity.bak + done +fi + +if [ "$update_olibs_version" -eq 1 ] +then + find . -type f -name '*.vcproj' -print | while read i + do cp $i $i.unity.bak && + sed -e "s|-$olibs_old_version.dll|-$olibs_new_version.dll|g" -e "s|$olibs_old_version.lib|$olibs_new_version.lib|g" $i.unity.bak > $i && + rm -f $i.unity.bak + done + + find . -type f -name '*.opl' -print | while read i + do cp $i $i.unity.bak && + sed -e "s|-$olibs_old_version.dll|-$olibs_new_version.dll|g" $i.unity.bak > $i && + rm -f $i.unity.bak + done + + find lib/openlibraries -type f -name 'config.hpp' -print | while read i + do cp $i $i.unity.bak && + sed -e "s|$olibs_old_version|$olibs_new_version|g" $i.unity.bak > $i && + rm -f $i.unity.bak + done +fi + +make_framework_dir( ) +{ + framework_dir="$output_directory/$1.framework" + mkdir -p "$framework_dir" && + mkdir -p "$framework_dir/Versions/$framework_version/Headers" && + mkdir -p "$framework_dir/Versions/$framework_version/PlugIns" && + mkdir -p "$framework_dir/Versions/$framework_version/Resources/English.lproj/Documentation" && + mkdir -p "$framework_dir/Versions/$framework_version/Resources/Portuguese.lproj/Documentation" && + mkdir -p "$framework_dir/Versions/$framework_version/Libraries" && + ln -sf "$framework_version" "$framework_dir/Versions/Current" && + ln -sf "Versions/Current/Headers" "$framework_dir/Headers" && + ln -sf "Versions/Current/PlugIns" "$framework_dir/PlugIns" && + ln -sf "Versions/Current/Resources" "$framework_dir/Resources" && + ln -sf "Versions/Current/Libraries" "$framework_dir/Libraries" +} + +make_framework_headers( ) +{ + tl=`cat -n $1/Makefile.am | cut -f 1 | tail -n 1` && + hl=`cat -n $1/Makefile.am | grep HEADERS | cut -f 1` && + headers=`cat $1/Makefile.am | tail -n $((tl-hl)) | cut -f 2` && + for i in $headers + do basedir=`dirname $1/$i | sed -e "s|$1||g"` && + mkdir -p $2.framework/Versions/Current/Headers/$basedir && + echo $1 > header_temp.$$ + header_path_first=`cut -d '/' -f 5 header_temp.$$` + header_path_second=`cut -d '/' -f 6 header_temp.$$` + header_path="$header_path_first/$header_path_second" + + if [ -r $1/$i ] + then + cp $1/$i current_header.$$ + + deplist="openpluginlib/pl openimagelib/il openmedialib/ml openassetlib/al" + for j in $deplist + do case $j in + openpluginlib* ) + sed -e "s|$j|OpenPluginLib|g" -i '' current_header.$$ > $2.framework/Versions/Current/Headers/$i + ;; + openimagelib* ) + sed -e "s|$j|OpenImageLib|g" -i '' current_header.$$ > $2.framework/Versions/Current/Headers/$i + ;; + openmedialib* ) + sed -e "s|$j|OpenMediaLib|g" -i '' current_header.$$ > $2.framework/Versions/Current/Headers/$i + ;; + openassetlib* ) + sed -e "s|$j|OpenAssetLib|g" -i '' current_header.$$ > $2.framework/Versions/Current/Headers/$i + ;; + esac + done + + sed -e "s|$header_path|$2|g" current_header.$$ > $2.framework/Versions/Current/Headers/$i + + rm current_header.$$ + fi + + rm header_temp.$$ + done +} + +make_framework_libs( ) +{ + libs=`ls $2/.libs/*.?.dylib` + for i in $libs + do if [ ! -L $i ] + then ln -sf Versions/Current/$1 $1.framework/$1 && + cp $i $1.framework/Versions/Current/$1 && + install_name_tool -id $install_name_prefix/$1.framework/Versions/$framework_version/$1 $1.framework/$1 + fi + done +} + +make_framework_python_libs( ) +{ + if [ -d $2 ] + then + libs=`ls $2/.libs/*.?.dylib` + for i in $libs + do if [ ! -L $i ] + then cp $i $1.framework/Versions/$framework_version/PlugIns/$1.so && + install_name_tool -id $install_name_prefix/$1.framework/Versions/$framework_version/$1 $1.framework/$1 + fi + done + fi +} + +make_framework_deps( ) +{ + deplist="GLEW boost" + for i in $deplist + do depname=`otool -L $1.framework/$1 | grep $i | cut -d ' ' -f 1` + for j in $depname + do depdir=`dirname $j` + libname="$j" + if [ $depdir == "." ] + then libname="/usr/local/lib/$depdir/$j" + fi + base=`basename $j` + cp $libname $1.framework/Versions/$framework_version/Libraries && + install_name_tool -id $install_name_prefix/$1.framework/Versions/$framework_version/$base $1.framework/Versions/$framework_version/Libraries/$base && + install_name_tool -change $j $install_name_prefix/$1.framework/Versions/$framework_version/Libraries/$base $1.framework/$1 + done + done +} + +make_framework_resources( ) +{ + cp ./Info.plist.template $1.framework/Resources/Info.plist && + cp ./InfoPlist.strings.template $1.framework/Resources/English.lproj/InfoPlist.strings + + if [ -d "$2/../plugins" ] + then plugins=`ls $2/../plugins` + for i in $plugins + do if [ -d $2/../plugins/$i/.libs ] + then cp $2/../plugins/$i/*.opl $1.framework/PlugIns + fi + done + fi +} + +make_framework_libs_deps( ) +{ + deplist="/usr/local/lib" + for i in $deplist + do libs=`ls $1.framework/Libraries` + for j in $libs + do if [ ! -L $1.framework/Versions/$framework_version/Libraries/$j ] + then depname=`otool -L $1.framework/Libraries/$j | grep $i | cut -d ' ' -f 1` + for k in $depname + do base=`basename $k` + if [ ! -e $1.framework/Versions/$framework_version/Libraries/$base ] + then cp $k $1.framework/Versions/$framework_version/Libraries + install_name_tool -id $install_name_prefix/$1.framework/Versions/$framework_version/$base \ + $1.framework/Versions/$framework_version/Libraries/$base + fi + install_name_tool -change $k \ + $install_name_prefix/$1.framework/Versions/$framework_version/Libraries/$base \ + $1.framework/Versions/$framework_version/Libraries/$j + done + fi + done + done +} + +make_framework_plugins_deps( ) +{ + deplist="GLEW boost /usr/local/lib" + for i in $deplist + do plugins=`ls $1.framework/PlugIns` + for j in $plugins + do if [ ! -L $1.framework/PlugIns/$j ] + then install_name_tool -id $install_name_prefix/$1.framework/Versions/$framework_version/$j \ + $1.framework/Versions/$framework_version/PlugIns/$j + depname=`otool -L $1.framework/PlugIns/$j | grep $i | cut -d ' ' -f 1` + for k in $depname + do depdir=`dirname $k` + libname="$k" + if [ $depdir == "." ] + then libname="/usr/local/lib/$depdir/$k" + fi + base=`basename $k` + if [ ! -e $1.framework/Versions/$framework_version/Libraries/$base ] + then + if [ -e $libname ] + then cp $libname $1.framework/Versions/$framework_version/Libraries + install_name_tool -id $install_name_prefix/$1.framework/Versions/$framework_version/$base \ + $1.framework/Versions/$framework_version/Libraries/$base + install_name_tool -change $k \ + $install_name_prefix/$1.framework/Versions/$framework_version/Libraries/$base $1.framework/$1 + fi + fi + install_name_tool -change $k \ + $install_name_prefix/$1.framework/Versions/$framework_version/Libraries/$base \ + $1.framework/Versions/$framework_version/PlugIns/$j + done + fi + done + done +} + +make_framework_plugins( ) +{ + if [ -d "$1/../plugins" ] + then plugins=`ls $1/../plugins` + for i in $plugins + do if [ -d $1/../plugins/$i/.libs ] + then cp -R $1/../plugins/$i/.libs/*.dylib $2.framework/PlugIns + fi + done + fi +} + +make_framework_interdeps( ) +{ + deplist="openpluginlib_pl openimagelib_il openmedialib_ml openassetlib_al" + for i in $deplist + do plugins=`ls $1.framework/PlugIns/*.* 2> /dev/null` + for j in $plugins + do depname=`otool -L $j | grep $i | cut -d ' ' -f 1` + if [ ! -z $depname ] + then case $i in + openpluginlib_pl ) + install_name_tool -change $depname \ + $install_name_prefix/OpenPluginLib.framework/Versions/$framework_version/OpenPluginLib $j + ;; + openimagelib_il ) + install_name_tool -change $depname \ + $install_name_prefix/OpenImageLib.framework/Versions/$framework_version/OpenImageLib $j + ;; + openmedialib_ml ) + install_name_tool -change $depname \ + $install_name_prefix/OpenMediaLib.framework/Versions/$framework_version/OpenMediaLib $j + ;; + openassetlib_al ) + install_name_tool -change $depname \ + $install_name_prefix/OpenAssetLib.framework/Versions/$framework_version/OpenAssetLib $j + ;; + esac + fi + done + done +} + +make_framework( ) +{ + rm -rf $1.framework + make_framework_dir $1 && + make_framework_headers $2 $1 && + make_framework_libs $1 $2 && + make_framework_python_libs $1 "$2/../py" && + make_framework_deps $1 && + make_framework_plugins $2 $1 && + make_framework_interdeps $1 && + make_framework_plugins_deps $1 && + make_framework_libs_deps $1 && + make_framework_resources $1 $2 +} + +make_umbrella_framework_deps( ) +{ + deplist="openpluginlib_pl openimagelib_il openmedialib_ml openassetlib_al" + for i in $deplist + do depname=`otool -L $1 | grep $i | cut -d ' ' -f 1` + if [ ! -z $depname ] + then case $i in + openpluginlib_pl ) + install_name_tool -change $depname \ + "$install_name_prefix"/OpenLibraries.framework/Versions/$framework_version/Frameworks/OpenPluginLib.framework/Versions/$framework_version/OpenPluginLib \ + $1 + ;; + openimagelib_il ) + install_name_tool -change $depname \ + "$install_name_prefix"/OpenLibraries.framework/Versions/$framework_version/Frameworks/OpenImageLib.framework/Versions/$framework_version/OpenImageLib \ + $1 + ;; + openmedialib_ml ) + install_name_tool -change $depname \ + "$install_name_prefix"/OpenLibraries.framework/Versions/$framework_version/Frameworks/OpenMediaLib.framework/Versions/$framework_version/OpenMediaLib \ + $1 + ;; + openassetlib_al ) + install_name_tool -change $depname \ + "$install_name_prefix"/OpenLibraries.framework/Versions/$framework_version/Frameworks/OpenAssetLib.framework/Versions/$framework_version/OpenAssetLib \ + $1 + ;; + esac + fi + done +} + +make_umbrella_framework_python_deps( ) +{ + install_name_tool -id $install_name_prefix/OpenLibraries.framework/Frameworks/$1.framework/Versions/A/PlugIns/$1.so $2 + fmwklist="OpenPluginLib OpenImageLib OpenMediaLib OpenAssetLib" + for i in $fmwklist + do install_name_tool -change $install_name_prefix/$i.framework/Versions/A/$i \ + $install_name_prefix/OpenLibraries.framework/Frameworks/$i.framework/Versions/A/$i $2 + done +} + +update_umbrella_framework_install_names( ) +{ + install_name_tool -id $install_name_prefix/OpenLibraries.framework/Versions/A/Frameworks/$1.framework/Versions/A/$1 \ + OpenLibraries.framework/Versions/A/Frameworks/$1.framework/$1 + + libs=`ls OpenLibraries.framework/Versions/A/Frameworks/$1.framework/Versions/A/Libraries/*.dylib` + for i in $libs + do install_name_tool -id $install_name_prefix/OpenLibraries.framework/Versions/A/Frameworks/$1.framework/Versions/A/Libraries/`basename $i` $i + done + + if [ $1 != "OpenPluginLib" ] + then libs=`ls OpenLibraries.framework/Versions/A/Frameworks/$1.framework/Versions/A/PlugIns/*.dylib` + for i in $libs + do install_name_tool -id $install_name_prefix/OpenLibraries.framework/Versions/A/Frameworks/$1.framework/Versions/A/PlugIns/`basename $i` $i + done + + depnames="$install_name_prefix/OpenPluginLib.framework $install_name_prefix/OpenImageLib.framework $install_name_prefix/OpenMediaLib.framework $install_name_prefix/OpenAssetLib.framework" + for i in $libs + do for j in $depnames + do deps=`otool -L $i | grep $j | cut -d ' ' -f 1` + for k in $deps + do if [ `basename $k` != "OpenPluginLib" ] && [ `basename $k` != "OpenImageLib" ] && [ `basename $k` != "OpenMediaLib" ] && [ `basename $k` != "OpenAssetLib" ] + then install_name_tool -change $k \ + $install_name_prefix/OpenLibraries.framework/Versions/A/Frameworks/$1.framework/Versions/A/Libraries/`basename $k` $i + else install_name_tool -change $k \ + $install_name_prefix/OpenLibraries.framework/Versions/A/Frameworks/`basename $k`.framework/Versions/A/`basename $k` $i + fi + done + done + done + fi + + libs=`ls OpenLibraries.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/OpenLibraries.framework/Versions/A/Frameworks/$1.framework/Versions/A/Libraries/`basename $k` $i + done + done +} + +make_umbrella_framework( ) +{ + rm -rf "./OpenLibraries.framework" + make_framework "OpenLibraries" "./src/umbrella_framework" + + framework_dir="$output_directory/OpenLibraries.framework" + mkdir -p "$framework_dir/Versions/$framework_version/Frameworks" + ln -sf "Versions/Current/Frameworks" "$framework_dir/Frameworks" + + cp -R "./OpenPluginLib.framework" "$framework_dir/Versions/$framework_version/Frameworks" + cp -R "./OpenImageLib.framework" "$framework_dir/Versions/$framework_version/Frameworks" + cp -R "./OpenMediaLib.framework" "$framework_dir/Versions/$framework_version/Frameworks" + cp -R "./OpenAssetLib.framework" "$framework_dir/Versions/$framework_version/Frameworks" + + make_umbrella_framework_deps "OpenLibraries.framework/OpenLibraries" && + make_umbrella_framework_deps "OpenLibraries.framework/Frameworks/OpenPluginLib.framework/PlugIns/OpenPluginLib.so" && + make_umbrella_framework_deps "OpenLibraries.framework/Frameworks/OpenImageLib.framework/PlugIns/OpenImageLib.so" && + make_umbrella_framework_deps "OpenLibraries.framework/Frameworks/OpenMediaLib.framework/PlugIns/OpenMediaLib.so" && + make_umbrella_framework_deps "OpenLibraries.framework/Frameworks/OpenAssetLib.framework/PlugIns/OpenAssetLib.so" + + deplist="GLEW boost" + for i in $deplist + do fmwklist="OpenPluginLib OpenImageLib OpenMediaLib OpenAssetLib" + for j in $fmwklist + do depname=`otool -L OpenLibraries.framework/Frameworks/$j.framework/$j | grep $i | cut -d ' ' -f 1` + for k in $depname + do base=`basename $k` + install_name_tool -change $k \ + $install_name_prefix/OpenLibraries.framework/Versions/$framework_version/Libraries/$base \ + OpenLibraries.framework/Versions/$framework_version/Frameworks/$j.framework/$j + done + done + + for j in $fmwklist + do depname=`otool -L OpenLibraries.framework/Frameworks/$j.framework/PlugIns/$j.so | grep $i | cut -d ' ' -f 1` + for k in $depname + do base=`basename $k` + install_name_tool -change $k \ + $install_name_prefix/OpenLibraries.framework/Versions/$framework_version/Libraries/$base \ + OpenLibraries.framework/Frameworks/$j.framework/PlugIns/$j.so + done + done + + for j in $fmwklist + do if [ $j == "OpenPluginLib" ] + then continue + fi + libraries=`ls OpenLibraries.framework/Frameworks/$j.framework/PlugIns/*.dylib` + for lib in $libraries + do depname=`otool -L $lib | grep $i | cut -d ' ' -f 1` + for k in $depname + do base=`basename $k` + install_name_tool -change $k \ + $install_name_prefix/OpenLibraries.framework/Versions/$framework_version/Libraries/$base $lib + done + done + done + done + + update_umbrella_framework_install_names "OpenPluginLib" + update_umbrella_framework_install_names "OpenImageLib" + update_umbrella_framework_install_names "OpenMediaLib" + update_umbrella_framework_install_names "OpenAssetLib" + + make_umbrella_framework_python_deps "OpenPluginLib" "OpenLibraries.framework/Frameworks/OpenPluginLib.framework/PlugIns/OpenPluginLib.so" + make_umbrella_framework_python_deps "OpenImageLib" "OpenLibraries.framework/Frameworks/OpenImageLib.framework/PlugIns/OpenImageLib.so" + make_umbrella_framework_python_deps "OpenMediaLib" "OpenLibraries.framework/Frameworks/OpenMediaLib.framework/PlugIns/OpenMediaLib.so" + make_umbrella_framework_python_deps "OpenAssetLib" "OpenLibraries.framework/Frameworks/OpenAssetLib.framework/PlugIns/OpenAssetLib.so" + + # Umbrella Framework Header + deplist="openpluginlib/pl openimagelib/il openmedialib/ml openassetlib/al" + for i in $deplist + do case $i in + openpluginlib* ) + sed -e "s|$i|OpenPluginLib|g" -i '' OpenLibraries.framework/Versions/$framework_version/Headers/openlibraries.hpp + ;; + openimagelib* ) + sed -e "s|$i|OpenImageLib|g" -i '' OpenLibraries.framework/Versions/$framework_version/Headers/openlibraries.hpp + ;; + openmedialib* ) + sed -e "s|$i|OpenMediaLib|g" -i '' OpenLibraries.framework/Versions/$framework_version/Headers/openlibraries.hpp + ;; + openassetlib* ) + sed -e "s|$i|OpenAssetLib|g" -i '' OpenLibraries.framework/Versions/$framework_version/Headers/openlibraries.hpp + ;; + esac + done + + check_status $? +} + +make_installer( ) +{ + /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker -build -proj $1.pmproj -p $1.pkg && + hdiutil create -ov -srcfolder $1.pkg $1.dmg -fs HFS+ -volname "$1" +} + +strip_framework_symbols( ) +{ + if [ "$strip_symbols" -eq 1 ] + then + echo -n " Stripping symbols..." + strip -x OpenLibraries.framework/OpenLibraries && + strip -x OpenLibraries.framework/Libraries/* && + strip -x OpenLibraries.framework/Frameworks/OpenPluginLib.framework/OpenPluginLib && + strip -x OpenLibraries.framework/Frameworks/OpenPluginLib.framework/Libraries/*.dylib && + strip -x OpenLibraries.framework/Frameworks/OpenPluginLib.framework/PlugIns/*.so && + strip -x OpenLibraries.framework/Frameworks/OpenImageLib.framework/OpenImageLib && + strip -x OpenLibraries.framework/Frameworks/OpenImageLib.framework/Libraries/*.dylib && + strip -x OpenLibraries.framework/Frameworks/OpenImageLib.framework/PlugIns/*.so && + strip -x OpenLibraries.framework/Frameworks/OpenImageLib.framework/PlugIns/*.dylib && + strip -x OpenLibraries.framework/Frameworks/OpenMediaLib.framework/OpenMediaLib && + strip -x OpenLibraries.framework/Frameworks/OpenMediaLib.framework/Libraries/*.dylib && + strip -x OpenLibraries.framework/Frameworks/OpenMediaLib.framework/PlugIns/*.so && + strip -x OpenLibraries.framework/Frameworks/OpenMediaLib.framework/PlugIns/*.dylib && + strip -x OpenLibraries.framework/Frameworks/OpenAssetLib.framework/OpenAssetLib && + strip -x OpenLibraries.framework/Frameworks/OpenAssetLib.framework/Libraries/*.dylib && + strip -x OpenLibraries.framework/Frameworks/OpenAssetLib.framework/PlugIns/*.so && + strip -x OpenLibraries.framework/Frameworks/OpenAssetLib.framework/PlugIns/*.dylib + check_status $? + fi +} + +make_framework_libraries_unique( ) +{ + libraries=`ls OpenLibraries.framework/Versions/$framework_version/Libraries/*.dylib` + for i in $libraries + do install_name_tool -id $install_name_prefix/OpenLibraries.framework/Versions/$framework_version/Libraries/`basename $i` $i + if [ -e OpenLibraries.framework/Versions/$framework_version/Frameworks/$1.framework/Versions/$framework_version/Libraries/`basename $i` ] + then rm -rf OpenLibraries.framework/Versions/$framework_version/Frameworks/$1.framework/Versions/$framework_version/Libraries/`basename $i` + fi + done +} + +if [ "$build_frameworks" -eq 1 ] && [ "$PLATFORM" = "Darwin" ] +then + echo "Building OS/X Frameworks..." + + echo " OpenPluginLib..." && + make_framework "OpenPluginLib" "./src/openpluginlib/pl" && + echo " OpenImageLib..." && + make_framework "OpenImageLib" "./src/openimagelib/il" && + echo " OpenMediaLib..." && + make_framework "OpenMediaLib" "./src/openmedialib/ml" && + echo -n " OpenAssetLib..." && + make_framework "OpenAssetLib" "./src/openassetlib/al" + check_status $? + + if [ "$build_umbrella" -eq 1 ] + then echo " Building Umbrella Framework..." + echo -n " OpenLibraries..." + make_umbrella_framework && + strip_framework_symbols && + make_framework_libraries_unique "OpenPluginLib" && + make_framework_libraries_unique "OpenImageLib" && + make_framework_libraries_unique "OpenMediaLib" && + make_framework_libraries_unique "OpenAssetLib" + check_status $? + + if [ x"$USER" = x"root" ] + then chown -Rh root:admin OpenLibraries.framework + fi + fi + + if [ "$build_installer" -eq 1 ] + then echo " Building packages..." + make_installer OpenLibraries.framework + check_status $? + fi +fi + +exit 0 Property changes on: trunk/unity.sh ___________________________________________________________________ Name: svn:executable + * Name: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gl...@us...> - 2007-12-07 22:54:40
|
Revision: 1347 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1347&view=rev Author: glslang Date: 2007-12-07 14:54:34 -0800 (Fri, 07 Dec 2007) Log Message: ----------- + moves back to LGPL Modified Paths: -------------- trunk/src/openassetlib/al/al.cpp trunk/src/openassetlib/al/al.hpp trunk/src/openassetlib/al/al_plugin.cpp trunk/src/openassetlib/al/al_plugin.hpp trunk/src/openassetlib/al/asset.cpp trunk/src/openassetlib/al/asset.hpp trunk/src/openassetlib/al/base64_codec.cpp trunk/src/openassetlib/al/base64_codec.hpp trunk/src/openassetlib/al/config.hpp trunk/src/openassetlib/al/guid.cpp trunk/src/openassetlib/al/set.cpp trunk/src/openassetlib/al/set.hpp trunk/src/openassetlib/plugins/sqlite/config.hpp trunk/src/openassetlib/plugins/sqlite/database.cpp trunk/src/openassetlib/plugins/sqlite/database.hpp trunk/src/openassetlib/plugins/sqlite/sqlite3_metadata.cpp trunk/src/openassetlib/plugins/sqlite/sqlite3_metadata_plugin.cpp trunk/src/openassetlib/plugins/sqlite/sqlite3_metadata_plugin.hpp trunk/src/openassetlib/py/asset.cpp trunk/src/openassetlib/py/guid.cpp trunk/src/openassetlib/py/openassetlib.cpp trunk/src/openassetlib/py/plugin.cpp trunk/src/openassetlib/py/py.cpp trunk/src/openassetlib/py/py.hpp trunk/src/openassetlib/py/python.hpp trunk/src/openassetlib/py/set.cpp trunk/src/openeffectslib/plugins/tonemap/tonemap_plugin.cpp trunk/src/openimagelib/il/basic_image.hpp trunk/src/openimagelib/il/compression_traits.hpp trunk/src/openimagelib/il/config.hpp trunk/src/openimagelib/il/float_traits.hpp trunk/src/openimagelib/il/il.cpp trunk/src/openimagelib/il/il.hpp trunk/src/openimagelib/il/lut_converter.hpp trunk/src/openimagelib/il/openimagelib_plugin.hpp trunk/src/openimagelib/il/rgb_traits.hpp trunk/src/openimagelib/il/traits.hpp trunk/src/openimagelib/il/utility.cpp trunk/src/openimagelib/il/utility.hpp trunk/src/openimagelib/il/yuv_traits.hpp trunk/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.cpp trunk/src/openimagelib/plugins/bmp/bmp_plugin.cpp trunk/src/openimagelib/plugins/dds/dds_plugin.cpp trunk/src/openimagelib/plugins/dpx/dpx_plugin.cpp trunk/src/openimagelib/plugins/exr/exr_plugin.cpp trunk/src/openimagelib/plugins/gdi+/gdi+_plugin.cpp trunk/src/openimagelib/plugins/hdr/hdr_plugin.cpp trunk/src/openimagelib/plugins/png/png_plugin.cpp trunk/src/openimagelib/plugins/psd/psd_plugin.cpp trunk/src/openimagelib/plugins/quicktime/quicktime_plugin.cpp trunk/src/openimagelib/plugins/sgi/sgi_plugin.cpp trunk/src/openimagelib/plugins/tga/tga_plugin.cpp trunk/src/openimagelib/plugins/tiff/tiff_plugin.cpp trunk/src/openimagelib/py/il.cpp trunk/src/openimagelib/py/py.cpp trunk/src/openimagelib/py/py.hpp trunk/src/openmedialib/ml/audio.hpp trunk/src/openmedialib/ml/config.hpp trunk/src/openmedialib/ml/filter.hpp trunk/src/openmedialib/ml/frame.hpp trunk/src/openmedialib/ml/input.hpp trunk/src/openmedialib/ml/ml.cpp trunk/src/openmedialib/ml/ml.hpp trunk/src/openmedialib/ml/openmedialib_plugin.cpp trunk/src/openmedialib/ml/openmedialib_plugin.hpp trunk/src/openmedialib/ml/store.hpp trunk/src/openmedialib/ml/utilities.cpp trunk/src/openmedialib/ml/utilities.hpp trunk/src/openmedialib/plugins/avformat/avformat_plugin.cpp trunk/src/openmedialib/plugins/gensys/gensys_plugin.cpp trunk/src/openmedialib/plugins/ofx/ofx_plugin.cpp trunk/src/openmedialib/plugins/oil/oil_plugin.cpp trunk/src/openmedialib/plugins/openal/openal_plugin.cpp trunk/src/openmedialib/plugins/quicktime/quicktime_audiotrack.cpp trunk/src/openmedialib/plugins/quicktime/quicktime_audiotrack.h trunk/src/openmedialib/plugins/quicktime/quicktime_input.cpp trunk/src/openmedialib/plugins/quicktime/quicktime_input.h trunk/src/openmedialib/plugins/quicktime/quicktime_plugin.cpp trunk/src/openmedialib/plugins/quicktime/quicktime_store.cpp trunk/src/openmedialib/plugins/quicktime/quicktime_store.h trunk/src/openmedialib/plugins/quicktime/quicktime_track.cpp trunk/src/openmedialib/plugins/quicktime/quicktime_track.h trunk/src/openmedialib/plugins/quicktime/quicktime_videotrack.cpp trunk/src/openmedialib/plugins/quicktime/quicktime_videotrack.h trunk/src/openmedialib/py/ml.cpp trunk/src/openmedialib/py/py.cpp trunk/src/openmedialib/py/py.hpp trunk/src/openobjectlib/plugins/X3D/actions/x3d_parser_action.cpp trunk/src/openobjectlib/plugins/X3D/actions/x3d_parser_action.hpp trunk/src/openobjectlib/plugins/X3D/config.hpp trunk/src/openobjectlib/plugins/X3D/x3d.cpp trunk/src/openobjectlib/plugins/X3D/x3d_content_handler_msxml.cpp trunk/src/openobjectlib/plugins/X3D/x3d_content_handler_msxml.hpp trunk/src/openobjectlib/plugins/X3D/x3d_plugin.cpp trunk/src/openobjectlib/plugins/X3D/x3d_plugin.hpp trunk/src/openobjectlib/plugins/X3D/xml_value_tokenizer.hpp trunk/src/openobjectlib/plugins/wavefront/config.hpp trunk/src/openobjectlib/plugins/wavefront/obj.cpp trunk/src/openobjectlib/plugins/wavefront/obj_plugin.cpp trunk/src/openobjectlib/plugins/wavefront/obj_plugin.hpp trunk/src/openobjectlib/plugins/wavefront/spirit.hpp trunk/src/openobjectlib/sg/appearance.cpp trunk/src/openobjectlib/sg/appearance.hpp trunk/src/openobjectlib/sg/bbox_volume.cpp trunk/src/openobjectlib/sg/bbox_volume.hpp trunk/src/openobjectlib/sg/calculate_tangent_space.cpp trunk/src/openobjectlib/sg/calculate_tangent_space.hpp trunk/src/openobjectlib/sg/config.hpp trunk/src/openobjectlib/sg/constant_time_dispatcher.hpp trunk/src/openobjectlib/sg/core.hpp trunk/src/openobjectlib/sg/graph_updater.cpp trunk/src/openobjectlib/sg/graph_updater.hpp trunk/src/openobjectlib/sg/hw_GL_renderer.cpp trunk/src/openobjectlib/sg/hw_GL_renderer.hpp trunk/src/openobjectlib/sg/lexical_cast.hpp trunk/src/openobjectlib/sg/meshes.cpp trunk/src/openobjectlib/sg/meshes.hpp trunk/src/openobjectlib/sg/openobjectlib_plugin.cpp trunk/src/openobjectlib/sg/openobjectlib_plugin.hpp trunk/src/openobjectlib/sg/render_buffer.cpp trunk/src/openobjectlib/sg/render_buffer.hpp trunk/src/openobjectlib/sg/scene.cpp trunk/src/openobjectlib/sg/scene.hpp trunk/src/openobjectlib/sg/sg.cpp trunk/src/openobjectlib/sg/sg.hpp trunk/src/openobjectlib/sg/shaders.cpp trunk/src/openobjectlib/sg/shaders.hpp trunk/src/openobjectlib/sg/spatial.cpp trunk/src/openobjectlib/sg/spatial.hpp trunk/src/openobjectlib/sg/spirit.hpp trunk/src/openpluginlib/pl/GL_utility.cpp trunk/src/openpluginlib/pl/GL_utility.hpp trunk/src/openpluginlib/pl/bind_info.cpp trunk/src/openpluginlib/pl/bind_info.hpp trunk/src/openpluginlib/pl/cg.cpp trunk/src/openpluginlib/pl/cg.hpp trunk/src/openpluginlib/pl/config.hpp trunk/src/openpluginlib/pl/content_handler_msxml.cpp trunk/src/openpluginlib/pl/content_handler_msxml.hpp trunk/src/openpluginlib/pl/discovery_traits.hpp trunk/src/openpluginlib/pl/fast_math.cpp trunk/src/openpluginlib/pl/fast_math.hpp trunk/src/openpluginlib/pl/geometry.hpp trunk/src/openpluginlib/pl/openplugin.cpp trunk/src/openpluginlib/pl/openplugin.hpp trunk/src/openpluginlib/pl/openpluginlib.cpp trunk/src/openpluginlib/pl/openpluginlib.hpp trunk/src/openpluginlib/pl/opl_importer.cpp trunk/src/openpluginlib/pl/opl_importer.hpp trunk/src/openpluginlib/pl/opl_parser_action.cpp trunk/src/openpluginlib/pl/opl_parser_action.hpp trunk/src/openpluginlib/pl/pcos/iclonable.hpp trunk/src/openpluginlib/pl/pcos/iproperty_container.hpp trunk/src/openpluginlib/pl/pcos/isubject.hpp trunk/src/openpluginlib/pl/pcos/key.cpp trunk/src/openpluginlib/pl/pcos/key.hpp trunk/src/openpluginlib/pl/pcos/observer.hpp trunk/src/openpluginlib/pl/pcos/property.cpp trunk/src/openpluginlib/pl/pcos/property.hpp trunk/src/openpluginlib/pl/pcos/property_container.cpp trunk/src/openpluginlib/pl/pcos/property_container.hpp trunk/src/openpluginlib/pl/pcos/subject.cpp trunk/src/openpluginlib/pl/pcos/subject.hpp trunk/src/openpluginlib/pl/pcos/visitor.hpp trunk/src/openpluginlib/pl/pool.cpp trunk/src/openpluginlib/pl/pool.hpp trunk/src/openpluginlib/pl/property.hpp trunk/src/openpluginlib/pl/registry.cpp trunk/src/openpluginlib/pl/registry.hpp trunk/src/openpluginlib/pl/shader_manager.cpp trunk/src/openpluginlib/pl/shader_manager.hpp trunk/src/openpluginlib/pl/shlib.cpp trunk/src/openpluginlib/pl/shlib.hpp trunk/src/openpluginlib/pl/stream.cpp trunk/src/openpluginlib/pl/stream.hpp trunk/src/openpluginlib/pl/string.hpp trunk/src/openpluginlib/pl/timer.cpp trunk/src/openpluginlib/pl/timer.hpp trunk/src/openpluginlib/pl/utf8_utils.cpp trunk/src/openpluginlib/pl/utf8_utils.hpp trunk/src/openpluginlib/py/geometry.cpp trunk/src/openpluginlib/py/openpluginlib.cpp trunk/src/openpluginlib/py/pcos/any.cpp trunk/src/openpluginlib/py/pcos/key.cpp trunk/src/openpluginlib/py/pcos/observer.cpp trunk/src/openpluginlib/py/pcos/property.cpp trunk/src/openpluginlib/py/pcos/property_container.cpp trunk/src/openpluginlib/py/pcos/subject.cpp trunk/src/openpluginlib/py/pcos/visitor.cpp trunk/src/openpluginlib/py/py.cpp trunk/src/openpluginlib/py/py.hpp trunk/src/openpluginlib/py/python.hpp trunk/src/openpluginlib/py/string.cpp trunk/test/openeffectslib/rescaler_bench/rescaler_bench.cpp trunk/test/openeffectslib/tm_bench/tm_bench.cpp trunk/test/openimagelib/GL/_2D/_2D.cpp trunk/test/openimagelib/GL/_2D_compressed/_2D_compressed.cpp trunk/test/openimagelib/GL/_2D_compressed_cubemap/_2D_compressed_cubemap.cpp trunk/test/openimagelib/GL/_2D_crop/_2D_crop.cpp trunk/test/openimagelib/GL/_2D_crop2/_2D_crop2.cpp trunk/test/openimagelib/GL/_2D_exr/_2D_exr.cpp trunk/test/openimagelib/GL/_2D_sgi/_2D_sgi.cpp trunk/test/openimagelib/GL/_3D_lightmap/_3D_lightmap.cpp trunk/test/openmedialib/player/player.cpp trunk/test/openmedialib/store/store.cpp trunk/test/openobjectlib/GL/multipass_draw/multipass_draw.cpp trunk/test/openobjectlib/GL/noise_volume/noise_volume.cpp trunk/test/openobjectlib/GL/obj_draw/obj_draw.cpp trunk/test/openobjectlib/GL/texture_draw/texture_draw.cpp trunk/test/openpluginlib/discovery/discovery.cpp trunk/test/openpluginlib/enumerate/enumerate.cpp trunk/test/openpluginlib/gpu_timer_query/gpu_timer_query.cpp trunk/test/openpluginlib/initialization/initialization.cpp trunk/test/openpluginlib/pcos/key/key.cpp trunk/test/openpluginlib/pcos/property/property.cpp trunk/test/openpluginlib/pcos/property_container/property_container.cpp trunk/test/openpluginlib/pcos/subject-observer/subject-observer.cpp trunk/test/openpluginlib/rdtsc/rdtsc.cpp trunk/test/openpluginlib/sleep/sleep.cpp Modified: trunk/src/openassetlib/al/al.cpp =================================================================== --- trunk/src/openassetlib/al/al.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openassetlib/al/al.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -1,7 +1,7 @@ // al.cpp // // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #include <iostream> Modified: trunk/src/openassetlib/al/al.hpp =================================================================== --- trunk/src/openassetlib/al/al.hpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openassetlib/al/al.hpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -1,7 +1,7 @@ // al.hpp // // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #ifndef AL_INC_ Modified: trunk/src/openassetlib/al/al_plugin.cpp =================================================================== --- trunk/src/openassetlib/al/al_plugin.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openassetlib/al/al_plugin.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -1,7 +1,7 @@ // al_plugin.cpp - Interface to an openassetlib plugin. // // Copyright (C) 2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #include "al_plugin.hpp" Modified: trunk/src/openassetlib/al/al_plugin.hpp =================================================================== --- trunk/src/openassetlib/al/al_plugin.hpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openassetlib/al/al_plugin.hpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -1,7 +1,7 @@ // al_plugin.hpp - Interface to an openassetlib plugin. // // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #ifndef AL_PLUGIN_INC_ Modified: trunk/src/openassetlib/al/asset.cpp =================================================================== --- trunk/src/openassetlib/al/asset.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openassetlib/al/asset.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -1,7 +1,7 @@ // asset.cpp // // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #include "asset.hpp" Modified: trunk/src/openassetlib/al/asset.hpp =================================================================== --- trunk/src/openassetlib/al/asset.hpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openassetlib/al/asset.hpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -1,7 +1,7 @@ // asset.hpp // // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #ifndef ASSET_INC_ Modified: trunk/src/openassetlib/al/base64_codec.cpp =================================================================== --- trunk/src/openassetlib/al/base64_codec.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openassetlib/al/base64_codec.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -1,7 +1,7 @@ // base64_codec.cpp // // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #include <openassetlib/al/base64_codec.hpp> Modified: trunk/src/openassetlib/al/base64_codec.hpp =================================================================== --- trunk/src/openassetlib/al/base64_codec.hpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openassetlib/al/base64_codec.hpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -1,7 +1,7 @@ // base64_codec.hpp // // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #ifndef BASE64_CODEC_INC_ Modified: trunk/src/openassetlib/al/config.hpp =================================================================== --- trunk/src/openassetlib/al/config.hpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openassetlib/al/config.hpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -1,7 +1,7 @@ // config.hpp // // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #ifndef AL_CONFIG_INC_ Modified: trunk/src/openassetlib/al/guid.cpp =================================================================== --- trunk/src/openassetlib/al/guid.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openassetlib/al/guid.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -1,7 +1,7 @@ // guid.cpp // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #include <openassetlib/al/guid.hpp> Modified: trunk/src/openassetlib/al/set.cpp =================================================================== --- trunk/src/openassetlib/al/set.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openassetlib/al/set.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -1,7 +1,7 @@ // set.cpp // // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #include "set.hpp" Modified: trunk/src/openassetlib/al/set.hpp =================================================================== --- trunk/src/openassetlib/al/set.hpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openassetlib/al/set.hpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -1,7 +1,7 @@ // set.hpp // // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #ifndef SET_INC_ Modified: trunk/src/openassetlib/plugins/sqlite/config.hpp =================================================================== --- trunk/src/openassetlib/plugins/sqlite/config.hpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openassetlib/plugins/sqlite/config.hpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -1,7 +1,7 @@ // config.hpp for sqlite3 metadata plugin // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #ifndef SQLITE3_METADATA_PLUGIN_CONFIG_INC_ Modified: trunk/src/openassetlib/plugins/sqlite/database.cpp =================================================================== --- trunk/src/openassetlib/plugins/sqlite/database.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openassetlib/plugins/sqlite/database.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -1,7 +1,7 @@ // database.cpp // // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #include <iostream> Modified: trunk/src/openassetlib/plugins/sqlite/database.hpp =================================================================== --- trunk/src/openassetlib/plugins/sqlite/database.hpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openassetlib/plugins/sqlite/database.hpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -1,7 +1,7 @@ // database.hpp // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #ifndef DATABASE_INC_ Modified: trunk/src/openassetlib/plugins/sqlite/sqlite3_metadata.cpp =================================================================== --- trunk/src/openassetlib/plugins/sqlite/sqlite3_metadata.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openassetlib/plugins/sqlite/sqlite3_metadata.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -1,7 +1,7 @@ // sqlite3_metadata.cpp // // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #include <boost/thread/recursive_mutex.hpp> Modified: trunk/src/openassetlib/plugins/sqlite/sqlite3_metadata_plugin.cpp =================================================================== --- trunk/src/openassetlib/plugins/sqlite/sqlite3_metadata_plugin.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openassetlib/plugins/sqlite/sqlite3_metadata_plugin.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -1,7 +1,7 @@ // sqlite3_metadata_plugin.cpp // // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #include <iostream> Modified: trunk/src/openassetlib/plugins/sqlite/sqlite3_metadata_plugin.hpp =================================================================== --- trunk/src/openassetlib/plugins/sqlite/sqlite3_metadata_plugin.hpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openassetlib/plugins/sqlite/sqlite3_metadata_plugin.hpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -1,7 +1,7 @@ // sqlite3_metadata_plugin.hpp // // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #ifndef SQLITE3_METADATA_PLUGIN_INC_ Modified: trunk/src/openassetlib/py/asset.cpp =================================================================== --- trunk/src/openassetlib/py/asset.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openassetlib/py/asset.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -1,7 +1,7 @@ // asset.cpp // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #include <boost/filesystem/path.hpp> Modified: trunk/src/openassetlib/py/guid.cpp =================================================================== --- trunk/src/openassetlib/py/guid.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openassetlib/py/guid.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -1,7 +1,7 @@ // asset.cpp // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #include <openassetlib/al/guid.hpp> Modified: trunk/src/openassetlib/py/openassetlib.cpp =================================================================== --- trunk/src/openassetlib/py/openassetlib.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openassetlib/py/openassetlib.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -1,7 +1,7 @@ // openassetlib.cpp // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #include <openpluginlib/pl/openplugin.hpp> Modified: trunk/src/openassetlib/py/plugin.cpp =================================================================== --- trunk/src/openassetlib/py/plugin.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openassetlib/py/plugin.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -1,7 +1,7 @@ // plugin.cpp // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #include <openassetlib/al/al_plugin.hpp> Modified: trunk/src/openassetlib/py/py.cpp =================================================================== --- trunk/src/openassetlib/py/py.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openassetlib/py/py.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -1,7 +1,7 @@ // py.cpp // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #include <openassetlib/py/python.hpp> Modified: trunk/src/openassetlib/py/py.hpp =================================================================== --- trunk/src/openassetlib/py/py.hpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openassetlib/py/py.hpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -1,7 +1,7 @@ // py.hpp // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #ifndef PY_INC_ Modified: trunk/src/openassetlib/py/python.hpp =================================================================== --- trunk/src/openassetlib/py/python.hpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openassetlib/py/python.hpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -1,7 +1,7 @@ // python.hpp // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #ifndef PYTHON_INC_ Modified: trunk/src/openassetlib/py/set.cpp =================================================================== --- trunk/src/openassetlib/py/set.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openassetlib/py/set.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -1,7 +1,7 @@ // set.cpp // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #include <openassetlib/al/set.hpp> Modified: trunk/src/openeffectslib/plugins/tonemap/tonemap_plugin.cpp =================================================================== --- trunk/src/openeffectslib/plugins/tonemap/tonemap_plugin.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openeffectslib/plugins/tonemap/tonemap_plugin.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // tonemap - Tonemapping plugin functionality. // Copyright (C) 2007 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #ifdef HAVE_CONFIG_H Modified: trunk/src/openimagelib/il/basic_image.hpp =================================================================== --- trunk/src/openimagelib/il/basic_image.hpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openimagelib/il/basic_image.hpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // il - A image library representation. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #ifndef BASIC_IMAGE_INC_ Modified: trunk/src/openimagelib/il/compression_traits.hpp =================================================================== --- trunk/src/openimagelib/il/compression_traits.hpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openimagelib/il/compression_traits.hpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // il - A image library representation. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #ifndef COMPRESSION_TRAITS_INC_ Modified: trunk/src/openimagelib/il/config.hpp =================================================================== --- trunk/src/openimagelib/il/config.hpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openimagelib/il/config.hpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // il - A image library representation. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #ifndef IL_CONFIG_INC_ Modified: trunk/src/openimagelib/il/float_traits.hpp =================================================================== --- trunk/src/openimagelib/il/float_traits.hpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openimagelib/il/float_traits.hpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // il - A image library representation. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #ifndef FLOAT_TRAITS_INC_ Modified: trunk/src/openimagelib/il/il.cpp =================================================================== --- trunk/src/openimagelib/il/il.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openimagelib/il/il.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // il - A image library representation. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #include <openimagelib/il/openimagelib_plugin.hpp> Modified: trunk/src/openimagelib/il/il.hpp =================================================================== --- trunk/src/openimagelib/il/il.hpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openimagelib/il/il.hpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // il - A image library representation. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #ifndef IL_INC_ Modified: trunk/src/openimagelib/il/lut_converter.hpp =================================================================== --- trunk/src/openimagelib/il/lut_converter.hpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openimagelib/il/lut_converter.hpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // il - An image library representation. // Copyright (C) 2007 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #ifndef LUT_CONVERTER_INC_ Modified: trunk/src/openimagelib/il/openimagelib_plugin.hpp =================================================================== --- trunk/src/openimagelib/il/openimagelib_plugin.hpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openimagelib/il/openimagelib_plugin.hpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // il - A image library representation. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #ifndef OPENIMAGELIB_PLUGIN_INC_ Modified: trunk/src/openimagelib/il/rgb_traits.hpp =================================================================== --- trunk/src/openimagelib/il/rgb_traits.hpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openimagelib/il/rgb_traits.hpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // il - A image library representation. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #ifndef RGB_TRAITS_INC_ Modified: trunk/src/openimagelib/il/traits.hpp =================================================================== --- trunk/src/openimagelib/il/traits.hpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openimagelib/il/traits.hpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // il - A image library representation. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #ifndef IL_TRAITS_INC_ Modified: trunk/src/openimagelib/il/utility.cpp =================================================================== --- trunk/src/openimagelib/il/utility.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openimagelib/il/utility.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // il - A image library representation. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #include <algorithm> Modified: trunk/src/openimagelib/il/utility.hpp =================================================================== --- trunk/src/openimagelib/il/utility.hpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openimagelib/il/utility.hpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // il - A image library representation. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #ifndef UTILITY_INC_ Modified: trunk/src/openimagelib/il/yuv_traits.hpp =================================================================== --- trunk/src/openimagelib/il/yuv_traits.hpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openimagelib/il/yuv_traits.hpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // il - A image library representation. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #ifndef IL_YUV_TRAITS_INC_ Modified: trunk/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.cpp =================================================================== --- trunk/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // 3D_lightmap - A lightmap generator plugin to il. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #include <cstdlib> Modified: trunk/src/openimagelib/plugins/bmp/bmp_plugin.cpp =================================================================== --- trunk/src/openimagelib/plugins/bmp/bmp_plugin.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openimagelib/plugins/bmp/bmp_plugin.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // BMP - A BMP plugin to il. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #include <openimagelib/il/openimagelib_plugin.hpp> Modified: trunk/src/openimagelib/plugins/dds/dds_plugin.cpp =================================================================== --- trunk/src/openimagelib/plugins/dds/dds_plugin.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openimagelib/plugins/dds/dds_plugin.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // DDS - A DDS plugin to il. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #include <cstdlib> Modified: trunk/src/openimagelib/plugins/dpx/dpx_plugin.cpp =================================================================== --- trunk/src/openimagelib/plugins/dpx/dpx_plugin.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openimagelib/plugins/dpx/dpx_plugin.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // DPX - A DPX plugin to il. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #include <sstream> Modified: trunk/src/openimagelib/plugins/exr/exr_plugin.cpp =================================================================== --- trunk/src/openimagelib/plugins/exr/exr_plugin.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openimagelib/plugins/exr/exr_plugin.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // EXR - An ILM OpenEXR plugin to il. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #include <ImfRgbaFile.h> Modified: trunk/src/openimagelib/plugins/gdi+/gdi+_plugin.cpp =================================================================== --- trunk/src/openimagelib/plugins/gdi+/gdi+_plugin.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openimagelib/plugins/gdi+/gdi+_plugin.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // GDI+ - A GDI+ plugin to il. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #ifdef WIN32 Modified: trunk/src/openimagelib/plugins/hdr/hdr_plugin.cpp =================================================================== --- trunk/src/openimagelib/plugins/hdr/hdr_plugin.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openimagelib/plugins/hdr/hdr_plugin.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // HDR - A HDR plugin to il. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #ifdef WIN32 Modified: trunk/src/openimagelib/plugins/png/png_plugin.cpp =================================================================== --- trunk/src/openimagelib/plugins/png/png_plugin.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openimagelib/plugins/png/png_plugin.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // PNG - A PNG plugin to il. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #include <cstdlib> Modified: trunk/src/openimagelib/plugins/psd/psd_plugin.cpp =================================================================== --- trunk/src/openimagelib/plugins/psd/psd_plugin.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openimagelib/plugins/psd/psd_plugin.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // PSD - A PSD plugin to il. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #include <cstdlib> Modified: trunk/src/openimagelib/plugins/quicktime/quicktime_plugin.cpp =================================================================== --- trunk/src/openimagelib/plugins/quicktime/quicktime_plugin.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openimagelib/plugins/quicktime/quicktime_plugin.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // QuickTime - An QuickTime plugin to il. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #ifdef WIN32 Modified: trunk/src/openimagelib/plugins/sgi/sgi_plugin.cpp =================================================================== --- trunk/src/openimagelib/plugins/sgi/sgi_plugin.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openimagelib/plugins/sgi/sgi_plugin.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // SGI - A SGI plugin to il. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #include <cassert> Modified: trunk/src/openimagelib/plugins/tga/tga_plugin.cpp =================================================================== --- trunk/src/openimagelib/plugins/tga/tga_plugin.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openimagelib/plugins/tga/tga_plugin.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // TGA - A TGA plugin to il. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #ifdef WIN32 Modified: trunk/src/openimagelib/plugins/tiff/tiff_plugin.cpp =================================================================== --- trunk/src/openimagelib/plugins/tiff/tiff_plugin.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openimagelib/plugins/tiff/tiff_plugin.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // TIFF - A TIFF plugin to il. // Copyright (C) 2005 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #include <vector> Modified: trunk/src/openimagelib/py/il.cpp =================================================================== --- trunk/src/openimagelib/py/il.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openimagelib/py/il.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // il - A image library representation. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #include <cstdio> Modified: trunk/src/openimagelib/py/py.cpp =================================================================== --- trunk/src/openimagelib/py/py.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openimagelib/py/py.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // il - A image library representation. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #include <openpluginlib/py/python.hpp> Modified: trunk/src/openimagelib/py/py.hpp =================================================================== --- trunk/src/openimagelib/py/py.hpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openimagelib/py/py.hpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // il - A image library representation. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #ifndef PY_INC_ Modified: trunk/src/openmedialib/ml/audio.hpp =================================================================== --- trunk/src/openmedialib/ml/audio.hpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openmedialib/ml/audio.hpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // ml - A media library representation. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #ifndef OPENMEDIALIB_AUDIO_INC_ Modified: trunk/src/openmedialib/ml/config.hpp =================================================================== --- trunk/src/openmedialib/ml/config.hpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openmedialib/ml/config.hpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // ml - A media library representation. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #ifndef ML_CONFIG_INC_ Modified: trunk/src/openmedialib/ml/filter.hpp =================================================================== --- trunk/src/openmedialib/ml/filter.hpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openmedialib/ml/filter.hpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -1,7 +1,7 @@ // ml - A media library representation. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #ifndef OPENMEDIALIB_FILTER_INC_ Modified: trunk/src/openmedialib/ml/frame.hpp =================================================================== --- trunk/src/openmedialib/ml/frame.hpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openmedialib/ml/frame.hpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // ml - A media library representation. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #ifndef OPENMEDIALIB_FRAME_INC_ Modified: trunk/src/openmedialib/ml/input.hpp =================================================================== --- trunk/src/openmedialib/ml/input.hpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openmedialib/ml/input.hpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // ml - A media library representation. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #ifndef OPENMEDIALIB_INPUT_INC_ Modified: trunk/src/openmedialib/ml/ml.cpp =================================================================== --- trunk/src/openmedialib/ml/ml.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openmedialib/ml/ml.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // ml - A media library representation. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #include <openmedialib/ml/ml.hpp> Modified: trunk/src/openmedialib/ml/ml.hpp =================================================================== --- trunk/src/openmedialib/ml/ml.hpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openmedialib/ml/ml.hpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // ml - A media library representation. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #ifndef ML_INC_ Modified: trunk/src/openmedialib/ml/openmedialib_plugin.cpp =================================================================== --- trunk/src/openmedialib/ml/openmedialib_plugin.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openmedialib/ml/openmedialib_plugin.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // ml - A media library representation. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #include <openmedialib/ml/openmedialib_plugin.hpp> Modified: trunk/src/openmedialib/ml/openmedialib_plugin.hpp =================================================================== --- trunk/src/openmedialib/ml/openmedialib_plugin.hpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openmedialib/ml/openmedialib_plugin.hpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // ml - A media library representation. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #ifndef OPENMEDIALIB_PLUGIN_INC_ Modified: trunk/src/openmedialib/ml/store.hpp =================================================================== --- trunk/src/openmedialib/ml/store.hpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openmedialib/ml/store.hpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // ml - A media library representation. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #ifndef OPENMEDIALIB_STORE_INC_ Modified: trunk/src/openmedialib/ml/utilities.cpp =================================================================== --- trunk/src/openmedialib/ml/utilities.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openmedialib/ml/utilities.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // ml - A media library representation. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #ifdef WIN32 Modified: trunk/src/openmedialib/ml/utilities.hpp =================================================================== --- trunk/src/openmedialib/ml/utilities.hpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openmedialib/ml/utilities.hpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // ml - A media library representation. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #ifndef OPENMEDIALIB_UTILITIES_INC_ Modified: trunk/src/openmedialib/plugins/avformat/avformat_plugin.cpp =================================================================== --- trunk/src/openmedialib/plugins/avformat/avformat_plugin.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openmedialib/plugins/avformat/avformat_plugin.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // avformat - A avformat plugin to ml. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #include <openmedialib/ml/openmedialib_plugin.hpp> Modified: trunk/src/openmedialib/plugins/gensys/gensys_plugin.cpp =================================================================== --- trunk/src/openmedialib/plugins/gensys/gensys_plugin.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openmedialib/plugins/gensys/gensys_plugin.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // gensys - Generic plugin functionality // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. // TODO: Split file up - source file per plugin needed. Modified: trunk/src/openmedialib/plugins/ofx/ofx_plugin.cpp =================================================================== --- trunk/src/openmedialib/plugins/ofx/ofx_plugin.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openmedialib/plugins/ofx/ofx_plugin.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // ofx - A ofx plugin to ml. // Copyright (C) 2005-2007 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #if _MSC_VER >= 1400 Modified: trunk/src/openmedialib/plugins/oil/oil_plugin.cpp =================================================================== --- trunk/src/openmedialib/plugins/oil/oil_plugin.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openmedialib/plugins/oil/oil_plugin.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // oil - A oil plugin to ml. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #include <openmedialib/ml/openmedialib_plugin.hpp> Modified: trunk/src/openmedialib/plugins/openal/openal_plugin.cpp =================================================================== --- trunk/src/openmedialib/plugins/openal/openal_plugin.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openmedialib/plugins/openal/openal_plugin.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // openal - A openal plugin to ml. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #ifdef HAVE_CONFIG_H Modified: trunk/src/openmedialib/plugins/quicktime/quicktime_audiotrack.cpp =================================================================== --- trunk/src/openmedialib/plugins/quicktime/quicktime_audiotrack.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openmedialib/plugins/quicktime/quicktime_audiotrack.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -1,5 +1,5 @@ // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #include <openmedialib/plugins/quicktime/quicktime_audiotrack.h> Modified: trunk/src/openmedialib/plugins/quicktime/quicktime_audiotrack.h =================================================================== --- trunk/src/openmedialib/plugins/quicktime/quicktime_audiotrack.h 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openmedialib/plugins/quicktime/quicktime_audiotrack.h 2007-12-07 22:54:34 UTC (rev 1347) @@ -1,5 +1,5 @@ // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. /** Modified: trunk/src/openmedialib/plugins/quicktime/quicktime_input.cpp =================================================================== --- trunk/src/openmedialib/plugins/quicktime/quicktime_input.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openmedialib/plugins/quicktime/quicktime_input.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // quicktime - A Quicktime plugin to ml. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. // OL INCLUDES Modified: trunk/src/openmedialib/plugins/quicktime/quicktime_input.h =================================================================== --- trunk/src/openmedialib/plugins/quicktime/quicktime_input.h 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openmedialib/plugins/quicktime/quicktime_input.h 2007-12-07 22:54:34 UTC (rev 1347) @@ -1,5 +1,5 @@ // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. /** Modified: trunk/src/openmedialib/plugins/quicktime/quicktime_plugin.cpp =================================================================== --- trunk/src/openmedialib/plugins/quicktime/quicktime_plugin.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openmedialib/plugins/quicktime/quicktime_plugin.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // quicktime - A Quicktime plugin to ml. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. // SYSTEM INCLUDES Modified: trunk/src/openmedialib/plugins/quicktime/quicktime_store.cpp =================================================================== --- trunk/src/openmedialib/plugins/quicktime/quicktime_store.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openmedialib/plugins/quicktime/quicktime_store.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -1,5 +1,5 @@ // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #include <openmedialib/plugins/quicktime/quicktime_store.h> Modified: trunk/src/openmedialib/plugins/quicktime/quicktime_store.h =================================================================== --- trunk/src/openmedialib/plugins/quicktime/quicktime_store.h 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openmedialib/plugins/quicktime/quicktime_store.h 2007-12-07 22:54:34 UTC (rev 1347) @@ -1,5 +1,5 @@ // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. /** Modified: trunk/src/openmedialib/plugins/quicktime/quicktime_track.cpp =================================================================== --- trunk/src/openmedialib/plugins/quicktime/quicktime_track.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openmedialib/plugins/quicktime/quicktime_track.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -1,5 +1,5 @@ // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #include <openmedialib/plugins/quicktime/quicktime_track.h> Modified: trunk/src/openmedialib/plugins/quicktime/quicktime_track.h =================================================================== --- trunk/src/openmedialib/plugins/quicktime/quicktime_track.h 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openmedialib/plugins/quicktime/quicktime_track.h 2007-12-07 22:54:34 UTC (rev 1347) @@ -1,5 +1,5 @@ // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. /** Modified: trunk/src/openmedialib/plugins/quicktime/quicktime_videotrack.cpp =================================================================== --- trunk/src/openmedialib/plugins/quicktime/quicktime_videotrack.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openmedialib/plugins/quicktime/quicktime_videotrack.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -1,5 +1,5 @@ // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #include <openmedialib/plugins/quicktime/quicktime_videotrack.h> Modified: trunk/src/openmedialib/plugins/quicktime/quicktime_videotrack.h =================================================================== --- trunk/src/openmedialib/plugins/quicktime/quicktime_videotrack.h 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openmedialib/plugins/quicktime/quicktime_videotrack.h 2007-12-07 22:54:34 UTC (rev 1347) @@ -1,5 +1,5 @@ // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. /** Modified: trunk/src/openmedialib/py/ml.cpp =================================================================== --- trunk/src/openmedialib/py/ml.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openmedialib/py/ml.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -1,7 +1,7 @@ // ml - A media library representation. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #include <openpluginlib/py/python.hpp> Modified: trunk/src/openmedialib/py/py.cpp =================================================================== --- trunk/src/openmedialib/py/py.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openmedialib/py/py.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -1,7 +1,7 @@ // ml - A media library representation. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #include <openpluginlib/py/python.hpp> Modified: trunk/src/openmedialib/py/py.hpp =================================================================== --- trunk/src/openmedialib/py/py.hpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openmedialib/py/py.hpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -1,7 +1,7 @@ // ml - A media library representation. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #ifndef PY_INC_ Modified: trunk/src/openobjectlib/plugins/X3D/actions/x3d_parser_action.cpp =================================================================== --- trunk/src/openobjectlib/plugins/X3D/actions/x3d_parser_action.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openobjectlib/plugins/X3D/actions/x3d_parser_action.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // sg - A scene graph representation. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #ifdef WIN32 Modified: trunk/src/openobjectlib/plugins/X3D/actions/x3d_parser_action.hpp =================================================================== --- trunk/src/openobjectlib/plugins/X3D/actions/x3d_parser_action.hpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openobjectlib/plugins/X3D/actions/x3d_parser_action.hpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // sg - A scene graph representation. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #ifndef X3D_PARSER_ACTION_INC_ Modified: trunk/src/openobjectlib/plugins/X3D/config.hpp =================================================================== --- trunk/src/openobjectlib/plugins/X3D/config.hpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openobjectlib/plugins/X3D/config.hpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // X3D - An X3D plugin to sg. // Copyright (C) 2005 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #ifndef X3D_CONFIG_INC_ Modified: trunk/src/openobjectlib/plugins/X3D/x3d.cpp =================================================================== --- trunk/src/openobjectlib/plugins/X3D/x3d.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openobjectlib/plugins/X3D/x3d.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // X3D - An X3D plugin to sg. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #ifdef WIN32 Modified: trunk/src/openobjectlib/plugins/X3D/x3d_content_handler_msxml.cpp =================================================================== --- trunk/src/openobjectlib/plugins/X3D/x3d_content_handler_msxml.cpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openobjectlib/plugins/X3D/x3d_content_handler_msxml.cpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // sg - A scene graph representation. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // For more information, see http://www.openlibraries.org. #include <openobjectlib/plugins/X3D/x3d_content_handler_msxml.hpp> Modified: trunk/src/openobjectlib/plugins/X3D/x3d_content_handler_msxml.hpp =================================================================== --- trunk/src/openobjectlib/plugins/X3D/x3d_content_handler_msxml.hpp 2007-12-02 20:00:46 UTC (rev 1346) +++ trunk/src/openobjectlib/plugins/X3D/x3d_content_handler_msxml.hpp 2007-12-07 22:54:34 UTC (rev 1347) @@ -2,7 +2,7 @@ // sg - A scene graph representation. // Copyright (C) 2005-2006 Editopia Inc. -// Released under the GPL. +// Released under the LGPL. // ... [truncated message content] |
From: <gl...@us...> - 2007-12-08 23:19:18
|
Revision: 1348 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1348&view=rev Author: glslang Date: 2007-12-08 15:19:16 -0800 (Sat, 08 Dec 2007) Log Message: ----------- + build fixes Modified Paths: -------------- trunk/src/openassetlib/plugins/sqlite/Makefile.am trunk/src/openassetlib/plugins/sqlite/config.hpp trunk/src/openobjectlib/sg/Makefile.am trunk/src/openpluginlib/pl/openpluginlib.cpp trunk/unity.sh Modified: trunk/src/openassetlib/plugins/sqlite/Makefile.am =================================================================== --- trunk/src/openassetlib/plugins/sqlite/Makefile.am 2007-12-07 22:54:34 UTC (rev 1347) +++ trunk/src/openassetlib/plugins/sqlite/Makefile.am 2007-12-08 23:19:16 UTC (rev 1348) @@ -21,8 +21,8 @@ libopenassetlib_sqlite3_plugin_la_CXXFLAGS = \ $(OLIB_CXXFLAGS) \ $(BOOST_INCLUDE_PATH) \ - $(XML2_CXXFLAGS) \ - # end + $(XML2_CXXFLAGS) \ + -DSQLITE_EXPORTS libopenassetlib_sqlite3_plugin_la_LIBADD = \ $(BOOST_FILESYSTEM_LIBS) \ Modified: trunk/src/openassetlib/plugins/sqlite/config.hpp =================================================================== --- trunk/src/openassetlib/plugins/sqlite/config.hpp 2007-12-07 22:54:34 UTC (rev 1347) +++ trunk/src/openassetlib/plugins/sqlite/config.hpp 2007-12-08 23:19:16 UTC (rev 1348) @@ -15,9 +15,9 @@ # endif #else # ifdef SQLITE_EXPORTS -# define AL_SQLITE3_DECLSPEC extern +# define AL_SQLITE3_DECLSPEC __attribute__( ( visibility( "default" ) ) ) # else -# define AL_SQLITE3_DECLSPEC +# define AL_SQLITE3_DECLSPEC __attribute__( ( visibility( "default" ) ) ) # endif #endif Modified: trunk/src/openobjectlib/sg/Makefile.am =================================================================== --- trunk/src/openobjectlib/sg/Makefile.am 2007-12-07 22:54:34 UTC (rev 1347) +++ trunk/src/openobjectlib/sg/Makefile.am 2007-12-08 23:19:16 UTC (rev 1348) @@ -49,9 +49,7 @@ $(BOOST_FILESYSTEM_LIBS) \ $(OPENGL_LIBS) \ $(OPENGL_GLU_LIBS) \ - $(GLEW_LIBS) \ - $(top_builddir)/src/openpluginlib/pl/libopenpluginlib_pl.la \ - $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la + $(GLEW_LIBS) libopenobjectlib_sg_la_LDFLAGS = \ $(OLIB_LDFLAGS) \ Modified: trunk/src/openpluginlib/pl/openpluginlib.cpp =================================================================== --- trunk/src/openpluginlib/pl/openpluginlib.cpp 2007-12-07 22:54:34 UTC (rev 1347) +++ trunk/src/openpluginlib/pl/openpluginlib.cpp 2007-12-08 23:19:16 UTC (rev 1348) @@ -160,6 +160,7 @@ # elif defined __APPLE__ && defined HAVE_UMBRELLAFRAMEWORK el_reg.insert( "/Library/Frameworks/OpenLibraries.framework/Frameworks/OpenImageLib.framework/PlugIns" ); el_reg.insert( "/Library/Frameworks/OpenLibraries.framework/Frameworks/OpenMediaLib.framework/PlugIns" ); + el_reg.insert( "/Library/Frameworks/OpenLibraries.framework/Frameworks/OpenAssetLib.framework/PlugIns" ); el_reg.insert( "/Library/Frameworks/OpenLibraries.framework/Frameworks/OpenEffectsLib.framework/PlugIns" ); # endif } Modified: trunk/unity.sh =================================================================== --- trunk/unity.sh 2007-12-07 22:54:34 UTC (rev 1347) +++ trunk/unity.sh 2007-12-08 23:19:16 UTC (rev 1348) @@ -146,7 +146,7 @@ then cp $1/$i current_header.$$ - deplist="openpluginlib/pl openimagelib/il openmedialib/ml openassetlib/al" + deplist="openpluginlib/pl openimagelib/il openmedialib/ml openassetlib/al openobjectlib/sg" for j in $deplist do case $j in openpluginlib* ) @@ -158,6 +158,9 @@ openmedialib* ) sed -e "s|$j|OpenMediaLib|g" -i '' current_header.$$ > $2.framework/Versions/Current/Headers/$i ;; + openobjectlib* ) + sed -e "s|$j|OpenObjectLib|g" -i '' current_header.$$ > $2.framework/Versions/Current/Headers/$i + ;; openassetlib* ) sed -e "s|$j|OpenAssetLib|g" -i '' current_header.$$ > $2.framework/Versions/Current/Headers/$i ;; @@ -307,7 +310,7 @@ make_framework_interdeps( ) { - deplist="openpluginlib_pl openimagelib_il openmedialib_ml openassetlib_al" + deplist="openpluginlib_pl openimagelib_il openmedialib_ml openassetlib_al openobjectlib_sg" for i in $deplist do plugins=`ls $1.framework/PlugIns/*.* 2> /dev/null` for j in $plugins @@ -326,6 +329,10 @@ install_name_tool -change $depname \ $install_name_prefix/OpenMediaLib.framework/Versions/$framework_version/OpenMediaLib $j ;; + openobjectlib_sg ) + install_name_tool -change $depname \ + $install_name_prefix/OpenObjectLib.framework/Versions/$framework_version/OpenObjectLib $j + ;; openassetlib_al ) install_name_tool -change $depname \ $install_name_prefix/OpenAssetLib.framework/Versions/$framework_version/OpenAssetLib $j @@ -353,7 +360,7 @@ make_umbrella_framework_deps( ) { - deplist="openpluginlib_pl openimagelib_il openmedialib_ml openassetlib_al" + deplist="openpluginlib_pl openimagelib_il openmedialib_ml openassetlib_al openobjectlib_sg" for i in $deplist do depname=`otool -L $1 | grep $i | cut -d ' ' -f 1` if [ ! -z $depname ] @@ -373,6 +380,11 @@ "$install_name_prefix"/OpenLibraries.framework/Versions/$framework_version/Frameworks/OpenMediaLib.framework/Versions/$framework_version/OpenMediaLib \ $1 ;; + openobjectlib_sg ) + install_name_tool -change $depname \ + "$install_name_prefix"/OpenLibraries.framework/Versions/$framework_version/Frameworks/OpenObjectLib.framework/Versions/$framework_version/OpenObjectLib \ + $1 + ;; openassetlib_al ) install_name_tool -change $depname \ "$install_name_prefix"/OpenLibraries.framework/Versions/$framework_version/Frameworks/OpenAssetLib.framework/Versions/$framework_version/OpenAssetLib \ @@ -386,7 +398,7 @@ make_umbrella_framework_python_deps( ) { install_name_tool -id $install_name_prefix/OpenLibraries.framework/Frameworks/$1.framework/Versions/A/PlugIns/$1.so $2 - fmwklist="OpenPluginLib OpenImageLib OpenMediaLib OpenAssetLib" + fmwklist="OpenPluginLib OpenImageLib OpenMediaLib OpenAssetLib OpenObjectLib" for i in $fmwklist do install_name_tool -change $install_name_prefix/$i.framework/Versions/A/$i \ $install_name_prefix/OpenLibraries.framework/Frameworks/$i.framework/Versions/A/$i $2 @@ -409,12 +421,12 @@ do install_name_tool -id $install_name_prefix/OpenLibraries.framework/Versions/A/Frameworks/$1.framework/Versions/A/PlugIns/`basename $i` $i done - depnames="$install_name_prefix/OpenPluginLib.framework $install_name_prefix/OpenImageLib.framework $install_name_prefix/OpenMediaLib.framework $install_name_prefix/OpenAssetLib.framework" + 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" for i in $libs do for j in $depnames do deps=`otool -L $i | grep $j | cut -d ' ' -f 1` for k in $deps - do if [ `basename $k` != "OpenPluginLib" ] && [ `basename $k` != "OpenImageLib" ] && [ `basename $k` != "OpenMediaLib" ] && [ `basename $k` != "OpenAssetLib" ] + do if [ `basename $k` != "OpenPluginLib" ] && [ `basename $k` != "OpenImageLib" ] && [ `basename $k` != "OpenMediaLib" ] && [ `basename $k` != "OpenAssetLib" ] && [ `basename $k` != "OpenObjectLib" ] then install_name_tool -change $k \ $install_name_prefix/OpenLibraries.framework/Versions/A/Frameworks/$1.framework/Versions/A/Libraries/`basename $k` $i else install_name_tool -change $k \ @@ -448,12 +460,14 @@ cp -R "./OpenImageLib.framework" "$framework_dir/Versions/$framework_version/Frameworks" cp -R "./OpenMediaLib.framework" "$framework_dir/Versions/$framework_version/Frameworks" cp -R "./OpenAssetLib.framework" "$framework_dir/Versions/$framework_version/Frameworks" + cp -R "./OpenObjectLib.framework" "$framework_dir/Versions/$framework_version/Frameworks" make_umbrella_framework_deps "OpenLibraries.framework/OpenLibraries" && make_umbrella_framework_deps "OpenLibraries.framework/Frameworks/OpenPluginLib.framework/PlugIns/OpenPluginLib.so" && make_umbrella_framework_deps "OpenLibraries.framework/Frameworks/OpenImageLib.framework/PlugIns/OpenImageLib.so" && make_umbrella_framework_deps "OpenLibraries.framework/Frameworks/OpenMediaLib.framework/PlugIns/OpenMediaLib.so" && - make_umbrella_framework_deps "OpenLibraries.framework/Frameworks/OpenAssetLib.framework/PlugIns/OpenAssetLib.so" + make_umbrella_framework_deps "OpenLibraries.framework/Frameworks/OpenAssetLib.framework/PlugIns/OpenAssetLib.so" && + make_umbrella_framework_deps "OpenLibraries.framework/Frameworks/OpenObjectLib.framework/PlugIns/OpenObjectLib.so" deplist="GLEW boost" for i in $deplist @@ -498,6 +512,7 @@ update_umbrella_framework_install_names "OpenImageLib" update_umbrella_framework_install_names "OpenMediaLib" update_umbrella_framework_install_names "OpenAssetLib" + update_umbrella_framework_install_names "OpenObjectLib" make_umbrella_framework_python_deps "OpenPluginLib" "OpenLibraries.framework/Frameworks/OpenPluginLib.framework/PlugIns/OpenPluginLib.so" make_umbrella_framework_python_deps "OpenImageLib" "OpenLibraries.framework/Frameworks/OpenImageLib.framework/PlugIns/OpenImageLib.so" @@ -553,7 +568,12 @@ strip -x OpenLibraries.framework/Frameworks/OpenAssetLib.framework/OpenAssetLib && strip -x OpenLibraries.framework/Frameworks/OpenAssetLib.framework/Libraries/*.dylib && strip -x OpenLibraries.framework/Frameworks/OpenAssetLib.framework/PlugIns/*.so && - strip -x OpenLibraries.framework/Frameworks/OpenAssetLib.framework/PlugIns/*.dylib + strip -x OpenLibraries.framework/Frameworks/OpenAssetLib.framework/PlugIns/*.dylib && + strip -x OpenLibraries.framework/Frameworks/OpenObjectLib.framework/OpenObjectLib && + strip -x OpenLibraries.framework/Frameworks/OpenObjectLib.framework/Libraries/*.dylib && + strip -x OpenLibraries.framework/Frameworks/OpenObjectLib.framework/PlugIns/*.so && + strip -x OpenLibraries.framework/Frameworks/OpenObjectLib.framework/PlugIns/*.dylib + check_status $? fi } @@ -579,8 +599,10 @@ make_framework "OpenImageLib" "./src/openimagelib/il" && echo " OpenMediaLib..." && make_framework "OpenMediaLib" "./src/openmedialib/ml" && - echo -n " OpenAssetLib..." && - make_framework "OpenAssetLib" "./src/openassetlib/al" + echo " OpenAssetLib..." && + make_framework "OpenAssetLib" "./src/openassetlib/al" && + echo -n " OpenObjectLib..." && + make_framework "OpenObjectLib" "./src/openobjectlib/sg" check_status $? if [ "$build_umbrella" -eq 1 ] @@ -591,7 +613,8 @@ make_framework_libraries_unique "OpenPluginLib" && make_framework_libraries_unique "OpenImageLib" && make_framework_libraries_unique "OpenMediaLib" && - make_framework_libraries_unique "OpenAssetLib" + make_framework_libraries_unique "OpenAssetLib" && + make_framework_libraries_unique "OpenObjectLib" check_status $? if [ x"$USER" = x"root" ] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gl...@us...> - 2007-12-09 15:42:06
|
Revision: 1350 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1350&view=rev Author: glslang Date: 2007-12-09 07:42:04 -0800 (Sun, 09 Dec 2007) Log Message: ----------- +build fixes Modified Paths: -------------- trunk/unity.sh Added Paths: ----------- trunk/OpenLibraries.pmproj Added: trunk/OpenLibraries.pmproj =================================================================== (Binary files differ) Property changes on: trunk/OpenLibraries.pmproj ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/unity.sh =================================================================== --- trunk/unity.sh 2007-12-08 23:51:46 UTC (rev 1349) +++ trunk/unity.sh 2007-12-09 15:42:04 UTC (rev 1350) @@ -571,7 +571,6 @@ strip -x OpenLibraries.framework/Frameworks/OpenAssetLib.framework/PlugIns/*.dylib && strip -x OpenLibraries.framework/Frameworks/OpenObjectLib.framework/OpenObjectLib && strip -x OpenLibraries.framework/Frameworks/OpenObjectLib.framework/Libraries/*.dylib && - strip -x OpenLibraries.framework/Frameworks/OpenObjectLib.framework/PlugIns/*.so && strip -x OpenLibraries.framework/Frameworks/OpenObjectLib.framework/PlugIns/*.dylib check_status $? This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2008-01-25 08:35:16
|
Revision: 1355 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1355&view=rev Author: timdewhirst Date: 2008-01-25 00:35:14 -0800 (Fri, 25 Jan 2008) Log Message: ----------- audiotube - reinstate glew plugin Modified Paths: -------------- trunk/configure.ac trunk/src/openmedialib/plugins/Makefile.am Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2008-01-25 08:30:15 UTC (rev 1354) +++ trunk/configure.ac 2008-01-25 08:35:14 UTC (rev 1355) @@ -403,6 +403,7 @@ src/openmedialib/plugins/gensys/Makefile src/openmedialib/plugins/quicktime/Makefile src/openmedialib/plugins/ofx/Makefile +src/openmedialib/plugins/glew/Makefile src/openmedialib/py/Makefile src/openeffectslib/Makefile src/openeffectslib/plugins/Makefile Modified: trunk/src/openmedialib/plugins/Makefile.am =================================================================== --- trunk/src/openmedialib/plugins/Makefile.am 2008-01-25 08:30:15 UTC (rev 1354) +++ trunk/src/openmedialib/plugins/Makefile.am 2008-01-25 08:35:14 UTC (rev 1355) @@ -3,4 +3,4 @@ # # -SUBDIRS = avformat oil openal sdl gensys quicktime ofx +SUBDIRS = avformat oil openal sdl gensys quicktime ofx glew This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gl...@us...> - 2008-01-26 21:14:23
|
Revision: 1356 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1356&view=rev Author: glslang Date: 2008-01-26 13:14:19 -0800 (Sat, 26 Jan 2008) Log Message: ----------- + build fixes + some workarounds for crash avoidance Modified Paths: -------------- trunk/installer/openlibraries_runtime.nsi trunk/installer/openlibraries_sdk.nsi trunk/src/openmedialib/plugins/gensys/gensys_plugin.cpp trunk/src/openmedialib/plugins/quicktime/quicktime_plugin.opl Modified: trunk/installer/openlibraries_runtime.nsi =================================================================== --- trunk/installer/openlibraries_runtime.nsi 2008-01-25 08:35:14 UTC (rev 1355) +++ trunk/installer/openlibraries_runtime.nsi 2008-01-26 21:14:19 UTC (rev 1356) @@ -153,8 +153,9 @@ ; dependencies File "C:\Program Files\FFmpeg\lib\avcodec-51.dll" - File "C:\Program Files\FFmpeg\lib\avformat-51.dll" + File "C:\Program Files\FFmpeg\lib\avformat-52.dll" File "C:\Program Files\FFmpeg\lib\avutil-49.dll" + File "C:\Program Files\FFmpeg\lib\libmp3lame-0.dll" ; File "C:\Program Files\FFmpeg\lib\libogg-0.dll" File "C:\OpenEXR\bin\Release\Half.dll" File "C:\OpenEXR\bin\Release\Iex.dll" @@ -202,8 +203,8 @@ File "..\src\openmedialib\plugins\oil\Multi-threaded Release DLL\openmedialib_oil-vc80-r-${VERSION}.dll" File "..\src\openmedialib\plugins\openal\openal_plugin.opl" File "..\src\openmedialib\plugins\openal\Multi-threaded Release DLL\openmedialib_openal-vc80-r-${VERSION}.dll" -; File "..\src\openmedialib\plugins\gensys\gensys_plugin.opl" -; File "..\src\openmedialib\plugins\gensys\Multi-threaded Release DLL\openmedialib_gensys-vc80-r-${VERSION}.dll" + File "..\src\openmedialib\plugins\gensys\gensys_plugin.opl" + File "..\src\openmedialib\plugins\gensys\Multi-threaded Release DLL\openmedialib_gensys-vc80-r-${VERSION}.dll" File "..\src\openmedialib\plugins\quicktime\quicktime_plugin.opl" File "..\src\openmedialib\plugins\quicktime\Multi-threaded Release DLL\openmedialib_quicktime-vc80-r-${VERSION}.dll" ; File "..\src\openmedialib\plugins\sdl\sdl_plugin.opl" Modified: trunk/installer/openlibraries_sdk.nsi =================================================================== --- trunk/installer/openlibraries_sdk.nsi 2008-01-25 08:35:14 UTC (rev 1355) +++ trunk/installer/openlibraries_sdk.nsi 2008-01-26 21:14:19 UTC (rev 1356) @@ -223,8 +223,9 @@ ; dependencies File "C:\Program Files\FFmpeg\lib\avcodec-51.dll" - File "C:\Program Files\FFmpeg\lib\avformat-51.dll" + File "C:\Program Files\FFmpeg\lib\avformat-52.dll" File "C:\Program Files\FFmpeg\lib\avutil-49.dll" + File "C:\Program Files\FFmpeg\lib\libmp3lame-0.dll" ; File "C:\Program Files\FFmpeg\lib\libogg-0.dll" File "C:\OpenEXR\bin\Debug\Half.dll" File "C:\OpenEXR\bin\Debug\Iex.dll" Modified: trunk/src/openmedialib/plugins/gensys/gensys_plugin.cpp =================================================================== --- trunk/src/openmedialib/plugins/gensys/gensys_plugin.cpp 2008-01-25 08:35:14 UTC (rev 1355) +++ trunk/src/openmedialib/plugins/gensys/gensys_plugin.cpp 2008-01-26 21:14:19 UTC (rev 1356) @@ -1457,11 +1457,16 @@ } } - result = frame_type::deep_copy( map_.find( requested )->second ); - if ( result && reseat_->has( samples ) ) - result->set_audio( reseat_->retrieve( samples ) ); - - std::map< int, frame_type_ptr >::iterator iter = map_.begin( ); + result = frame_type_ptr( ); + std::map< int, frame_type_ptr >::iterator iter = map_.find( requested ); + if( iter != map_.end( ) ) + { + result = frame_type::deep_copy( iter->second ); + if ( result && reseat_->has( samples ) ) + result->set_audio( reseat_->retrieve( samples ) ); + } + + iter = map_.begin( ); while( iter != map_.end( ) ) { if ( iter->first < requested || iter->first > requested + 25 ) Modified: trunk/src/openmedialib/plugins/quicktime/quicktime_plugin.opl =================================================================== --- trunk/src/openmedialib/plugins/quicktime/quicktime_plugin.opl 2008-01-25 08:35:14 UTC (rev 1355) +++ trunk/src/openmedialib/plugins/quicktime/quicktime_plugin.opl 2008-01-26 21:14:19 UTC (rev 1356) @@ -2,7 +2,7 @@ <openlibraries version="1.0"> <!-- plugins go here --> <openmedialib name="oml" version="0.1.0"> - <plugin name="OpenLibraries quicktime plugin" type="input" in_filter="*.mov" extension='".*\.mov"' merit="10" filename='"libopenmedialib_quicktime.so", "libopenmedialib_quicktime.dylib", "openmedialib_quicktime-vc80-d-0_5_0.dll", "openmedialib_quicktime-vc80-r-0_5_0.dll"'/> + <plugin name="OpenLibraries quicktime plugin" type="input" in_filter="*.mov" extension='".*\.mov"' merit="1" filename='"libopenmedialib_quicktime.so", "libopenmedialib_quicktime.dylib", "openmedialib_quicktime-vc80-d-0_5_0.dll", "openmedialib_quicktime-vc80-r-0_5_0.dll"'/> <plugin name="OpenLibraries quicktime plugin" type="output" extension='".*\.mov"' merit="80" filename='"libopenmedialib_quicktime.so", "libopenmedialib_quciktime.dylib", "openmedialib_quicktime-vc80-d-0_5_0.dll", "openmedialib_quicktime-vc80-r-0_5_0.dll"'/> </openmedialib> </openlibraries> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2008-03-14 18:23:34
|
Revision: 1362 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1362&view=rev Author: timdewhirst Date: 2008-03-14 11:23:24 -0700 (Fri, 14 Mar 2008) Log Message: ----------- olibs - prototype cmake files Added Paths: ----------- trunk/CMakeLists.txt trunk/src/CMakeLists.txt trunk/src/openpluginlib/CMakeLists.txt trunk/src/openpluginlib/pl/CMakeLists.txt Added: trunk/CMakeLists.txt =================================================================== --- trunk/CMakeLists.txt (rev 0) +++ trunk/CMakeLists.txt 2008-03-14 18:23:24 UTC (rev 1362) @@ -0,0 +1,22 @@ +project( OpenLibraries ) + +# boost +find_package( Boost ) +if ( Boost_FOUND ) + message( found boost: ${Boost_INCLUDE_DIR} ) + include_directories( ${Boost_INCLUDE_DIR} ) +endif ( Boost_FOUND ) + +# SDL +find_package( SDL ) +if ( SDL_FOUND ) + message( found boost: ${SDL_INCLUDE_DIR} ) + include_directories( ${SDL_INCLUDE_DIR} ) +endif ( SDL_FOUND ) + +# kill some warnings +if ( WIN32 ) + set( CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "/wd4273" ) +endif( WIN32 ) + +add_subdirectory( src ) Added: trunk/src/CMakeLists.txt =================================================================== --- trunk/src/CMakeLists.txt (rev 0) +++ trunk/src/CMakeLists.txt 2008-03-14 18:23:24 UTC (rev 1362) @@ -0,0 +1,6 @@ +add_subdirectory( openpluginlib ) +add_subdirectory( openimagelib ) +add_subdirectory( openmedialib ) +#add_subdirectory( openassetlib ) +#add_subdirectory( openeffectslib ) +#add_subdirectory( openobjectlib ) Added: trunk/src/openpluginlib/CMakeLists.txt =================================================================== --- trunk/src/openpluginlib/CMakeLists.txt (rev 0) +++ trunk/src/openpluginlib/CMakeLists.txt 2008-03-14 18:23:24 UTC (rev 1362) @@ -0,0 +1,2 @@ +add_subdirectory( pl ) +#add_subdirectory( py ) Added: trunk/src/openpluginlib/pl/CMakeLists.txt =================================================================== --- trunk/src/openpluginlib/pl/CMakeLists.txt (rev 0) +++ trunk/src/openpluginlib/pl/CMakeLists.txt 2008-03-14 18:23:24 UTC (rev 1362) @@ -0,0 +1,30 @@ +include_directories( ${OpenLibraries_SOURCE_DIR}/src ) +message( including: ${OpenLibraries_SOURCE_DIR}/src ) +set( SOURCES + bind_info.cpp + fast_math.cpp + openplugin.cpp + openpluginlib.cpp + opl_importer.cpp + registry.cpp + utf8_utils.cpp + opl_parser_action.cpp + pool.cpp + timer.cpp + shader_manager.cpp + stream.cpp + shlib.cpp + GL_utility.cpp + cg.cpp + pcos/key.cpp + pcos/property.cpp + pcos/property_container.cpp + pcos/subject.cpp ) + +if ( WIN32 ) + set( SOURCES ${SOURCES} content_handler_msxml.cpp ) +else ( WIN32 ) + set( SOURCES ${SOURCES} content_handler_libxml.cpp ) +endif ( WIN32 ) + +add_library( openpluginlib_pl ${SOURCES} ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2008-03-17 01:03:51
|
Revision: 1363 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1363&view=rev Author: timdewhirst Date: 2008-03-16 18:03:47 -0700 (Sun, 16 Mar 2008) Log Message: ----------- olibs - moving forwards with cmake; OPL now builds Modified Paths: -------------- trunk/CMakeLists.txt trunk/src/openpluginlib/pl/CMakeLists.txt Added Paths: ----------- trunk/FindGLEW.cmake Modified: trunk/CMakeLists.txt =================================================================== --- trunk/CMakeLists.txt 2008-03-14 18:23:24 UTC (rev 1362) +++ trunk/CMakeLists.txt 2008-03-17 01:03:47 UTC (rev 1363) @@ -1,19 +1,59 @@ project( OpenLibraries ) +set( VERSION_MAJOR 0 ) +set( VERSION_MINOR 5 ) +set( VERSION_PATCH 1 ) +set( PACKAGE "openlibraries-${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" ) + +# only required for non-umbrella builds +option( OPTION_UMBRELLA "enable umbrella build" OFF ) +if ( NOT OPTION_UMBRELLA ) + message( "defining plugin paths" ) + add_definitions( -DOPENIMAGELIB_PLUGINS="\\\"${CMAKE_INSTALL_PREFIX}/lib/${PACKAGE}/openimagelib/plugins\\\"" ) + add_definitions( -DOPENMEDIALIB_PLUGINS="\\\"${CMAKE_INSTALL_PREFIX}/lib/${PACKAGE}/openmedialib/plugins\\\"" ) + add_definitions( -DOPENASSETLIB_PLUGINS="\\\"${CMAKE_INSTALL_PREFIX}/lib/${PACKAGE}/openassetlib/plugins\\\"" ) + add_definitions( -DOPENOBJECTLIB_PLUGINS="\\\"${CMAKE_INSTALL_PREFIX}/lib/${PACKAGE}/openobjectlib/plugins\\\"" ) + add_definitions( -DOPENEFFECTSLIB_PLUGINS="\\\"${CMAKE_INSTALL_PREFIX}/lib/${PACKAGE}/openeffectslib/plugins\\\"" ) +endif( NOT OPTION_UMBRELLA ) + +# find optional and required modules +# check in the source directory +set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR} ) + # boost find_package( Boost ) if ( Boost_FOUND ) - message( found boost: ${Boost_INCLUDE_DIR} ) + message( "found boost:" ${Boost_INCLUDE_DIR} ) include_directories( ${Boost_INCLUDE_DIR} ) endif ( Boost_FOUND ) # SDL find_package( SDL ) if ( SDL_FOUND ) - message( found boost: ${SDL_INCLUDE_DIR} ) + message( "found SDL:" ${SDL_INCLUDE_DIR} ) include_directories( ${SDL_INCLUDE_DIR} ) endif ( SDL_FOUND ) +# libxml +if ( NOT WIN32 ) + find_package( LibXml2 ) + if ( LIBXML2_FOUND ) + message( "found LibXml2:" ${LIBXML2_INCLUDE_DIR} ) + include_directories( ${LIBXML2_INCLUDE_DIR} ) + endif( LIBXML2_FOUND ) +endif( NOT WIN32 ) + +# GLEW +find_package( GLEW ) +if ( GLEW_FOUND ) + message( "found SDL:" ${GLEW_INCLUDE_DIR} ) + include_directories( ${GLEW_INCLUDE_DIR} ) + add_definitions( -DHAVE_GL_GLEW_H ) + set ( SHARE_PATH ${CMAKE_INSTALL_PREFIX}/share/${PACKAGE} ) + add_definitions( -DOPENOBJECTLIB_SHADERS="\\\"${SHARE_PATH}/shaders\\\"" ) + add_definitions( -DOPENEFFECTSLIB_SHADERS="\\\"${SHARE_PATH}/shaders\\\"" ) +endif ( GLEW_FOUND ) + # kill some warnings if ( WIN32 ) set( CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "/wd4273" ) Added: trunk/FindGLEW.cmake =================================================================== --- trunk/FindGLEW.cmake (rev 0) +++ trunk/FindGLEW.cmake 2008-03-17 01:03:47 UTC (rev 1363) @@ -0,0 +1,47 @@ +# - Try to find GLEW +# Once done this will define +# +# GLEW_FOUND - system has GLEW +# GLEW_INCLUDE_DIR - the GLEW include directory +# GLEW_LIBRARIES - Link these to use GLEW +# + +IF (GLEW_INCLUDE_DIR) + # Already in cache, be silent + SET(GLEW_FIND_QUIETLY TRUE) +ENDIF (GLEW_INCLUDE_DIR) + +FIND_PATH(GLEW_INCLUDE_DIR glew.h wglew.h + /usr/local/include/GL + /usr/include/GL +) + +SET(GLEW_NAMES glew GLEW) +FIND_LIBRARY(GLEW_LIBRARY + NAMES ${GLEW_NAMES} + PATHS /usr/lib /usr/local/lib +) + +IF (GLEW_INCLUDE_DIR AND GLEW_LIBRARY) + SET(GLEW_FOUND TRUE) + SET( GLEW_LIBRARIES ${GLEW_LIBRARY} ) +ELSE (GLEW_INCLUDE_DIR AND GLEW_LIBRARY) + SET(GLEW_FOUND FALSE) + SET( GLEW_LIBRARIES ) +ENDIF (GLEW_INCLUDE_DIR AND GLEW_LIBRARY) + +IF (GLEW_FOUND) + IF (NOT GLEW_FIND_QUIETLY) + MESSAGE(STATUS "Found GLEW: ${GLEW_LIBRARY}") + ENDIF (NOT GLEW_FIND_QUIETLY) +ELSE (GLEW_FOUND) + IF (GLEW_FIND_REQUIRED) + MESSAGE(STATUS "Looked for GLEW libraries named ${GLEWS_NAMES}.") + MESSAGE(FATAL_ERROR "Could NOT find GLEW library") + ENDIF (GLEW_FIND_REQUIRED) +ENDIF (GLEW_FOUND) + +MARK_AS_ADVANCED( + GLEW_LIBRARY + GLEW_INCLUDE_DIR +) Modified: trunk/src/openpluginlib/pl/CMakeLists.txt =================================================================== --- trunk/src/openpluginlib/pl/CMakeLists.txt 2008-03-14 18:23:24 UTC (rev 1362) +++ trunk/src/openpluginlib/pl/CMakeLists.txt 2008-03-17 01:03:47 UTC (rev 1363) @@ -1,25 +1,26 @@ include_directories( ${OpenLibraries_SOURCE_DIR}/src ) message( including: ${OpenLibraries_SOURCE_DIR}/src ) -set( SOURCES - bind_info.cpp - fast_math.cpp - openplugin.cpp - openpluginlib.cpp - opl_importer.cpp - registry.cpp - utf8_utils.cpp - opl_parser_action.cpp - pool.cpp - timer.cpp - shader_manager.cpp - stream.cpp - shlib.cpp - GL_utility.cpp - cg.cpp - pcos/key.cpp - pcos/property.cpp - pcos/property_container.cpp - pcos/subject.cpp ) +set( + SOURCES + bind_info.cpp + fast_math.cpp + openplugin.cpp + openpluginlib.cpp + opl_importer.cpp + registry.cpp + utf8_utils.cpp + opl_parser_action.cpp + pool.cpp + timer.cpp + shader_manager.cpp + stream.cpp + shlib.cpp + GL_utility.cpp + cg.cpp + pcos/key.cpp + pcos/property.cpp + pcos/property_container.cpp + pcos/subject.cpp ) if ( WIN32 ) set( SOURCES ${SOURCES} content_handler_msxml.cpp ) @@ -27,4 +28,35 @@ set( SOURCES ${SOURCES} content_handler_libxml.cpp ) endif ( WIN32 ) -add_library( openpluginlib_pl ${SOURCES} ) + +install( + FILES + bind_info.hpp + discovery_traits.hpp + openplugin.hpp + openpluginlib.hpp + config.hpp + pool.hpp + property.hpp + utf8_utils.hpp + string.hpp + timer.hpp + shader_manager.hpp + geometry.hpp + cg.hpp + GL_utility.hpp + string.hpp + stream.hpp + pcos/key.hpp + pcos/observer.hpp + pcos/iproperty_container.hpp + pcos/property.hpp + pcos/property_container.hpp + pcos/subject.hpp + pcos/visitor.hpp + pcos/isubject.hpp + pcos/iclonable.hpp + DESTINATION "include/${PACKAGE}/openpluginlib/pl" ) + +add_library( openpluginlib_pl SHARED ${SOURCES} ) +install( TARGETS openpluginlib_pl LIBRARY DESTINATION "lib/${PACKAGE}/openpluginlib/lib" ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2008-03-17 18:20:59
|
Revision: 1364 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1364&view=rev Author: timdewhirst Date: 2008-03-17 11:20:06 -0700 (Mon, 17 Mar 2008) Log Message: ----------- openlibraries - more work on windows cmake files Modified Paths: -------------- trunk/CMakeLists.txt trunk/FindGLEW.cmake trunk/src/openpluginlib/pl/CMakeLists.txt trunk/src/openpluginlib/pl/config.hpp trunk/src/openpluginlib/pl/opl_parser_action.hpp Modified: trunk/CMakeLists.txt =================================================================== --- trunk/CMakeLists.txt 2008-03-17 01:03:47 UTC (rev 1363) +++ trunk/CMakeLists.txt 2008-03-17 18:20:06 UTC (rev 1364) @@ -4,6 +4,7 @@ set( VERSION_MINOR 5 ) set( VERSION_PATCH 1 ) set( PACKAGE "openlibraries-${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" ) +set( VERSION_STRING "${VERSION_MAJOR}_${VERSION_MINOR}_${VERSION_PATCH}" ) # only required for non-umbrella builds option( OPTION_UMBRELLA "enable umbrella build" OFF ) @@ -23,8 +24,9 @@ # boost find_package( Boost ) if ( Boost_FOUND ) - message( "found boost:" ${Boost_INCLUDE_DIR} ) + message( "found boost: ${Boost_INCLUDE_DIR}" ) include_directories( ${Boost_INCLUDE_DIR} ) + link_directories( ${Boost_LIBRARY_DIRS} ) endif ( Boost_FOUND ) # SDL @@ -46,17 +48,29 @@ # GLEW find_package( GLEW ) if ( GLEW_FOUND ) - message( "found SDL:" ${GLEW_INCLUDE_DIR} ) + message( "found GLEW:" ${GLEW_INCLUDE_DIR} ) include_directories( ${GLEW_INCLUDE_DIR} ) + link_directories( ${GLEW_LIBRARIES} ) add_definitions( -DHAVE_GL_GLEW_H ) set ( SHARE_PATH ${CMAKE_INSTALL_PREFIX}/share/${PACKAGE} ) add_definitions( -DOPENOBJECTLIB_SHADERS="\\\"${SHARE_PATH}/shaders\\\"" ) add_definitions( -DOPENEFFECTSLIB_SHADERS="\\\"${SHARE_PATH}/shaders\\\"" ) endif ( GLEW_FOUND ) -# kill some warnings +# kill some warnings, add some windows specific defines if ( WIN32 ) - set( CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "/wd4273" ) + set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4273 /wd4251 /wd4503" ) + set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:wchar_t" ) + add_definitions( -DUNICODE ) + add_definitions( -D_CRT_SECURE_NO_DEPRECATE ) + + if( MSVC80 ) + set( COMPILER "vc80" ) + endif( MSVC80 ) + if( MSVC71 ) + set( COMPILER "vc71" ) + endif( MSVC71 ) + set( LIBRARY_IDENTIFIER "-${COMPILER}-d-${VERSION_STRING}" ) endif( WIN32 ) add_subdirectory( src ) Modified: trunk/FindGLEW.cmake =================================================================== --- trunk/FindGLEW.cmake 2008-03-17 01:03:47 UTC (rev 1363) +++ trunk/FindGLEW.cmake 2008-03-17 18:20:06 UTC (rev 1364) @@ -11,17 +11,30 @@ SET(GLEW_FIND_QUIETLY TRUE) ENDIF (GLEW_INCLUDE_DIR) -FIND_PATH(GLEW_INCLUDE_DIR glew.h wglew.h - /usr/local/include/GL - /usr/include/GL -) +if( WIN32 ) + if( MSVC80 ) + set( COMPILER_PATH "C:/Program\ Files/Microsoft\ Visual\ Studio\ 8/VC" ) + endif( MSVC80 ) + if( MSVC71 ) + set( COMPILER_PATH "C:/Program\ Files/Microsoft\ Visual\ Studio\ .NET\ 2003/Vc7" ) + endif( MSVC71 ) + FIND_PATH( GLEW_INCLUDE_DIR glew.h wglew.h + c:/glew/include/gl + ${COMPILER_PATH}/PlatformSDK/Include/gl ) + SET( GLEW_NAMES glew32 ) + FIND_LIBRARY( GLEW_LIBRARY + NAMES ${GLEW_NAMES} + PATHS ${COMPILER_PATH}/PlatformSDK/Lib ) +else( WIN32 ) + FIND_PATH( GLEW_INCLUDE_DIR glew.h wglew.h + /usr/local/include/GL + /usr/include/GL ) + SET( GLEW_NAMES glew ) + FIND_LIBRARY( GLEW_LIBRARY + NAMES ${GLEW_NAMES} + PATHS /usr/lib /usr/local/lib ) +endif( WIN32 ) -SET(GLEW_NAMES glew GLEW) -FIND_LIBRARY(GLEW_LIBRARY - NAMES ${GLEW_NAMES} - PATHS /usr/lib /usr/local/lib -) - IF (GLEW_INCLUDE_DIR AND GLEW_LIBRARY) SET(GLEW_FOUND TRUE) SET( GLEW_LIBRARIES ${GLEW_LIBRARY} ) @@ -30,17 +43,6 @@ SET( GLEW_LIBRARIES ) ENDIF (GLEW_INCLUDE_DIR AND GLEW_LIBRARY) -IF (GLEW_FOUND) - IF (NOT GLEW_FIND_QUIETLY) - MESSAGE(STATUS "Found GLEW: ${GLEW_LIBRARY}") - ENDIF (NOT GLEW_FIND_QUIETLY) -ELSE (GLEW_FOUND) - IF (GLEW_FIND_REQUIRED) - MESSAGE(STATUS "Looked for GLEW libraries named ${GLEWS_NAMES}.") - MESSAGE(FATAL_ERROR "Could NOT find GLEW library") - ENDIF (GLEW_FIND_REQUIRED) -ENDIF (GLEW_FOUND) - MARK_AS_ADVANCED( GLEW_LIBRARY GLEW_INCLUDE_DIR Modified: trunk/src/openpluginlib/pl/CMakeLists.txt =================================================================== --- trunk/src/openpluginlib/pl/CMakeLists.txt 2008-03-17 01:03:47 UTC (rev 1363) +++ trunk/src/openpluginlib/pl/CMakeLists.txt 2008-03-17 18:20:06 UTC (rev 1364) @@ -1,34 +1,84 @@ include_directories( ${OpenLibraries_SOURCE_DIR}/src ) message( including: ${OpenLibraries_SOURCE_DIR}/src ) -set( - SOURCES - bind_info.cpp - fast_math.cpp - openplugin.cpp - openpluginlib.cpp - opl_importer.cpp - registry.cpp - utf8_utils.cpp - opl_parser_action.cpp - pool.cpp - timer.cpp - shader_manager.cpp - stream.cpp - shlib.cpp - GL_utility.cpp - cg.cpp - pcos/key.cpp - pcos/property.cpp - pcos/property_container.cpp - pcos/subject.cpp ) +set( NAME openpluginlib_pl ) -if ( WIN32 ) - set( SOURCES ${SOURCES} content_handler_msxml.cpp ) -else ( WIN32 ) - set( SOURCES ${SOURCES} content_handler_libxml.cpp ) -endif ( WIN32 ) +if( WIN32 ) + add_definitions( -DOPENPLUGINLIB_EXPORTS ) + add_definitions( -DOPENPLUGINLIB_LIBNAME=\\\"${NAME}\\\" ) + add_definitions( -DOPENPLUGINLIB_VERSION=\\\"${VERSION_STRING}\\\" ) + add_definitions( -DOPENPLUGINLIB_BUILD ) + set( NAME "${NAME}${LIBRARY_IDENTIFIER}" ) +endif( WIN32 ) +set( SOURCES + bind_info.hpp + bind_info.cpp + config.hpp + discovery_traits.hpp + fast_math.hpp + fast_math.cpp + geometry.hpp + openplugin.hpp + openplugin.cpp + openpluginlib.hpp + openpluginlib.cpp + opl_importer.hpp + opl_importer.cpp + property.hpp + registry.hpp + registry.cpp + utf8_utils.hpp + utf8_utils.cpp + opl_parser_action.hpp + opl_parser_action.cpp + pool.cpp + pool.hpp + string.hpp + shader_manager.hpp + shader_manager.cpp + allocatorstringstorage.h + cowstringopt.h + flex_string_details.h + flex_string.h + flex_string_shell.h + simplestringstorage.h + smallstringopt.h + stream.hpp + stream.cpp + shlib.hpp + shlib.cpp + vectorstringstorage.h + GL_utility.hpp + GL_utility.cpp + cg.hpp + cg.cpp + pcos/key.hpp + pcos/key.cpp + pcos/observer.hpp + pcos/property.hpp + pcos/property.cpp + pcos/property_container.hpp + pcos/property_container.cpp + pcos/subject.hpp + pcos/subject.cpp + pcos/visitor.hpp + pcos/isubject.hpp + pcos/iclonable.hpp ) +set( GLEW_SOURCES + timer.hpp + timer.cpp ) + +if( GLEW_FOUND ) + set( SOURCES ${SOURCES} ${GLEW_SOURCES} ) +endif( GLEW_FOUND ) + +if( WIN32 ) + set( SOURCES ${SOURCES} content_handler_msxml.cpp content_handler_msxml.hpp ) +else( WIN32 ) + set( SOURCES ${SOURCES} content_handler_libxml.cpp content_handler_libxml.hpp ) +endif( WIN32 ) + install( FILES bind_info.hpp @@ -58,5 +108,5 @@ pcos/iclonable.hpp DESTINATION "include/${PACKAGE}/openpluginlib/pl" ) -add_library( openpluginlib_pl SHARED ${SOURCES} ) -install( TARGETS openpluginlib_pl LIBRARY DESTINATION "lib/${PACKAGE}/openpluginlib/lib" ) +add_library( ${NAME} SHARED ${SOURCES} ) +install( TARGETS ${NAME} LIBRARY DESTINATION "lib/${PACKAGE}/openpluginlib/lib" ) Modified: trunk/src/openpluginlib/pl/config.hpp =================================================================== --- trunk/src/openpluginlib/pl/config.hpp 2008-03-17 01:03:47 UTC (rev 1363) +++ trunk/src/openpluginlib/pl/config.hpp 2008-03-17 18:20:06 UTC (rev 1364) @@ -57,8 +57,4 @@ # endif #endif -#ifdef WIN32 -#define HAVE_GL_GLEW_H #endif - -#endif Modified: trunk/src/openpluginlib/pl/opl_parser_action.hpp =================================================================== --- trunk/src/openpluginlib/pl/opl_parser_action.hpp 2008-03-17 01:03:47 UTC (rev 1363) +++ trunk/src/openpluginlib/pl/opl_parser_action.hpp 2008-03-17 18:20:06 UTC (rev 1364) @@ -18,7 +18,9 @@ // forward declarations #ifdef WIN32 -struct MSXML2::ISAXAttributes; +namespace MSXML2 { + struct ISAXAttributes; +} #else #include <libxml/parser.h> #endif // WIN32 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2008-03-18 08:50:46
|
Revision: 1365 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1365&view=rev Author: timdewhirst Date: 2008-03-18 01:50:40 -0700 (Tue, 18 Mar 2008) Log Message: ----------- openlibraries - more work on cmake for windows Modified Paths: -------------- trunk/CMakeLists.txt trunk/FindGLEW.cmake trunk/src/openpluginlib/pl/CMakeLists.txt Modified: trunk/CMakeLists.txt =================================================================== --- trunk/CMakeLists.txt 2008-03-17 18:20:06 UTC (rev 1364) +++ trunk/CMakeLists.txt 2008-03-18 08:50:40 UTC (rev 1365) @@ -32,7 +32,7 @@ # SDL find_package( SDL ) if ( SDL_FOUND ) - message( "found SDL:" ${SDL_INCLUDE_DIR} ) + message( "found SDL: ${SDL_INCLUDE_DIR}" ) include_directories( ${SDL_INCLUDE_DIR} ) endif ( SDL_FOUND ) @@ -40,7 +40,7 @@ if ( NOT WIN32 ) find_package( LibXml2 ) if ( LIBXML2_FOUND ) - message( "found LibXml2:" ${LIBXML2_INCLUDE_DIR} ) + message( "found LibXml2: ${LIBXML2_INCLUDE_DIR}" ) include_directories( ${LIBXML2_INCLUDE_DIR} ) endif( LIBXML2_FOUND ) endif( NOT WIN32 ) @@ -48,9 +48,10 @@ # GLEW find_package( GLEW ) if ( GLEW_FOUND ) - message( "found GLEW:" ${GLEW_INCLUDE_DIR} ) + message( "found GLEW: ${GLEW_INCLUDE_DIR}" ) include_directories( ${GLEW_INCLUDE_DIR} ) link_directories( ${GLEW_LIBRARIES} ) + add_definitions( -DHAVE_GL_GLEW_H ) set ( SHARE_PATH ${CMAKE_INSTALL_PREFIX}/share/${PACKAGE} ) add_definitions( -DOPENOBJECTLIB_SHADERS="\\\"${SHARE_PATH}/shaders\\\"" ) Modified: trunk/FindGLEW.cmake =================================================================== --- trunk/FindGLEW.cmake 2008-03-17 18:20:06 UTC (rev 1364) +++ trunk/FindGLEW.cmake 2008-03-18 08:50:40 UTC (rev 1365) @@ -18,17 +18,15 @@ if( MSVC71 ) set( COMPILER_PATH "C:/Program\ Files/Microsoft\ Visual\ Studio\ .NET\ 2003/Vc7" ) endif( MSVC71 ) - FIND_PATH( GLEW_INCLUDE_DIR glew.h wglew.h - c:/glew/include/gl - ${COMPILER_PATH}/PlatformSDK/Include/gl ) + FIND_PATH( GLEW_INCLUDE_DIR gl/glew.h gl/wglew.h + PATHS c:/glew/include ${COMPILER_PATH}/PlatformSDK/Include ) SET( GLEW_NAMES glew32 ) FIND_LIBRARY( GLEW_LIBRARY NAMES ${GLEW_NAMES} - PATHS ${COMPILER_PATH}/PlatformSDK/Lib ) + PATHS c:/glew/lib ${COMPILER_PATH}/PlatformSDK/Lib ) else( WIN32 ) - FIND_PATH( GLEW_INCLUDE_DIR glew.h wglew.h - /usr/local/include/GL - /usr/include/GL ) + FIND_PATH( GLEW_INCLUDE_DIR gl/glew.h gl/wglew.h + PATHS /usr/local/include /usr/include ) SET( GLEW_NAMES glew ) FIND_LIBRARY( GLEW_LIBRARY NAMES ${GLEW_NAMES} Modified: trunk/src/openpluginlib/pl/CMakeLists.txt =================================================================== --- trunk/src/openpluginlib/pl/CMakeLists.txt 2008-03-17 18:20:06 UTC (rev 1364) +++ trunk/src/openpluginlib/pl/CMakeLists.txt 2008-03-18 08:50:40 UTC (rev 1365) @@ -11,8 +11,6 @@ endif( WIN32 ) set( SOURCES - bind_info.hpp - bind_info.cpp config.hpp discovery_traits.hpp fast_math.hpp @@ -34,8 +32,6 @@ pool.cpp pool.hpp string.hpp - shader_manager.hpp - shader_manager.cpp allocatorstringstorage.h cowstringopt.h flex_string_details.h @@ -66,6 +62,10 @@ pcos/iclonable.hpp ) set( GLEW_SOURCES + bind_info.hpp + bind_info.cpp + shader_manager.hpp + shader_manager.cpp timer.hpp timer.cpp ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2008-03-18 18:53:05
|
Revision: 1366 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1366&view=rev Author: timdewhirst Date: 2008-03-18 11:52:01 -0700 (Tue, 18 Mar 2008) Log Message: ----------- openlibraries - more on cmake Modified Paths: -------------- trunk/CMakeLists.txt trunk/FindGLEW.cmake trunk/src/openimagelib/il/config.hpp trunk/src/openmedialib/ml/config.hpp trunk/src/openpluginlib/pl/CMakeLists.txt trunk/src/openpluginlib/pl/config.hpp Added Paths: ----------- trunk/src/openimagelib/CMakeLists.txt trunk/src/openimagelib/il/CMakeLists.txt trunk/src/openimagelib/plugins/CMakeLists.txt trunk/src/openimagelib/plugins/gdi+/CMakeLists.txt trunk/src/openmedialib/CMakeLists.txt trunk/src/openmedialib/ml/CMakeLists.txt trunk/src/openmedialib/plugins/gensys/CMakeLists.txt trunk/src/openmedialib/plugins/glew/CMakeLists.txt trunk/src/openmedialib/plugins/oil/CMakeLists.txt Modified: trunk/CMakeLists.txt =================================================================== --- trunk/CMakeLists.txt 2008-03-18 08:50:40 UTC (rev 1365) +++ trunk/CMakeLists.txt 2008-03-18 18:52:01 UTC (rev 1366) @@ -50,9 +50,8 @@ if ( GLEW_FOUND ) message( "found GLEW: ${GLEW_INCLUDE_DIR}" ) include_directories( ${GLEW_INCLUDE_DIR} ) - link_directories( ${GLEW_LIBRARIES} ) + link_directories( ${GLEW_LIBRARY_DIR} ) - add_definitions( -DHAVE_GL_GLEW_H ) set ( SHARE_PATH ${CMAKE_INSTALL_PREFIX}/share/${PACKAGE} ) add_definitions( -DOPENOBJECTLIB_SHADERS="\\\"${SHARE_PATH}/shaders\\\"" ) add_definitions( -DOPENEFFECTSLIB_SHADERS="\\\"${SHARE_PATH}/shaders\\\"" ) Modified: trunk/FindGLEW.cmake =================================================================== --- trunk/FindGLEW.cmake 2008-03-18 08:50:40 UTC (rev 1365) +++ trunk/FindGLEW.cmake 2008-03-18 18:52:01 UTC (rev 1366) @@ -3,7 +3,8 @@ # # GLEW_FOUND - system has GLEW # GLEW_INCLUDE_DIR - the GLEW include directory -# GLEW_LIBRARIES - Link these to use GLEW +# GLEW_LIBRARY_DIR - where the libraries are +# GLEW_LIBRARY - Link these to use GLEW # IF (GLEW_INCLUDE_DIR) @@ -33,12 +34,14 @@ PATHS /usr/lib /usr/local/lib ) endif( WIN32 ) +GET_FILENAME_COMPONENT( GLEW_LIBRARY_DIR ${GLEW_LIBRARY} PATH ) + IF (GLEW_INCLUDE_DIR AND GLEW_LIBRARY) SET(GLEW_FOUND TRUE) - SET( GLEW_LIBRARIES ${GLEW_LIBRARY} ) + SET( GLEW_LIBRARY_DIR ${GLEW_LIBRARY} ) ELSE (GLEW_INCLUDE_DIR AND GLEW_LIBRARY) - SET(GLEW_FOUND FALSE) - SET( GLEW_LIBRARIES ) + SET( GLEW_FOUND FALSE ) + SET( GLEW_LIBRARY_DIR ) ENDIF (GLEW_INCLUDE_DIR AND GLEW_LIBRARY) MARK_AS_ADVANCED( Added: trunk/src/openimagelib/CMakeLists.txt =================================================================== --- trunk/src/openimagelib/CMakeLists.txt (rev 0) +++ trunk/src/openimagelib/CMakeLists.txt 2008-03-18 18:52:01 UTC (rev 1366) @@ -0,0 +1,3 @@ +add_subdirectory( il ) +add_subdirectory( plugins ) +#add_subdirectory( py ) Added: trunk/src/openimagelib/il/CMakeLists.txt =================================================================== --- trunk/src/openimagelib/il/CMakeLists.txt (rev 0) +++ trunk/src/openimagelib/il/CMakeLists.txt 2008-03-18 18:52:01 UTC (rev 1366) @@ -0,0 +1,48 @@ +include_directories( ${OpenLibraries_SOURCE_DIR}/src ) +message( including: ${OpenLibraries_SOURCE_DIR}/src ) +set( NAME openimagelib_il ) + +if( WIN32 ) + add_definitions( -DIL_EXPORTS ) + add_definitions( -DOPENIMAGELIB_LIBNAME=\\\"${NAME}\\\" ) + add_definitions( -DOPENIMAGELIB_VERSION=\\\"${VERSION_STRING}\\\" ) + add_definitions( -DOPENIMAGELIB_BUILD ) + set( NAME "${NAME}${LIBRARY_IDENTIFIER}" ) +endif( WIN32 ) + +set( SOURCES + basic_image.hpp + compression_traits.hpp + config.hpp + float_traits.hpp + il.hpp + il.cpp + openimagelib_plugin.hpp + rgb_traits.hpp + traits.hpp + utility.cpp + utility.hpp + yuv_traits.hpp ) + +install( + FILES + basic_image.hpp + compression_traits.hpp + config.hpp + float_traits.hpp + il.hpp + openimagelib_plugin.hpp + rgb_traits.hpp + traits.hpp + utility.hpp + yuv_traits.hpp + DESTINATION "include/${PACKAGE}/openimagelib/il" ) + +add_library( ${NAME} SHARED ${SOURCES} ) +install( TARGETS ${NAME} + RUNTIME DESTINATION "lib/${PACKAGE}/openimagelib/lib" + ARCHIVE DESTINATION "lib/${PACKAGE}/openimagelib/lib" ) + +# required links +link_directories( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl ) +target_link_libraries( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}" ) Modified: trunk/src/openimagelib/il/config.hpp =================================================================== --- trunk/src/openimagelib/il/config.hpp 2008-03-18 08:50:40 UTC (rev 1365) +++ trunk/src/openimagelib/il/config.hpp 2008-03-18 18:52:01 UTC (rev 1366) @@ -50,11 +50,11 @@ # define OPENIMAGELIB_VERSION "0_5_0" #endif -// library search record (auto link). -#if defined( WIN32 ) && !defined( OPENIMAGELIB_BUILD ) -# if defined( OPENIMAGELIB_LIBNAME ) && defined( OPENIMAGELIB_TOOLSET ) && defined( OPENIMAGELIB_DEBUG_SUFFIX ) && defined( OPENIMAGELIB_VERSION ) -# pragma comment( lib, OPENIMAGELIB_LIBNAME "-" OPENIMAGELIB_TOOLSET "-" OPENIMAGELIB_DEBUG_SUFFIX "-" OPENIMAGELIB_VERSION ".lib" ) -# endif -#endif +// // library search record (auto link). +// #if defined( WIN32 ) && !defined( OPENIMAGELIB_BUILD ) +// # if defined( OPENIMAGELIB_LIBNAME ) && defined( OPENIMAGELIB_TOOLSET ) && defined( OPENIMAGELIB_DEBUG_SUFFIX ) && defined( OPENIMAGELIB_VERSION ) +// # pragma comment( lib, OPENIMAGELIB_LIBNAME "-" OPENIMAGELIB_TOOLSET "-" OPENIMAGELIB_DEBUG_SUFFIX "-" OPENIMAGELIB_VERSION ".lib" ) +// # endif +// #endif #endif Added: trunk/src/openimagelib/plugins/CMakeLists.txt =================================================================== --- trunk/src/openimagelib/plugins/CMakeLists.txt (rev 0) +++ trunk/src/openimagelib/plugins/CMakeLists.txt 2008-03-18 18:52:01 UTC (rev 1366) @@ -0,0 +1,19 @@ + +if( WIN32 ) + add_subdirectory( gdi+ ) +# add_subdirectory( quicktime ) +endif( WIN32 ) + +if( NOT WIN32 ) + add_subdirectory( bmp ) + add_subdirectory( jpg ) + add_subdirectory( png ) + add_subdirectory( dds ) + add_subdirectory( dpx ) + add_subdirectory( exr ) + add_subdirectory( hdr ) + add_subdirectory( psd ) + add_subdirectory( sgi ) + add_subdirectory( tga ) + add_subdirectory( tiff ) +endif( NOT WIN32 ) Added: trunk/src/openimagelib/plugins/gdi+/CMakeLists.txt =================================================================== --- trunk/src/openimagelib/plugins/gdi+/CMakeLists.txt (rev 0) +++ trunk/src/openimagelib/plugins/gdi+/CMakeLists.txt 2008-03-18 18:52:01 UTC (rev 1366) @@ -0,0 +1,28 @@ +include_directories( ${OpenLibraries_SOURCE_DIR}/src ) +message( including: ${OpenLibraries_SOURCE_DIR}/src ) +set( NAME openimagelib_gdi ) + +if( WIN32 ) + add_definitions( -DIL_EXPORTS ) + add_definitions( -DOPENIMAGELIB_LIBNAME=\\\"${NAME}\\\" ) + add_definitions( -DOPENIMAGELIB_VERSION=\\\"${VERSION_STRING}\\\" ) + add_definitions( -DOPENIMAGELIB_BUILD ) + set( NAME "${NAME}${LIBRARY_IDENTIFIER}" ) +endif( WIN32 ) + +set( SOURCES + gdi+_plugin.cpp ) + +install( + FILES + gdi_plugin.opl + DESTINATION "lib/${PACKAGE}/openimagelib/plugins" ) + +add_library( ${NAME} SHARED ${SOURCES} ) +install( TARGETS ${NAME} RUNTIME DESTINATION "lib/${PACKAGE}/openimagelib/plugins" ) + +# required links +link_directories( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl ${openimagelib_il_BINARY_DIR} ) +target_link_libraries( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}" ) +target_link_libraries( ${NAME} "openimagelib_il${LIBRARY_IDENTIFIER}" ) +target_link_libraries( ${NAME} gdiplus ) Added: trunk/src/openmedialib/CMakeLists.txt =================================================================== --- trunk/src/openmedialib/CMakeLists.txt (rev 0) +++ trunk/src/openmedialib/CMakeLists.txt 2008-03-18 18:52:01 UTC (rev 1366) @@ -0,0 +1,3 @@ +add_subdirectory( ml ) +add_subdirectory( plugins ) +#add_subdirectory( py ) Added: trunk/src/openmedialib/ml/CMakeLists.txt =================================================================== --- trunk/src/openmedialib/ml/CMakeLists.txt (rev 0) +++ trunk/src/openmedialib/ml/CMakeLists.txt 2008-03-18 18:52:01 UTC (rev 1366) @@ -0,0 +1,49 @@ + +include_directories( ${OpenLibraries_SOURCE_DIR}/src ) +message( including: ${OpenLibraries_SOURCE_DIR}/src ) +set( NAME openmedialib_ml ) + +if( WIN32 ) + add_definitions( -DML_EXPORTS ) + add_definitions( -DOPENMEDIALIB_LIBNAME=\\\"${NAME}\\\" ) + add_definitions( -DOPENMEDIALIB_VERSION=\\\"${VERSION_STRING}\\\" ) + add_definitions( -DOPENMEDIALIB_BUILD ) + set( NAME "${NAME}${LIBRARY_IDENTIFIER}" ) +endif( WIN32 ) + +set( SOURCES + audio.hpp + config.hpp + filter.hpp + frame.hpp + input.hpp + ml.cpp + ml.hpp + openmedialib_plugin.cpp + openmedialib_plugin.hpp + store.hpp + utilities.cpp + utilities.hpp ) + +install( + FILES + audio.hpp + config.hpp + filter.hpp + frame.hpp + input.hpp + ml.hpp + openmedialib_plugin.hpp + store.hpp + utilities.hpp + DESTINATION "include/${PACKAGE}/openmedialib/ml" ) + +add_library( ${NAME} SHARED ${SOURCES} ) +install( TARGETS ${NAME} + RUNTIME DESTINATION "lib/${PACKAGE}/openmedialib/lib" + ARCHIVE DESTINATION "lib/${PACKAGE}/openmedialib/lib" ) + +# required links +link_directories( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl ${OpenLibraries_BINARY_DIR}/src/openimagelib/il ) +target_link_libraries( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}" ) +target_link_libraries( ${NAME} "openimagelib_il${LIBRARY_IDENTIFIER}" ) Modified: trunk/src/openmedialib/ml/config.hpp =================================================================== --- trunk/src/openmedialib/ml/config.hpp 2008-03-18 08:50:40 UTC (rev 1365) +++ trunk/src/openmedialib/ml/config.hpp 2008-03-18 18:52:01 UTC (rev 1366) @@ -64,11 +64,11 @@ # define OPENMEDIALIB_VERSION "0_5_0" #endif -// library search record (auto link). -#if defined( WIN32 ) && !defined( OPENMEDIALIB_BUILD ) -# if defined( OPENMEDIALIB_LIBNAME ) && defined( OPENMEDIALIB_TOOLSET ) && defined( OPENMEDIALIB_DEBUG_SUFFIX ) && defined( OPENMEDIALIB_VERSION ) -# pragma comment( lib, OPENMEDIALIB_LIBNAME "-" OPENMEDIALIB_TOOLSET "-" OPENMEDIALIB_DEBUG_SUFFIX "-" OPENMEDIALIB_VERSION ".lib" ) -# endif -#endif +// // library search record (auto link). +// #if defined( WIN32 ) && !defined( OPENMEDIALIB_BUILD ) +// # if defined( OPENMEDIALIB_LIBNAME ) && defined( OPENMEDIALIB_TOOLSET ) && defined( OPENMEDIALIB_DEBUG_SUFFIX ) && defined( OPENMEDIALIB_VERSION ) +// # pragma comment( lib, OPENMEDIALIB_LIBNAME "-" OPENMEDIALIB_TOOLSET "-" OPENMEDIALIB_DEBUG_SUFFIX "-" OPENMEDIALIB_VERSION ".lib" ) +// # endif +// #endif #endif Added: trunk/src/openmedialib/plugins/gensys/CMakeLists.txt =================================================================== --- trunk/src/openmedialib/plugins/gensys/CMakeLists.txt (rev 0) +++ trunk/src/openmedialib/plugins/gensys/CMakeLists.txt 2008-03-18 18:52:01 UTC (rev 1366) @@ -0,0 +1,31 @@ + +include_directories( ${OpenLibraries_SOURCE_DIR}/src ) +message( including: ${OpenLibraries_SOURCE_DIR}/src ) +set( NAME openmedialib_gensys ) + +if( WIN32 ) + add_definitions( -DML_PLUGIN_EXPORTS ) + add_definitions( -DOPENIMAGELIB_LIBNAME=\\\"${NAME}\\\" ) + add_definitions( -DOPENIMAGELIB_VERSION=\\\"${VERSION_STRING}\\\" ) + add_definitions( -DOPENIMAGELIB_BUILD ) + set( NAME "${NAME}${LIBRARY_IDENTIFIER}" ) +endif( WIN32 ) + +set( SOURCES + gensys_plugin.cpp ) + +install( + FILES + gensys_plugin.opl + DESTINATION "lib/${PACKAGE}/openmedialib/plugins" ) + +add_library( ${NAME} SHARED ${SOURCES} ) +install( TARGETS ${NAME} RUNTIME DESTINATION "lib/${PACKAGE}/openmedialib/plugins" ) + +# required links +link_directories( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl + ${OpenLibraries_BINARY_DIR}/src/openimagelib/il + ${openmedialib_ml_BINARY_DIR} ) +target_link_libraries( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}" ) +target_link_libraries( ${NAME} "openimagelib_il${LIBRARY_IDENTIFIER}" ) +target_link_libraries( ${NAME} "openmedialib_ml${LIBRARY_IDENTIFIER}" ) Added: trunk/src/openmedialib/plugins/glew/CMakeLists.txt =================================================================== --- trunk/src/openmedialib/plugins/glew/CMakeLists.txt (rev 0) +++ trunk/src/openmedialib/plugins/glew/CMakeLists.txt 2008-03-18 18:52:01 UTC (rev 1366) @@ -0,0 +1,48 @@ + +include_directories( ${OpenLibraries_SOURCE_DIR}/src ) +set( NAME openmedialib_oil ) + +if( WIN32 ) + add_definitions( -DML_PLUGIN_EXPORTS ) + add_definitions( -DOPENIMAGELIB_LIBNAME=\\\"${NAME}\\\" ) + add_definitions( -DOPENIMAGELIB_VERSION=\\\"${VERSION_STRING}\\\" ) + add_definitions( -DOPENIMAGELIB_BUILD ) + set( NAME "${NAME}${LIBRARY_IDENTIFIER}" ) +endif( WIN32 ) + +set( SOURCES + glew_plugin.cpp ) + +install( + FILES + glew_plugin.opl + DESTINATION "lib/${PACKAGE}/openmedialib/plugins" ) + +add_library( ${NAME} SHARED ${SOURCES} ) +install( TARGETS ${NAME} RUNTIME DESTINATION "lib/${PACKAGE}/openmedialib/plugins" ) + +if( WIN32 ) + if( MSVC80 ) + set( COMPILER_PATH "C:/Program\ Files/Microsoft\ Visual\ Studio\ 8/VC" ) + endif( MSVC80 ) + if( MSVC71 ) + set( COMPILER_PATH "C:/Program\ Files/Microsoft\ Visual\ Studio\ .NET\ 2003/Vc7" ) + endif( MSVC71 ) + set( GLUT_ROOT_PATH "${COMPILER_PATH}/PlatformSDK" ) +endif( WIN32 ) + +find_package( GLUT ) +if( GLUT_FOUND ) + message( "found GLUT: ${GLUT_INCLUDE_DIR}" ) + include_directories( ${GLUT_INCLUDE_DIR} ) + target_link_libraries( ${NAME} ${GLUT_LIBRARY} ) +endif( GLUT_FOUND ) + +# required links +link_directories( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl + ${OpenLibraries_BINARY_DIR}/src/openimagelib/il + ${openmedialib_ml_BINARY_DIR} ) +target_link_libraries( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}" ) +target_link_libraries( ${NAME} "openimagelib_il${LIBRARY_IDENTIFIER}" ) +target_link_libraries( ${NAME} "openmedialib_ml${LIBRARY_IDENTIFIER}" ) +target_link_libraries( ${NAME} ${GLEW_LIBRARY} ) Added: trunk/src/openmedialib/plugins/oil/CMakeLists.txt =================================================================== --- trunk/src/openmedialib/plugins/oil/CMakeLists.txt (rev 0) +++ trunk/src/openmedialib/plugins/oil/CMakeLists.txt 2008-03-18 18:52:01 UTC (rev 1366) @@ -0,0 +1,31 @@ + +include_directories( ${OpenLibraries_SOURCE_DIR}/src ) +message( including: ${OpenLibraries_SOURCE_DIR}/src ) +set( NAME openmedialib_oil ) + +if( WIN32 ) + add_definitions( -DML_PLUGIN_EXPORTS ) + add_definitions( -DOPENIMAGELIB_LIBNAME=\\\"${NAME}\\\" ) + add_definitions( -DOPENIMAGELIB_VERSION=\\\"${VERSION_STRING}\\\" ) + add_definitions( -DOPENIMAGELIB_BUILD ) + set( NAME "${NAME}${LIBRARY_IDENTIFIER}" ) +endif( WIN32 ) + +set( SOURCES + oil_plugin.cpp ) + +install( + FILES + oil_plugin.opl + DESTINATION "lib/${PACKAGE}/openmedialib/plugins" ) + +add_library( ${NAME} SHARED ${SOURCES} ) +install( TARGETS ${NAME} RUNTIME DESTINATION "lib/${PACKAGE}/openmedialib/plugins" ) + +# required links +link_directories( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl + ${OpenLibraries_BINARY_DIR}/src/openimagelib/il + ${openmedialib_ml_BINARY_DIR} ) +target_link_libraries( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}" ) +target_link_libraries( ${NAME} "openimagelib_il${LIBRARY_IDENTIFIER}" ) +target_link_libraries( ${NAME} "openmedialib_ml${LIBRARY_IDENTIFIER}" ) Modified: trunk/src/openpluginlib/pl/CMakeLists.txt =================================================================== --- trunk/src/openpluginlib/pl/CMakeLists.txt 2008-03-18 08:50:40 UTC (rev 1365) +++ trunk/src/openpluginlib/pl/CMakeLists.txt 2008-03-18 18:52:01 UTC (rev 1366) @@ -109,4 +109,10 @@ DESTINATION "include/${PACKAGE}/openpluginlib/pl" ) add_library( ${NAME} SHARED ${SOURCES} ) -install( TARGETS ${NAME} LIBRARY DESTINATION "lib/${PACKAGE}/openpluginlib/lib" ) +install( TARGETS ${NAME} + RUNTIME DESTINATION "lib/${PACKAGE}/openpluginlib/lib" + ARCHIVE DESTINATION "lib/${PACKAGE}/openpluginlib/lib" ) + +if( GLEW_FOUND ) + target_link_libraries( ${NAME} ${GLEW_LIBRARY} ) +endif( GLEW_FOUND ) Modified: trunk/src/openpluginlib/pl/config.hpp =================================================================== --- trunk/src/openpluginlib/pl/config.hpp 2008-03-18 08:50:40 UTC (rev 1365) +++ trunk/src/openpluginlib/pl/config.hpp 2008-03-18 18:52:01 UTC (rev 1366) @@ -50,11 +50,11 @@ # define OPENPLUGINLIB_VERSION "0_5_0" #endif -// library search record (auto link). -#if defined( WIN32 ) && !defined( OPENPLUGINLIB_BUILD ) -# if defined( OPENPLUGINLIB_LIBNAME ) && defined( OPENPLUGINLIB_TOOLSET ) && defined( OPENPLUGINLIB_DEBUG_SUFFIX ) && defined( OPENPLUGINLIB_VERSION ) -# pragma comment( lib, OPENPLUGINLIB_LIBNAME "-" OPENPLUGINLIB_TOOLSET "-" OPENPLUGINLIB_DEBUG_SUFFIX "-" OPENPLUGINLIB_VERSION ".lib" ) -# endif -#endif +// // library search record (auto link). +// #if defined( WIN32 ) && !defined( OPENPLUGINLIB_BUILD ) +// # if defined( OPENPLUGINLIB_LIBNAME ) && defined( OPENPLUGINLIB_TOOLSET ) && defined( OPENPLUGINLIB_DEBUG_SUFFIX ) && defined( OPENPLUGINLIB_VERSION ) +// # pragma comment( lib, OPENPLUGINLIB_LIBNAME "-" OPENPLUGINLIB_TOOLSET "-" OPENPLUGINLIB_DEBUG_SUFFIX "-" OPENPLUGINLIB_VERSION ".lib" ) +// # endif +// #endif #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tim...@us...> - 2008-03-19 01:21:43
|
Revision: 1367 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1367&view=rev Author: timdewhirst Date: 2008-03-18 18:20:36 -0700 (Tue, 18 Mar 2008) Log Message: ----------- openlibraries - added CMakeFiles for OAL, OOL - now builds a minimal olibs on windows Modified Paths: -------------- trunk/CMakeLists.txt trunk/src/CMakeLists.txt trunk/src/openassetlib/al/config.hpp trunk/src/openimagelib/il/CMakeLists.txt trunk/src/openimagelib/plugins/gdi+/CMakeLists.txt trunk/src/openmedialib/ml/CMakeLists.txt trunk/src/openmedialib/plugins/gensys/CMakeLists.txt trunk/src/openmedialib/plugins/glew/CMakeLists.txt trunk/src/openmedialib/plugins/oil/CMakeLists.txt trunk/src/openobjectlib/sg/config.hpp trunk/src/openpluginlib/pl/CMakeLists.txt trunk/src/openpluginlib/pl/pl_vc8.vcproj Added Paths: ----------- trunk/src/openassetlib/CMakeLists.txt trunk/src/openassetlib/al/CMakeLists.txt trunk/src/openmedialib/plugins/CMakeLists.txt trunk/src/openmedialib/plugins/sdl/CMakeLists.txt trunk/src/openobjectlib/CMakeLists.txt trunk/src/openobjectlib/sg/CMakeLists.txt Modified: trunk/CMakeLists.txt =================================================================== --- trunk/CMakeLists.txt 2008-03-18 18:52:01 UTC (rev 1366) +++ trunk/CMakeLists.txt 2008-03-19 01:20:36 UTC (rev 1367) @@ -27,15 +27,9 @@ message( "found boost: ${Boost_INCLUDE_DIR}" ) include_directories( ${Boost_INCLUDE_DIR} ) link_directories( ${Boost_LIBRARY_DIRS} ) + add_definitions( -DHAVE_BOOST_FILESYSTEM ) endif ( Boost_FOUND ) -# SDL -find_package( SDL ) -if ( SDL_FOUND ) - message( "found SDL: ${SDL_INCLUDE_DIR}" ) - include_directories( ${SDL_INCLUDE_DIR} ) -endif ( SDL_FOUND ) - # libxml if ( NOT WIN32 ) find_package( LibXml2 ) @@ -45,6 +39,13 @@ endif( LIBXML2_FOUND ) endif( NOT WIN32 ) +# opengl +find_package( OpenGL ) +if( OPENGL_FOUND ) + message( "found OpenGL: ${OPENGL_INCLUDE_DIR}" ) + include_directories( ${OPENGL_INCLUDE_DIR} ) +endif( OPENGL_FOUND ) + # GLEW find_package( GLEW ) if ( GLEW_FOUND ) @@ -55,6 +56,7 @@ set ( SHARE_PATH ${CMAKE_INSTALL_PREFIX}/share/${PACKAGE} ) add_definitions( -DOPENOBJECTLIB_SHADERS="\\\"${SHARE_PATH}/shaders\\\"" ) add_definitions( -DOPENEFFECTSLIB_SHADERS="\\\"${SHARE_PATH}/shaders\\\"" ) + add_definitions( -DHAVE_GL_GLEW_H ) endif ( GLEW_FOUND ) # kill some warnings, add some windows specific defines Modified: trunk/src/CMakeLists.txt =================================================================== --- trunk/src/CMakeLists.txt 2008-03-18 18:52:01 UTC (rev 1366) +++ trunk/src/CMakeLists.txt 2008-03-19 01:20:36 UTC (rev 1367) @@ -1,6 +1,6 @@ add_subdirectory( openpluginlib ) add_subdirectory( openimagelib ) add_subdirectory( openmedialib ) -#add_subdirectory( openassetlib ) +add_subdirectory( openassetlib ) #add_subdirectory( openeffectslib ) -#add_subdirectory( openobjectlib ) +add_subdirectory( openobjectlib ) Added: trunk/src/openassetlib/CMakeLists.txt =================================================================== --- trunk/src/openassetlib/CMakeLists.txt (rev 0) +++ trunk/src/openassetlib/CMakeLists.txt 2008-03-19 01:20:36 UTC (rev 1367) @@ -0,0 +1,2 @@ +add_subdirectory( al ) +add_subdirectory( plugins ) Added: trunk/src/openassetlib/al/CMakeLists.txt =================================================================== --- trunk/src/openassetlib/al/CMakeLists.txt (rev 0) +++ trunk/src/openassetlib/al/CMakeLists.txt 2008-03-19 01:20:36 UTC (rev 1367) @@ -0,0 +1,50 @@ + +include_directories( ${OpenLibraries_SOURCE_DIR}/src ) +set( NAME openassetlib_al ) + +if( WIN32 ) + add_definitions( -DAL_EXPORTS ) + add_definitions( -DOPENASSETLIB_LIBNAME=\\\"${NAME}\\\" ) + add_definitions( -DOPENASSETLIB_VERSION=\\\"${VERSION_STRING}\\\" ) + add_definitions( -DOPENASSETLIB_BUILD ) + set( NAME "${NAME}${LIBRARY_IDENTIFIER}" ) +endif( WIN32 ) + +set( SOURCES + config.hpp + base64_codec.hpp + base64_codec.cpp + guid.hpp + guid.cpp + asset.hpp + asset.cpp + set.hpp + set.cpp + al.hpp + al.cpp + al_plugin.hpp + al_plugin.cpp ) + +install( + FILES + config.hpp + base64_codec.hpp + guid.hpp + asset.hpp + set.hpp + al.hpp + al_plugin.hpp + DESTINATION "include/${PACKAGE}/openassetlib/al" ) + +add_library( ${NAME} SHARED ${SOURCES} ) +install( TARGETS ${NAME} + RUNTIME DESTINATION "lib/${PACKAGE}/openassetlib/lib" + ARCHIVE DESTINATION "lib/${PACKAGE}/openassetlib/lib" ) + +# required links +link_directories( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl + ${OpenLibraries_BINARY_DIR}/src/openimagelib/il + ${OpenLibraries_BINARY_DIR}/src/openmedialib/ml ) +target_link_libraries( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}" ) +target_link_libraries( ${NAME} "openimagelib_il${LIBRARY_IDENTIFIER}" ) +target_link_libraries( ${NAME} "openmedialib_ml${LIBRARY_IDENTIFIER}" ) Modified: trunk/src/openassetlib/al/config.hpp =================================================================== --- trunk/src/openassetlib/al/config.hpp 2008-03-18 18:52:01 UTC (rev 1366) +++ trunk/src/openassetlib/al/config.hpp 2008-03-19 01:20:36 UTC (rev 1367) @@ -47,12 +47,12 @@ # define OPENASSETLIB_VERSION "0_5_0" #endif -// library search record (auto link). -#if defined( WIN32 ) && !defined( OPENASSETLIB_BUILD ) -# if defined( OPENASSETLIB_LIBNAME ) && defined( OPENASSETLIB_TOOLSET ) && defined( OPENASSETLIB_DEBUG_SUFFIX ) && defined( OPENASSETLIB_VERSION ) -# pragma comment( lib, OPENASSETLIB_LIBNAME "-" OPENASSETLIB_TOOLSET "-" OPENASSETLIB_DEBUG_SUFFIX "-" OPENASSETLIB_VERSION ".lib" ) -# endif -#endif +// // library search record (auto link). +// #if defined( WIN32 ) && !defined( OPENASSETLIB_BUILD ) +// # if defined( OPENASSETLIB_LIBNAME ) && defined( OPENASSETLIB_TOOLSET ) && defined( OPENASSETLIB_DEBUG_SUFFIX ) && defined( OPENASSETLIB_VERSION ) +// # pragma comment( lib, OPENASSETLIB_LIBNAME "-" OPENASSETLIB_TOOLSET "-" OPENASSETLIB_DEBUG_SUFFIX "-" OPENASSETLIB_VERSION ".lib" ) +// # endif +// #endif #endif Modified: trunk/src/openimagelib/il/CMakeLists.txt =================================================================== --- trunk/src/openimagelib/il/CMakeLists.txt 2008-03-18 18:52:01 UTC (rev 1366) +++ trunk/src/openimagelib/il/CMakeLists.txt 2008-03-19 01:20:36 UTC (rev 1367) @@ -1,5 +1,5 @@ + include_directories( ${OpenLibraries_SOURCE_DIR}/src ) -message( including: ${OpenLibraries_SOURCE_DIR}/src ) set( NAME openimagelib_il ) if( WIN32 ) Modified: trunk/src/openimagelib/plugins/gdi+/CMakeLists.txt =================================================================== --- trunk/src/openimagelib/plugins/gdi+/CMakeLists.txt 2008-03-18 18:52:01 UTC (rev 1366) +++ trunk/src/openimagelib/plugins/gdi+/CMakeLists.txt 2008-03-19 01:20:36 UTC (rev 1367) @@ -1,5 +1,5 @@ + include_directories( ${OpenLibraries_SOURCE_DIR}/src ) -message( including: ${OpenLibraries_SOURCE_DIR}/src ) set( NAME openimagelib_gdi ) if( WIN32 ) Modified: trunk/src/openmedialib/ml/CMakeLists.txt =================================================================== --- trunk/src/openmedialib/ml/CMakeLists.txt 2008-03-18 18:52:01 UTC (rev 1366) +++ trunk/src/openmedialib/ml/CMakeLists.txt 2008-03-19 01:20:36 UTC (rev 1367) @@ -1,6 +1,5 @@ include_directories( ${OpenLibraries_SOURCE_DIR}/src ) -message( including: ${OpenLibraries_SOURCE_DIR}/src ) set( NAME openmedialib_ml ) if( WIN32 ) Added: trunk/src/openmedialib/plugins/CMakeLists.txt =================================================================== --- trunk/src/openmedialib/plugins/CMakeLists.txt (rev 0) +++ trunk/src/openmedialib/plugins/CMakeLists.txt 2008-03-19 01:20:36 UTC (rev 1367) @@ -0,0 +1,12 @@ +add_subdirectory( oil ) +add_subdirectory( glew ) +add_subdirectory( avformat ) +add_subdirectory( gensys ) +add_subdirectory( ofx ) +add_subdirectory( openal ) +add_subdirectory( sdl ) + +if( WIN32 ) + add_subdirectory( directshow ) + add_subdirectory( quicktime ) +endif( WIN32 ) Modified: trunk/src/openmedialib/plugins/gensys/CMakeLists.txt =================================================================== --- trunk/src/openmedialib/plugins/gensys/CMakeLists.txt 2008-03-18 18:52:01 UTC (rev 1366) +++ trunk/src/openmedialib/plugins/gensys/CMakeLists.txt 2008-03-19 01:20:36 UTC (rev 1367) @@ -1,6 +1,5 @@ include_directories( ${OpenLibraries_SOURCE_DIR}/src ) -message( including: ${OpenLibraries_SOURCE_DIR}/src ) set( NAME openmedialib_gensys ) if( WIN32 ) Modified: trunk/src/openmedialib/plugins/glew/CMakeLists.txt =================================================================== --- trunk/src/openmedialib/plugins/glew/CMakeLists.txt 2008-03-18 18:52:01 UTC (rev 1366) +++ trunk/src/openmedialib/plugins/glew/CMakeLists.txt 2008-03-19 01:20:36 UTC (rev 1367) @@ -1,6 +1,6 @@ include_directories( ${OpenLibraries_SOURCE_DIR}/src ) -set( NAME openmedialib_oil ) +set( NAME openmedialib_glew ) if( WIN32 ) add_definitions( -DML_PLUGIN_EXPORTS ) @@ -46,3 +46,4 @@ target_link_libraries( ${NAME} "openimagelib_il${LIBRARY_IDENTIFIER}" ) target_link_libraries( ${NAME} "openmedialib_ml${LIBRARY_IDENTIFIER}" ) target_link_libraries( ${NAME} ${GLEW_LIBRARY} ) +target_link_libraries( ${NAME} ${GLUT_LIBRARY} ) Modified: trunk/src/openmedialib/plugins/oil/CMakeLists.txt =================================================================== --- trunk/src/openmedialib/plugins/oil/CMakeLists.txt 2008-03-18 18:52:01 UTC (rev 1366) +++ trunk/src/openmedialib/plugins/oil/CMakeLists.txt 2008-03-19 01:20:36 UTC (rev 1367) @@ -1,6 +1,5 @@ include_directories( ${OpenLibraries_SOURCE_DIR}/src ) -message( including: ${OpenLibraries_SOURCE_DIR}/src ) set( NAME openmedialib_oil ) if( WIN32 ) Added: trunk/src/openmedialib/plugins/sdl/CMakeLists.txt =================================================================== --- trunk/src/openmedialib/plugins/sdl/CMakeLists.txt (rev 0) +++ trunk/src/openmedialib/plugins/sdl/CMakeLists.txt 2008-03-19 01:20:36 UTC (rev 1367) @@ -0,0 +1,38 @@ + +include_directories( ${OpenLibraries_SOURCE_DIR}/src ) +set( NAME openmedialib_sdl ) + +if( WIN32 ) + add_definitions( -DML_PLUGIN_EXPORTS ) + add_definitions( -DOPENIMAGELIB_LIBNAME=\\\"${NAME}\\\" ) + add_definitions( -DOPENIMAGELIB_VERSION=\\\"${VERSION_STRING}\\\" ) + add_definitions( -DOPENIMAGELIB_BUILD ) + set( NAME "${NAME}${LIBRARY_IDENTIFIER}" ) +endif( WIN32 ) + +set( SOURCES + sdl_plugin.cpp ) + +install( + FILES + sdl_plugin.opl + DESTINATION "lib/${PACKAGE}/openmedialib/plugins" ) + +add_library( ${NAME} SHARED ${SOURCES} ) +install( TARGETS ${NAME} RUNTIME DESTINATION "lib/${PACKAGE}/openmedialib/plugins" ) + +# SDL +find_package( SDL ) +if ( SDL_FOUND ) + message( "found SDL: ${SDL_INCLUDE_DIR}" ) + include_directories( ${SDL_INCLUDE_DIR} ) +endif ( SDL_FOUND ) + +# required links +link_directories( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl + ${OpenLibraries_BINARY_DIR}/src/openimagelib/il + ${openmedialib_ml_BINARY_DIR} ) +target_link_libraries( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}" ) +target_link_libraries( ${NAME} "openimagelib_il${LIBRARY_IDENTIFIER}" ) +target_link_libraries( ${NAME} "openmedialib_ml${LIBRARY_IDENTIFIER}" ) +target_link_libraries( ${NAME} ${SDL_LIBRARY} ) Added: trunk/src/openobjectlib/CMakeLists.txt =================================================================== --- trunk/src/openobjectlib/CMakeLists.txt (rev 0) +++ trunk/src/openobjectlib/CMakeLists.txt 2008-03-19 01:20:36 UTC (rev 1367) @@ -0,0 +1,2 @@ +add_subdirectory( sg ) +add_subdirectory( plugins ) Added: trunk/src/openobjectlib/sg/CMakeLists.txt =================================================================== --- trunk/src/openobjectlib/sg/CMakeLists.txt (rev 0) +++ trunk/src/openobjectlib/sg/CMakeLists.txt 2008-03-19 01:20:36 UTC (rev 1367) @@ -0,0 +1,76 @@ + +include_directories( ${OpenLibraries_SOURCE_DIR}/src ) +set( NAME openobjectlib_sg ) + +if( WIN32 ) + add_definitions( -DSG_EXPORTS ) + add_definitions( -DOPENOBJECTLIB_LIBNAME=\\\"${NAME}\\\" ) + add_definitions( -DOPENOBJECTLIB_VERSION=\\\"${VERSION_STRING}\\\" ) + add_definitions( -DOPENOBJECTLIB_BUILD ) + set( NAME "${NAME}${LIBRARY_IDENTIFIER}" ) +endif( WIN32 ) + +add_definitions( -DHAVE_OPENIMAGELIB ) + +set( SOURCES + appearance.hpp + appearance.cpp + config.hpp + constant_time_dispatcher.hpp + core.hpp + hw_GL_renderer.hpp + hw_GL_renderer.cpp + lexical_cast.hpp + meshes.hpp + meshes.cpp + openobjectlib_plugin.hpp + openobjectlib_plugin.cpp + scene.hpp + scene.cpp + shaders.hpp + shaders.cpp + spatial.hpp + spatial.cpp + sg.hpp + sg.cpp + bbox_volume.hpp + bbox_volume.cpp + graph_updater.hpp + graph_updater.cpp + calculate_tangent_space.hpp + calculate_tangent_space.cpp + render_buffer.hpp + render_buffer.cpp + spirit.hpp ) + +install( + FILES + appearance.hpp + config.hpp + constant_time_dispatcher.hpp + core.hpp + hw_GL_renderer.hpp + lexical_cast.hpp + meshes.hpp + openobjectlib_plugin.hpp + scene.hpp + sg.hpp + shaders.hpp + spatial.hpp + bbox_volume.hpp + graph_updater.hpp + calculate_tangent_space.hpp + render_buffer.hpp + DESTINATION "include/${PACKAGE}/openobjectlib/sg" ) + +add_library( ${NAME} SHARED ${SOURCES} ) +install( TARGETS ${NAME} + RUNTIME DESTINATION "lib/${PACKAGE}/openobjectlib/lib" + ARCHIVE DESTINATION "lib/${PACKAGE}/openobjectlib/lib" ) + +# required links +link_directories( ${OpenLibraries_BINARY_DIR}/src/openpluginlib/pl + ${OpenLibraries_BINARY_DIR}/src/openimagelib/il ) +target_link_libraries( ${NAME} "openpluginlib_pl${LIBRARY_IDENTIFIER}" ) +target_link_libraries( ${NAME} "openimagelib_il${LIBRARY_IDENTIFIER}" ) +target_link_libraries( ${NAME} ${GLEW_LIBRARY} ) Modified: trunk/src/openobjectlib/sg/config.hpp =================================================================== --- trunk/src/openobjectlib/sg/config.hpp 2008-03-18 18:52:01 UTC (rev 1366) +++ trunk/src/openobjectlib/sg/config.hpp 2008-03-19 01:20:36 UTC (rev 1367) @@ -50,11 +50,11 @@ # define OPENOBJECTLIB_VERSION "0_5_0" #endif -// library search record (auto link). -#if defined( WIN32 ) && !defined( OPENOBJECTLIB_BUILD ) && !defined( OPENOBJECTLIB_PLUGIN ) -# if defined( OPENOBJECTLIB_SGLIBNAME ) && defined( OPENOBJECTLIB_TOOLSET ) && defined( OPENOBJECTLIB_DEBUG_SUFFIX ) && defined( OPENOBJECTLIB_VERSION ) -# pragma comment( lib, OPENOBJECTLIB_SGLIBNAME "-" OPENOBJECTLIB_TOOLSET "-" OPENOBJECTLIB_DEBUG_SUFFIX "-" OPENOBJECTLIB_VERSION ".lib" ) -# endif -#endif +// // library search record (auto link). +// #if defined( WIN32 ) && !defined( OPENOBJECTLIB_BUILD ) && !defined( OPENOBJECTLIB_PLUGIN ) +// # if defined( OPENOBJECTLIB_SGLIBNAME ) && defined( OPENOBJECTLIB_TOOLSET ) && defined( OPENOBJECTLIB_DEBUG_SUFFIX ) && defined( OPENOBJECTLIB_VERSION ) +// # pragma comment( lib, OPENOBJECTLIB_SGLIBNAME "-" OPENOBJECTLIB_TOOLSET "-" OPENOBJECTLIB_DEBUG_SUFFIX "-" OPENOBJECTLIB_VERSION ".lib" ) +// # endif +// #endif #endif Modified: trunk/src/openpluginlib/pl/CMakeLists.txt =================================================================== --- trunk/src/openpluginlib/pl/CMakeLists.txt 2008-03-18 18:52:01 UTC (rev 1366) +++ trunk/src/openpluginlib/pl/CMakeLists.txt 2008-03-19 01:20:36 UTC (rev 1367) @@ -1,5 +1,5 @@ + include_directories( ${OpenLibraries_SOURCE_DIR}/src ) -message( including: ${OpenLibraries_SOURCE_DIR}/src ) set( NAME openpluginlib_pl ) if( WIN32 ) @@ -97,6 +97,10 @@ GL_utility.hpp string.hpp stream.hpp + DESTINATION "include/${PACKAGE}/openpluginlib/pl" ) + +install( + FILES pcos/key.hpp pcos/observer.hpp pcos/iproperty_container.hpp @@ -106,7 +110,7 @@ pcos/visitor.hpp pcos/isubject.hpp pcos/iclonable.hpp - DESTINATION "include/${PACKAGE}/openpluginlib/pl" ) + DESTINATION "include/${PACKAGE}/openpluginlib/pl/pcos" ) add_library( ${NAME} SHARED ${SOURCES} ) install( TARGETS ${NAME} @@ -115,4 +119,5 @@ if( GLEW_FOUND ) target_link_libraries( ${NAME} ${GLEW_LIBRARY} ) + target_link_libraries( ${NAME} ${OPENGL_LIBRARIES} ) endif( GLEW_FOUND ) Modified: trunk/src/openpluginlib/pl/pl_vc8.vcproj =================================================================== --- trunk/src/openpluginlib/pl/pl_vc8.vcproj 2008-03-18 18:52:01 UTC (rev 1366) +++ trunk/src/openpluginlib/pl/pl_vc8.vcproj 2008-03-19 01:20:36 UTC (rev 1367) @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";"C:\Program Files\NVIDIA Corporation\Cg\include"" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OPENPLUGINLIB_EXPORTS;OPENPLUGINLIB_BUILD;HAVE_FLEX_STRING;HAVE_CG_RUNTIME;HAVE_BOOST_FILESYSTEM;HAVE_FAST_MATH" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OPENPLUGINLIB_EXPORTS;OPENPLUGINLIB_BUILD;HAVE_FLEX_STRING;HAVE_CG_RUNTIME__;HAVE_BOOST_FILESYSTEM;HAVE_FAST_MATH" MinimalRebuild="true" ExceptionHandling="2" BasicRuntimeChecks="3" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |