Thread: [Hdrflow-svn] SF.net SVN: hdrflow: [336] trunk (Page 2)
Status: Pre-Alpha
Brought to you by:
glslang
Menu
▾
▴
hdrflow-svn
|
From: <gl...@us...> - 2007-09-30 18:52:12
|
Revision: 336
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=336&view=rev
Author: glslang
Date: 2007-09-30 11:52:11 -0700 (Sun, 30 Sep 2007)
Log Message:
-----------
+ bump olibs to 0.5.0 (take three)
Modified Paths:
--------------
trunk/lib/openlibraries/src/openassetlib/al/config.hpp
trunk/lib/openlibraries/src/openimagelib/il/config.hpp
trunk/lib/openlibraries/src/openmedialib/ml/config.hpp
trunk/lib/openlibraries/src/openobjectlib/sg/config.hpp
trunk/lib/openlibraries/src/openpluginlib/pl/config.hpp
trunk/unity.sh
Modified: trunk/lib/openlibraries/src/openassetlib/al/config.hpp
===================================================================
--- trunk/lib/openlibraries/src/openassetlib/al/config.hpp 2007-09-30 18:41:58 UTC (rev 335)
+++ trunk/lib/openlibraries/src/openassetlib/al/config.hpp 2007-09-30 18:52:11 UTC (rev 336)
@@ -44,7 +44,7 @@
#endif
#ifndef OPENASSETLIB_VERSION
-# define OPENASSETLIB_VERSION "0_4_0"
+# define OPENASSETLIB_VERSION "0_5_0"
#endif
// library search record (auto link).
Modified: trunk/lib/openlibraries/src/openimagelib/il/config.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/config.hpp 2007-09-30 18:41:58 UTC (rev 335)
+++ trunk/lib/openlibraries/src/openimagelib/il/config.hpp 2007-09-30 18:52:11 UTC (rev 336)
@@ -47,7 +47,7 @@
#endif
#ifndef OPENIMAGELIB_VERSION
-# define OPENIMAGELIB_VERSION "0_4_0"
+# define OPENIMAGELIB_VERSION "0_5_0"
#endif
// library search record (auto link).
Modified: trunk/lib/openlibraries/src/openmedialib/ml/config.hpp
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/ml/config.hpp 2007-09-30 18:41:58 UTC (rev 335)
+++ trunk/lib/openlibraries/src/openmedialib/ml/config.hpp 2007-09-30 18:52:11 UTC (rev 336)
@@ -61,7 +61,7 @@
#endif
#ifndef OPENMEDIALIB_VERSION
-# define OPENMEDIALIB_VERSION "0_4_0"
+# define OPENMEDIALIB_VERSION "0_5_0"
#endif
// library search record (auto link).
Modified: trunk/lib/openlibraries/src/openobjectlib/sg/config.hpp
===================================================================
--- trunk/lib/openlibraries/src/openobjectlib/sg/config.hpp 2007-09-30 18:41:58 UTC (rev 335)
+++ trunk/lib/openlibraries/src/openobjectlib/sg/config.hpp 2007-09-30 18:52:11 UTC (rev 336)
@@ -47,7 +47,7 @@
#endif
#ifndef OPENOBJECTLIB_VERSION
-# define OPENOBJECTLIB_VERSION "0_4_0"
+# define OPENOBJECTLIB_VERSION "0_5_0"
#endif
// library search record (auto link).
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/config.hpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/config.hpp 2007-09-30 18:41:58 UTC (rev 335)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/config.hpp 2007-09-30 18:52:11 UTC (rev 336)
@@ -47,7 +47,7 @@
#endif
#ifndef OPENPLUGINLIB_VERSION
-# define OPENPLUGINLIB_VERSION "0_4_0"
+# define OPENPLUGINLIB_VERSION "0_5_0"
#endif
// library search record (auto link).
Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh 2007-09-30 18:41:58 UTC (rev 335)
+++ trunk/unity.sh 2007-09-30 18:52:11 UTC (rev 336)
@@ -102,6 +102,12 @@
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 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( )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-10-01 20:10:47
|
Revision: 343
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=343&view=rev
Author: glslang
Date: 2007-10-01 13:10:44 -0700 (Mon, 01 Oct 2007)
Log Message:
-----------
+ oops, missed opl files
Modified Paths:
--------------
trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite3_metadata_plugin.opl
trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.opl
trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.opl
trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.opl
trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.opl
trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.opl
trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.opl
trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi_plugin.opl
trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_plugin.opl
trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_plugin.opl
trunk/lib/openlibraries/src/openimagelib/plugins/png/png_plugin.opl
trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_plugin.opl
trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_plugin.opl
trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.opl
trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_plugin.opl
trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.opl
trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_plugin.opl
trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_plugin.opl
trunk/lib/openlibraries/src/openmedialib/plugins/glew/glew_plugin.opl
trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_plugin.opl
trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.opl
trunk/lib/openlibraries/src/openmedialib/plugins/openal/openal_plugin.opl
trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_plugin.opl
trunk/lib/openlibraries/src/openmedialib/plugins/template/template_plugin.opl
trunk/lib/openlibraries/src/openobjectlib/plugins/3ds/3ds_plugin.opl
trunk/lib/openlibraries/src/openobjectlib/plugins/X3D/x3d_plugin.opl
trunk/lib/openlibraries/src/openobjectlib/plugins/obj/obj_plugin.opl
trunk/unity.sh
Modified: trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite3_metadata_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite3_metadata_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite3_metadata_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<openlibraries version="1.0">
<openassetlib name="oal" version="0.2.0">
- <plugin name="OpenLibraries sqlite3 metadata plugin" type="input" extension='".*sqlite.*"' merit="80" filename='"libopenassetlib_sqlite3_plugin.so", "libopenassetlib_sqlite3_plugin.dylib", "openassetlib_sqlite-vc80-r-0_4_0.dll", "openassetlib_sqlite-vc80-d-0_4_0.dll"'/>
+ <plugin name="OpenLibraries sqlite3 metadata plugin" type="input" extension='".*sqlite.*"' merit="80" filename='"libopenassetlib_sqlite3_plugin.so", "libopenassetlib_sqlite3_plugin.dylib", "openassetlib_sqlite-vc80-r-0_5_0.dll", "openassetlib_sqlite-vc80-d-0_5_0.dll"'/>
</openassetlib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,6 +2,6 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openeffectslib name="oel" version="0.1.0">
- <plugin name="OpenLibraries tonemap plugin" type="filter" extension='"tm_linear", "tm_ilm_exr", "tm_ferwerda"' merit="0" filename='"libopeneffectslib_tonemap.so", "libopeneffectslib_tonemap.dylib", "openeffectslib_tonemap-vc80-d-0_4_0.dll", "openeffectslib_tonemap-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries tonemap plugin" type="filter" extension='"tm_linear", "tm_ilm_exr", "tm_ferwerda"' merit="0" filename='"libopeneffectslib_tonemap.so", "libopeneffectslib_tonemap.dylib", "openeffectslib_tonemap-vc80-d-0_5_0.dll", "openeffectslib_tonemap-vc80-r-0_5_0.dll"'/>
</openeffectslib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,6 +2,6 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openimagelib name="oil" version="0.2.0">
- <plugin name="OpenLibraries 3D lightmap plugin" type="input" extension='".*\.3D_lightmap"' merit="80" filename='"libopenimagelib_3D_lightmap.so", "libopenimagelib_3D_lightmap.dylib", "./plugins/openimagelib_3D_lightmap-vc80-d-0_4_0.dll" "./plugins/openimagelib_3D_lightmap-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries 3D lightmap plugin" type="input" extension='".*\.3D_lightmap"' merit="80" filename='"libopenimagelib_3D_lightmap.so", "libopenimagelib_3D_lightmap.dylib", "./plugins/openimagelib_3D_lightmap-vc80-d-0_5_0.dll" "./plugins/openimagelib_3D_lightmap-vc80-r-0_5_0.dll"'/>
</openimagelib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,6 +2,6 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openimagelib name="oil" version="0.2.0">
- <plugin name="OpenLibraries BMP plugin" type="input" in_filter="*.bmp" extension='".*\.bmp"' merit="80" filename='"libopenimagelib_bmp.so", "libopenimagelib_bmp.dylib", "openimagelib_bmp-vc80-d-0_4_0.dll" "openimagelib_bmp-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries BMP plugin" type="input" in_filter="*.bmp" extension='".*\.bmp"' merit="80" filename='"libopenimagelib_bmp.so", "libopenimagelib_bmp.dylib", "openimagelib_bmp-vc80-d-0_5_0.dll" "openimagelib_bmp-vc80-r-0_5_0.dll"'/>
</openimagelib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,6 +2,6 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openimagelib name="oil" version="0.2.0">
- <plugin name="OpenLibraries DDS plugin" type="input" in_filter="*.dds" extension='".*\.dds"' merit="80" filename='"libopenimagelib_dds.so", "libopenimagelib_dds.dylib", "openimagelib_dds-vc80-d-0_4_0.dll", "openimagelib_dds-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries DDS plugin" type="input" in_filter="*.dds" extension='".*\.dds"' merit="80" filename='"libopenimagelib_dds.so", "libopenimagelib_dds.dylib", "openimagelib_dds-vc80-d-0_5_0.dll", "openimagelib_dds-vc80-r-0_5_0.dll"'/>
</openimagelib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,7 +2,7 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openimagelib name="oil" version="0.2.0">
- <plugin name="OpenLibraries DPX plugin" type="input" in_filter="*.dpx" extension='".*\.dpx"' merit="80" filename='"libopenimagelib_dpx.so", "libopenimagelib_dpx.dylib", "openimagelib_dpx-vc80-d-0_4_0.dll", "openimagelib_dpx-vc80-r-0_4_0.dll"'/>
- <plugin name="OpenLibraries DPX plugin" type="output" in_filter="*.dpx" extension='".*\.dpx"' merit="80" filename='"libopenimagelib_dpx.so", "libopenimagelib_dpx.dylib", "openimagelib_dpx-vc80-d-0_4_0.dll", "openimagelib_dpx-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries DPX plugin" type="input" in_filter="*.dpx" extension='".*\.dpx"' merit="80" filename='"libopenimagelib_dpx.so", "libopenimagelib_dpx.dylib", "openimagelib_dpx-vc80-d-0_5_0.dll", "openimagelib_dpx-vc80-r-0_5_0.dll"'/>
+ <plugin name="OpenLibraries DPX plugin" type="output" in_filter="*.dpx" extension='".*\.dpx"' merit="80" filename='"libopenimagelib_dpx.so", "libopenimagelib_dpx.dylib", "openimagelib_dpx-vc80-d-0_5_0.dll", "openimagelib_dpx-vc80-r-0_5_0.dll"'/>
</openimagelib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,6 +2,6 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openimagelib name="oil" version="0.2.0">
- <plugin name="OpenLibraries EXR plugin" type="input" in_filter="*.exr" extension='".*\.exr"' merit="40" filename='"libopenimagelib_exr.so", "libopenimagelib_exr.dylib", "openimagelib_exr-vc80-d-0_4_0.dll", "openimagelib_exr-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries EXR plugin" type="input" in_filter="*.exr" extension='".*\.exr"' merit="40" filename='"libopenimagelib_exr.so", "libopenimagelib_exr.dylib", "openimagelib_exr-vc80-d-0_5_0.dll", "openimagelib_exr-vc80-r-0_5_0.dll"'/>
</openimagelib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,6 +2,6 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openimagelib name="oil" version="0.2.0">
- <plugin name="OpenLibraries GDI+ plugin" type="input" in_filter="*.bmp *.gif *.jpg *.jpeg *.png, *.tif *.tiff *.wmf *.emf *.ico" extension='".*\.bmp", ".*\.gif", ".*\.jpg", ".*\.jpeg", ".*\.png", ".*\.tif", ".*\.tiff", ".*\.wmf", ".*\.emf", ".*\.ico"' merit="40" filename='"openimagelib_gdi-vc80-d-0_4_0.dll", "openimagelib_gdi-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries GDI+ plugin" type="input" in_filter="*.bmp *.gif *.jpg *.jpeg *.png, *.tif *.tiff *.wmf *.emf *.ico" extension='".*\.bmp", ".*\.gif", ".*\.jpg", ".*\.jpeg", ".*\.png", ".*\.tif", ".*\.tiff", ".*\.wmf", ".*\.emf", ".*\.ico"' merit="40" filename='"openimagelib_gdi-vc80-d-0_5_0.dll", "openimagelib_gdi-vc80-r-0_5_0.dll"'/>
</openimagelib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,6 +2,6 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openimagelib name="oil" version="0.2.0">
- <plugin name="OpenLibraries HDR plugin" type="input" in_filter="*.hdr" extension='".*\.hdr"' merit="80" filename='"libopenimagelib_hdr.so", "libopenimagelib_hdr.dylib", "openimagelib_hdr-vc80-d-0_4_0.dll", "openimagelib_hdr-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries HDR plugin" type="input" in_filter="*.hdr" extension='".*\.hdr"' merit="80" filename='"libopenimagelib_hdr.so", "libopenimagelib_hdr.dylib", "openimagelib_hdr-vc80-d-0_5_0.dll", "openimagelib_hdr-vc80-r-0_5_0.dll"'/>
</openimagelib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,7 +2,7 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openimagelib name="oil" version="0.2.0">
- <plugin name="OpenLibraries JPG plugin" type="input" in_filter="*.jpg" extension='".*\.jpg"' merit="80" filename='"libopenimagelib_jpg.so", "libopenimagelib_jpg.dylib", "openimagelib_jpg-vc80-d-0_4_0.dll", "openimagelib_jpg-vc80-r-0_4_0.dll"'/>
- <plugin name="OpenLibraries JPG plugin" type="output" in_filter="*.jpg" extension='".*\.jpg"' merit="80" filename='"libopenimagelib_jpg.so", "libopenimagelib_jpg.dylib", "openimagelib_jpg-vc80-d-0_4_0.dll", "openimagelib_jpg-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries JPG plugin" type="input" in_filter="*.jpg" extension='".*\.jpg"' merit="80" filename='"libopenimagelib_jpg.so", "libopenimagelib_jpg.dylib", "openimagelib_jpg-vc80-d-0_5_0.dll", "openimagelib_jpg-vc80-r-0_5_0.dll"'/>
+ <plugin name="OpenLibraries JPG plugin" type="output" in_filter="*.jpg" extension='".*\.jpg"' merit="80" filename='"libopenimagelib_jpg.so", "libopenimagelib_jpg.dylib", "openimagelib_jpg-vc80-d-0_5_0.dll", "openimagelib_jpg-vc80-r-0_5_0.dll"'/>
</openimagelib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/png/png_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/png/png_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/png/png_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,7 +2,7 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openimagelib name="oil" version="0.2.0">
- <plugin name="OpenLibraries PNG plugin" type="input" extension='".*\.png"' merit="80" filename='"libopenimagelib_png.so", "libopenimagelib_png.dylib", "openimagelib_png-vc80-d-0_4_0.dll", "openimagelib_png-vc80-r-0_4_0.dll"'/>
- <plugin name="OpenLibraries PNG plugin" type="output" extension='".*\.png"' merit="80" filename='"libopenimagelib_png.so", "libopenimagelib_png.dylib", "openimagelib_png-vc80-d-0_4_0.dll", "openimagelib_png-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries PNG plugin" type="input" extension='".*\.png"' merit="80" filename='"libopenimagelib_png.so", "libopenimagelib_png.dylib", "openimagelib_png-vc80-d-0_5_0.dll", "openimagelib_png-vc80-r-0_5_0.dll"'/>
+ <plugin name="OpenLibraries PNG plugin" type="output" extension='".*\.png"' merit="80" filename='"libopenimagelib_png.so", "libopenimagelib_png.dylib", "openimagelib_png-vc80-d-0_5_0.dll", "openimagelib_png-vc80-r-0_5_0.dll"'/>
</openimagelib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,6 +2,6 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openimagelib name="oil" version="0.2.0">
- <plugin name="OpenLibraries PSD plugin" type="input" extension='".*\.psd"' merit="80" filename='"libopenimagelib_psd.so", "libopenimagelib_psd.dylib", "openimagelib_psd-vc80-d-0_4_0.dll" "openimagelib_psd-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries PSD plugin" type="input" extension='".*\.psd"' merit="80" filename='"libopenimagelib_psd.so", "libopenimagelib_psd.dylib", "openimagelib_psd-vc80-d-0_5_0.dll" "openimagelib_psd-vc80-r-0_5_0.dll"'/>
</openimagelib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,6 +2,6 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openimagelib name="oil" version="0.2.0">
- <plugin name="OpenLibraries QuickTime plugin" type="input" in_filter="*.sgi *.rgb *.rgba *.la *.bw *.pict *.text *.gif *.png *.pics *.tiff *.psd *.tif *.bmp *.jpg *.jif *.jpeg *.tga *.qtif *.jp2" extension='".*\.sgi", ".*\.rgb", ".*\.rgba", ".*\.la", ".*\.bw", ".*\.pict", ".*\.text", ".*\.gif", ".*\.png", ".*\.pics", ".*\.tiff", ".*\.psd", ".*\.tif", ".*\.bmp", ".*\.jpg", ".*\.jif", ".*\.jpeg", ".*\.tga", ".*\.qtif", ".*\.jp2"' merit="40" filename='"libopenimagelib_quicktime.so", "libopenimagelib_quicktime.dylib", "openimagelib_quicktime-vc80-d-0_4_0.dll", "openimagelib_quicktime-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries QuickTime plugin" type="input" in_filter="*.sgi *.rgb *.rgba *.la *.bw *.pict *.text *.gif *.png *.pics *.tiff *.psd *.tif *.bmp *.jpg *.jif *.jpeg *.tga *.qtif *.jp2" extension='".*\.sgi", ".*\.rgb", ".*\.rgba", ".*\.la", ".*\.bw", ".*\.pict", ".*\.text", ".*\.gif", ".*\.png", ".*\.pics", ".*\.tiff", ".*\.psd", ".*\.tif", ".*\.bmp", ".*\.jpg", ".*\.jif", ".*\.jpeg", ".*\.tga", ".*\.qtif", ".*\.jp2"' merit="40" filename='"libopenimagelib_quicktime.so", "libopenimagelib_quicktime.dylib", "openimagelib_quicktime-vc80-d-0_5_0.dll", "openimagelib_quicktime-vc80-r-0_5_0.dll"'/>
</openimagelib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,6 +2,6 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openimagelib name="oil" version="0.2.0">
- <plugin name="OpenLibraries SGI plugin" type="input" in_filter="*.sgi *.rgb *.rgba *.la *.bw" extension='".*\.sgi", ".*\.rgb", ".*\.rgba", ".*\.la", ".*\.bw"' merit="40" filename='"libopenimagelib_sgi.so", "libopenimagelib_sgi.dylib", "openimagelib_sgi-vc80-d-0_4_0.dll", "openimagelib_sgi-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries SGI plugin" type="input" in_filter="*.sgi *.rgb *.rgba *.la *.bw" extension='".*\.sgi", ".*\.rgb", ".*\.rgba", ".*\.la", ".*\.bw"' merit="40" filename='"libopenimagelib_sgi.so", "libopenimagelib_sgi.dylib", "openimagelib_sgi-vc80-d-0_5_0.dll", "openimagelib_sgi-vc80-r-0_5_0.dll"'/>
</openimagelib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,6 +2,6 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openimagelib name="oil" version="0.2.0">
- <plugin name="OpenLibraries TGA plugin" type="input" in_filter="*.tga" extension='".*\.tga"' merit="80" filename='"libopenimagelib_tga.so", "libopenimagelib_tga.dylib", "openimagelib_tga-vc80-d-0_4_0.dll", "openimagelib_tga-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries TGA plugin" type="input" in_filter="*.tga" extension='".*\.tga"' merit="80" filename='"libopenimagelib_tga.so", "libopenimagelib_tga.dylib", "openimagelib_tga-vc80-d-0_5_0.dll", "openimagelib_tga-vc80-r-0_5_0.dll"'/>
</openimagelib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,6 +2,6 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openimagelib name="oil" version="0.2.0">
- <plugin name="OpenLibraries TIFF plugin" type="input" in_filter="*.tiff *.tif" extension='".*\.tiff", ".*\.tif"' merit="30" filename='"libopenimagelib_tiff.so", "libopenimagelib_tiff.dylib", "openimagelib_tiff-vc80-d-0_4_0.dll", "openimagelib_tiff-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries TIFF plugin" type="input" in_filter="*.tiff *.tif" extension='".*\.tiff", ".*\.tif"' merit="30" filename='"libopenimagelib_tiff.so", "libopenimagelib_tiff.dylib", "openimagelib_tiff-vc80-d-0_5_0.dll", "openimagelib_tiff-vc80-r-0_5_0.dll"'/>
</openimagelib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -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_4_0.dll", "openmedialib_avformat-vc80-r-0_4_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_4_0.dll", "openmedialib_avformat-vc80-r-0_4_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_4_0.dll", "openmedialib_avformat-vc80-r-0_4_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"' 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="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>
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,7 +2,7 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openmedialib name="oml" version="0.1.0">
- <plugin name="OpenLibraries gensys plugin" type="input" extension='"colour:", "color:", "pusher:"' merit="0" filename='"libopenmedialib_gensys.so", "libopenmedialib_gensys.dylib", "openmedialib_gensys-vc80-d-0_4_0.dll", "openmedialib_gensys-vc80-r-0_4_0.dll"'/>
- <plugin name="OpenLibraries gensys plugin" type="filter" extension='"bezier", "chroma", "clip", "composite", "conform", "correction", "crop", "deinterlace", "lerp", "playlist", "temporal", "threader", "visualise", "frame_rate"' merit="0" filename='"libopenmedialib_gensys.so", "libopenmedialib_gensys.dylib", "openmedialib_gensys-vc80-d-0_4_0.dll", "openmedialib_gensys-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries gensys plugin" type="input" extension='"colour:", "color:", "pusher:"' merit="0" filename='"libopenmedialib_gensys.so", "libopenmedialib_gensys.dylib", "openmedialib_gensys-vc80-d-0_5_0.dll", "openmedialib_gensys-vc80-r-0_5_0.dll"'/>
+ <plugin name="OpenLibraries gensys plugin" type="filter" extension='"bezier", "chroma", "clip", "composite", "conform", "correction", "crop", "deinterlace", "lerp", "playlist", "temporal", "threader", "visualise", "frame_rate"' merit="0" filename='"libopenmedialib_gensys.so", "libopenmedialib_gensys.dylib", "openmedialib_gensys-vc80-d-0_5_0.dll", "openmedialib_gensys-vc80-r-0_5_0.dll"'/>
</openmedialib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/glew/glew_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/glew/glew_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/glew/glew_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,6 +2,6 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openmedialib name="oml" version="0.1.0">
- <plugin name="OpenLibraries glew plugin" type="output" extension='"glew:"' merit="0" filename='"libopenmedialib_glew.so", "libopenmedialib_glew.dylib", "openmedialib_glew-vc80-d-0_4_0.dll", "openmedialib_glew-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries glew plugin" type="output" extension='"glew:"' merit="0" filename='"libopenmedialib_glew.so", "libopenmedialib_glew.dylib", "openmedialib_glew-vc80-d-0_5_0.dll", "openmedialib_glew-vc80-r-0_5_0.dll"'/>
</openmedialib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,6 +2,6 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openmedialib name="oml" version="0.1.0">
- <plugin name="OpenLibraries ofx plugin" type="filter" extension='"ofx_.*"' merit="0" filename='"libopenmedialib_ofx.so", "libopenmedialib_ofx.dylib", "openmedialib_ofx-vc80-d-0_4_0.dll", "openmedialib_ofx-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries ofx plugin" type="filter" extension='"ofx_.*"' merit="0" filename='"libopenmedialib_ofx.so", "libopenmedialib_ofx.dylib", "openmedialib_ofx-vc80-d-0_5_0.dll", "openmedialib_ofx-vc80-r-0_5_0.dll"'/>
</openmedialib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,7 +2,7 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openmedialib name="oml" version="0.1.0">
- <plugin name="OpenLibraries oil plugin" type="input" extension='".*\.jpg/sequence:.*", ".*\.png/sequence:.*", ".*\.bmp/sequence:.*", ".*\.gif/sequence:.*", ".*\.tga/sequence:.*", ".*\.exr/sequence:.*", ".*\.sgi/sequence:.*", ".*\.rgb/sequence:.*", ".*\.rgba/sequence:.*", ".*\.la/sequence:.*", ".*\.bw/sequence:.*", ".*\.tif/sequence:.*", ".*\.tiff/sequence:.*", ".*\.dpx/sequence:.*", ".*\.hdr/sequence:.*"' merit="0" filename='"libopenmedialib_oil.so", "libopenmedialib_oil.dylib", "openmedialib_oil-vc80-d-0_4_0.dll", "openmedialib_oil-vc80-r-0_4_0.dll"'/>
- <plugin name="OpenLibraries oil plugin" type="output" extension='".*\.jpg/sequence:.*", ".*\.png/sequence:.*", ".*\.bmp/sequence:.*", ".*\.gif/sequence:.*", ".*\.tga/sequence:.*", ".*\.exr/sequence:.*", ".*\.sgi/sequence:.*", ".*\.rgb/sequence:.*", ".*\.rgba/sequence:.*", ".*\.la/sequence:.*", ".*\.bw/sequence:.*", ".*\.tif/sequence:.*", ".*\.tiff/sequence:.*", ".*\.dpx/sequence:.*"' merit="0" filename='"libopenmedialib_oil.so", "libopenmedialib_oil.dylib", "openmedialib_oil-vc80-d-0_4_0.dll", "openmedialib_oil-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries oil plugin" type="input" extension='".*\.jpg/sequence:.*", ".*\.png/sequence:.*", ".*\.bmp/sequence:.*", ".*\.gif/sequence:.*", ".*\.tga/sequence:.*", ".*\.exr/sequence:.*", ".*\.sgi/sequence:.*", ".*\.rgb/sequence:.*", ".*\.rgba/sequence:.*", ".*\.la/sequence:.*", ".*\.bw/sequence:.*", ".*\.tif/sequence:.*", ".*\.tiff/sequence:.*", ".*\.dpx/sequence:.*", ".*\.hdr/sequence:.*"' merit="0" filename='"libopenmedialib_oil.so", "libopenmedialib_oil.dylib", "openmedialib_oil-vc80-d-0_5_0.dll", "openmedialib_oil-vc80-r-0_5_0.dll"'/>
+ <plugin name="OpenLibraries oil plugin" type="output" extension='".*\.jpg/sequence:.*", ".*\.png/sequence:.*", ".*\.bmp/sequence:.*", ".*\.gif/sequence:.*", ".*\.tga/sequence:.*", ".*\.exr/sequence:.*", ".*\.sgi/sequence:.*", ".*\.rgb/sequence:.*", ".*\.rgba/sequence:.*", ".*\.la/sequence:.*", ".*\.bw/sequence:.*", ".*\.tif/sequence:.*", ".*\.tiff/sequence:.*", ".*\.dpx/sequence:.*"' merit="0" filename='"libopenmedialib_oil.so", "libopenmedialib_oil.dylib", "openmedialib_oil-vc80-d-0_5_0.dll", "openmedialib_oil-vc80-r-0_5_0.dll"'/>
</openmedialib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/openal/openal_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/openal/openal_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/openal/openal_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,6 +2,6 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openmedialib name="oml" version="0.1.0">
- <plugin name="OpenLibraries openal plugin" type="output" extension='"openal:"' merit="0" filename='"libopenmedialib_openal.so", "libopenmedialib_openal.dylib", "openmedialib_openal-vc80-d-0_4_0.dll", "openmedialib_openal-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries openal plugin" type="output" extension='"openal:"' merit="0" filename='"libopenmedialib_openal.so", "libopenmedialib_openal.dylib", "openmedialib_openal-vc80-d-0_5_0.dll", "openmedialib_openal-vc80-r-0_5_0.dll"'/>
</openmedialib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -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_4_0.dll", "openmedialib_quicktime-vc80-r-0_4_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_4_0.dll", "openmedialib_quicktime-vc80-r-0_4_0.dll"'/>
+ <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="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>
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/template/template_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/template/template_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/template/template_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,8 +2,8 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openmedialib name="oml" version="0.1.0">
- <plugin name="OpenLibraries template plugin" type="input" extension='"test:"' merit="0" filename='"libopenmedialib_template.so", "libopenmedialib_template.dylib", "openmedialib_template-vc80-d-0_4_0.dll", "openmedialib_template-vc80-r-0_4_0.dll"'/>
- <plugin name="OpenLibraries template plugin" type="output" extension='"ppm:"' merit="0" filename='"libopenmedialib_template.so", "libopenmedialib_template.dylib", "openmedialib_template-vc80-d-0_4_0.dll", "openmedialib_template-vc80-r-0_4_0.dll"'/>
- <plugin name="OpenLibraries template plugin" type="filter" extension='"greyscale"' merit="0" filename='"libopenmedialib_template.so", "libopenmedialib_template.dylib", "openmedialib_template-vc80-d-0_4_0.dll", "openmedialib_template-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries template plugin" type="input" extension='"test:"' merit="0" filename='"libopenmedialib_template.so", "libopenmedialib_template.dylib", "openmedialib_template-vc80-d-0_5_0.dll", "openmedialib_template-vc80-r-0_5_0.dll"'/>
+ <plugin name="OpenLibraries template plugin" type="output" extension='"ppm:"' merit="0" filename='"libopenmedialib_template.so", "libopenmedialib_template.dylib", "openmedialib_template-vc80-d-0_5_0.dll", "openmedialib_template-vc80-r-0_5_0.dll"'/>
+ <plugin name="OpenLibraries template plugin" type="filter" extension='"greyscale"' merit="0" filename='"libopenmedialib_template.so", "libopenmedialib_template.dylib", "openmedialib_template-vc80-d-0_5_0.dll", "openmedialib_template-vc80-r-0_5_0.dll"'/>
</openmedialib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openobjectlib/plugins/3ds/3ds_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openobjectlib/plugins/3ds/3ds_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openobjectlib/plugins/3ds/3ds_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,6 +2,6 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openobjectlib name="ool" version="0.2.0">
- <plugin name="OpenLibraries 3DS plugin" type="input" extension='".*\.3ds"' merit="80" filename='"libopenobjectlib_3ds.so", "libopenobjectlib_3ds.dylib", "openobjectlib_3ds-vc80-d-0_4_0.dll", "openobjectlib_3ds-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries 3DS plugin" type="input" extension='".*\.3ds"' merit="80" filename='"libopenobjectlib_3ds.so", "libopenobjectlib_3ds.dylib", "openobjectlib_3ds-vc80-d-0_5_0.dll", "openobjectlib_3ds-vc80-r-0_5_0.dll"'/>
</openobjectlib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openobjectlib/plugins/X3D/x3d_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openobjectlib/plugins/X3D/x3d_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openobjectlib/plugins/X3D/x3d_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,6 +2,6 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openobjectlib name="ool" version="0.2.0">
- <plugin name="OpenLibraries X3D plugin" type="input" extension='".*\.x3d"' merit="80" filename='"libopenobjectlib_x3d.so", "libopenobjectlib_x3d.dylib", "openobjectlib_x3d-vc80-d-0_4_0.dll", "openobjectlib_x3d-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries X3D plugin" type="input" extension='".*\.x3d"' merit="80" filename='"libopenobjectlib_x3d.so", "libopenobjectlib_x3d.dylib", "openobjectlib_x3d-vc80-d-0_5_0.dll", "openobjectlib_x3d-vc80-r-0_5_0.dll"'/>
</openobjectlib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openobjectlib/plugins/obj/obj_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openobjectlib/plugins/obj/obj_plugin.opl 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/lib/openlibraries/src/openobjectlib/plugins/obj/obj_plugin.opl 2007-10-01 20:10:44 UTC (rev 343)
@@ -2,6 +2,6 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openobjectlib name="ool" version="0.2.0">
- <plugin name="OpenLibraries OBJ plugin" type="input" extension='".*\.obj"' merit="80" filename='"libopenobjectlib_obj.so", "libopenobjectlib_obj.dylib", "openobjectlib_obj-vc80-d-0_4_0.dll", "openobjectlib_obj-vc80-r-0_4_0.dll"'/>
+ <plugin name="OpenLibraries OBJ plugin" type="input" extension='".*\.obj"' merit="80" filename='"libopenobjectlib_obj.so", "libopenobjectlib_obj.dylib", "openobjectlib_obj-vc80-d-0_5_0.dll", "openobjectlib_obj-vc80-r-0_5_0.dll"'/>
</openobjectlib>
</openlibraries>
Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh 2007-09-30 20:37:23 UTC (rev 342)
+++ trunk/unity.sh 2007-10-01 20:10:44 UTC (rev 343)
@@ -32,7 +32,7 @@
echo " -a ) build application"
echo " -s ) strip symbols"
echo " -m ) package maya plugins"
- echo " -d ) update OpenLibraries version (Win32 only)"
+ echo " -d ) update OpenLibraries version"
echo
echo " Examples:"
echo " sh ./unity.sh -fu - build OS/X umbrella framework"
@@ -102,6 +102,12 @@
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 &&
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-10-06 16:11:17
|
Revision: 347
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=347&view=rev
Author: glslang
Date: 2007-10-06 09:11:16 -0700 (Sat, 06 Oct 2007)
Log Message:
-----------
+build fixes
Modified Paths:
--------------
trunk/HDRFlowMaya.pmproj
trunk/unity.sh
Modified: trunk/HDRFlowMaya.pmproj
===================================================================
(Binary files differ)
Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh 2007-10-06 13:25:04 UTC (rev 346)
+++ trunk/unity.sh 2007-10-06 16:11:16 UTC (rev 347)
@@ -4,6 +4,7 @@
# Unification of build and distribution:
# recurses into lib and app directories, building each in turn.
# updates Boost version in VC project files.
+# updates version.
# builds OS/X frameworks
check_status( )
@@ -164,7 +165,7 @@
esac
done
- sed -e "s|$header_path|$2|g" -e "s|GL/glew.h|HDRFlowPlugin/glew.h|g" -e "s|boost/|HDRFlowPlugin/boost/|" current_header.$$ > $2.framework/Versions/Current/Headers/$i
+ #sed -e "s|$header_path|$2|g" -e "s|GL/glew.h|HDRFlowPlugin/glew.h|g" -e "s|boost/|HDRFlowPlugin/boost/|" current_header.$$ > $2.framework/Versions/Current/Headers/$i
rm current_header.$$
fi
@@ -448,7 +449,16 @@
done
done
done
- fi
+ fi
+
+ libs=`ls HDRFlow.framework/Versions/A/Frameworks/$1.framework/Versions/A/Libraries/*.dylib`
+ for i in $libs
+ do deps=`otool -L $i | grep $install_name_prefix/$1.framework | cut -d ' ' -f 1`
+ for k in $deps
+ do install_name_tool -change $k \
+ $install_name_prefix/HDRFlow.framework/Versions/A/Frameworks/$1.framework/Versions/A/Libraries/`basename $k` $i
+ done
+ done
}
make_umbrella_framework( )
@@ -533,10 +543,10 @@
done
# Copy Boost and GLEW headers
- cp -R /usr/local/include/boost-$boost_new_version/boost HDRFlow.framework/Versions/$framework_version/Frameworks/HDRFlowPlugin.framework/Headers
- cp -R /usr/local/include/GL/glew.h HDRFlow.framework/Versions/$framework_version/Frameworks/HDRFlowPlugin.framework/Headers
- header_prefix="HDRFlow.framework/Versions/$framework_version/Frameworks/HDRFlowPlugin.framework/Headers/boost"
- find $header_prefix -name '*.hpp' | xargs sed -e "s|boost/|HDRFlowPlugin/boost/|g" -i ''
+ #cp -R /usr/local/include/boost-$boost_new_version/boost HDRFlow.framework/Versions/$framework_version/Frameworks/HDRFlowPlugin.framework/Headers
+ #cp -R /usr/local/include/GL/glew.h HDRFlow.framework/Versions/$framework_version/Frameworks/HDRFlowPlugin.framework/Headers
+ #header_prefix="HDRFlow.framework/Versions/$framework_version/Frameworks/HDRFlowPlugin.framework/Headers/boost"
+ #find $header_prefix -name '*.hpp' | xargs sed -e "s|boost/|HDRFlowPlugin/boost/|g" -i ''
check_status $?
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-10-06 16:21:39
|
Revision: 348
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=348&view=rev
Author: glslang
Date: 2007-10-06 09:21:38 -0700 (Sat, 06 Oct 2007)
Log Message:
-----------
+build fixes
Modified Paths:
--------------
trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj
trunk/unity.sh
Modified: trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj
===================================================================
--- trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj 2007-10-06 16:11:16 UTC (rev 347)
+++ trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj 2007-10-06 16:21:38 UTC (rev 348)
@@ -404,6 +404,8 @@
HEADER_SEARCH_PATHS = (
"$(inherited)",
/usr/include/python2.3,
+ "/usr/local/include/boost-1_34_1",
+ /usr/local/include,
);
PREBINDING = NO;
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
@@ -422,6 +424,8 @@
HEADER_SEARCH_PATHS = (
"$(inherited)",
/usr/include/python2.3,
+ "/usr/local/include/boost-1_34_1",
+ /usr/local/include,
);
PREBINDING = NO;
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh 2007-10-06 16:11:16 UTC (rev 347)
+++ trunk/unity.sh 2007-10-06 16:21:38 UTC (rev 348)
@@ -165,7 +165,7 @@
esac
done
- #sed -e "s|$header_path|$2|g" -e "s|GL/glew.h|HDRFlowPlugin/glew.h|g" -e "s|boost/|HDRFlowPlugin/boost/|" current_header.$$ > $2.framework/Versions/Current/Headers/$i
+ sed -e "s|$header_path|$2|g" current_header.$$ > $2.framework/Versions/Current/Headers/$i
rm current_header.$$
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-10-12 20:53:26
|
Revision: 354
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=354&view=rev
Author: glslang
Date: 2007-10-12 13:53:22 -0700 (Fri, 12 Oct 2007)
Log Message:
-----------
+ maya bundle package maker
Modified Paths:
--------------
trunk/HDRFlowMaya.pmproj
trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.cpp
Added Paths:
-----------
trunk/HDRFlowMayaBundle.pmproj
Modified: trunk/HDRFlowMaya.pmproj
===================================================================
(Binary files differ)
Added: trunk/HDRFlowMayaBundle.pmproj
===================================================================
(Binary files differ)
Property changes on: trunk/HDRFlowMayaBundle.pmproj
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.cpp 2007-10-10 21:22:34 UTC (rev 353)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.cpp 2007-10-12 20:53:22 UTC (rev 354)
@@ -5,8 +5,9 @@
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
-#include <ImfRgbaFile.h>
-#include <ImfCRgbaFile.h>
+//#include <ImfRgbaFile.h>
+#include <ImfInputFile.h>
+//#include <ImfOutputFile.h>
#include <ImfArray.h>
#include <openimagelib/il/openimagelib_plugin.hpp>
@@ -22,9 +23,15 @@
{ delete im; }
il::image_type_ptr load_exr( const pl::string& uri )
- {
- Imf::RgbaInputFile file( uri.c_str( ) );
-
+ {printf("EXR IMAGE FILE %s\n", uri.c_str());
+ try
+ {
+ Imf::InputFile file( uri.c_str( ) );
+ }
+ catch( ... )
+ {
+ }
+/*
Imath::Box2i dw = file.header( ).dataWindow( );
int width = dw.max.x - dw.min.x + 1;
int height = dw.max.y - dw.min.y + 1;
@@ -52,7 +59,8 @@
texels += ( im->pitch( ) - im->linesize( ) ) * sizeof( float );
}
- return im;
+ return im;*/
+ return il::image_type_ptr( );
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-10-13 14:56:39
|
Revision: 356
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=356&view=rev
Author: glslang
Date: 2007-10-13 07:56:36 -0700 (Sat, 13 Oct 2007)
Log Message:
-----------
+ build fixes
Modified Paths:
--------------
trunk/HDRFlowFramework.pmproj
trunk/HDRFlowMayaBundle.pmproj
trunk/lib/extras/src/imf/mfn/mfn.cpp
trunk/unity.sh
Modified: trunk/HDRFlowFramework.pmproj
===================================================================
(Binary files differ)
Modified: trunk/HDRFlowMayaBundle.pmproj
===================================================================
(Binary files differ)
Modified: trunk/lib/extras/src/imf/mfn/mfn.cpp
===================================================================
--- trunk/lib/extras/src/imf/mfn/mfn.cpp 2007-10-12 20:56:05 UTC (rev 355)
+++ trunk/lib/extras/src/imf/mfn/mfn.cpp 2007-10-13 14:56:36 UTC (rev 356)
@@ -148,6 +148,8 @@
}
}
+ im = il::conform( im, il::flipped );
+
int width = im->width( );
int height = im->height( );
int pitch = im->pitch( );
Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh 2007-10-12 20:56:05 UTC (rev 355)
+++ trunk/unity.sh 2007-10-13 14:56:36 UTC (rev 356)
@@ -614,6 +614,10 @@
make_framework_libraries_unique "HDRFlowImage" &&
make_framework_libraries_unique "HDRFlowMedia"
check_status $?
+
+ if [ x"$USER" = x"root" ]
+ then chown -Rh root:admin HDRFlow.framework
+ fi
fi
if [ "$build_application" -eq 1 ]
@@ -624,7 +628,7 @@
fi
if [ "$build_installer" -eq 1 ]
- then echo " Building packages..."
+ then echo " Building packages..."
make_installer HDRFlowFramework
check_status $?
fi
@@ -642,6 +646,10 @@
install_name_tool -id HDRFlowMayaImageReaders.bundle HDRFlowMaya/HDRFlowMayaImageReaders.bundle &&
make_umbrella_framework_deps HDRFlowMaya/HDRFlowMayaImageReaders.bundle
+ if [ x"$USER" = x"root" ]
+ then chown -Rh root:admin HDRFlowMaya
+ fi
+
if [ "$build_installer" -eq 1 ]
then echo " Building packages..."
make_installer HDRFlowMaya
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2008-02-24 14:42:24
|
Revision: 426
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=426&view=rev
Author: glslang
Date: 2008-02-24 06:42:19 -0800 (Sun, 24 Feb 2008)
Log Message:
-----------
+ new win32 installers
Added Paths:
-----------
trunk/hdrflow_runtime.nsi
trunk/hdrflow_sdk.nsi
trunk/rez/
trunk/rez/add_to_path.nsh
trunk/rez/hdrflow.bmp
trunk/rez/openlibraries.spec
trunk/rez/write_env_str.nsh
Removed Paths:
-------------
trunk/lib/openlibraries/installer/
Added: trunk/hdrflow_runtime.nsi
===================================================================
--- trunk/hdrflow_runtime.nsi (rev 0)
+++ trunk/hdrflow_runtime.nsi 2008-02-24 14:42:19 UTC (rev 426)
@@ -0,0 +1,225 @@
+;--------------------------------
+;NSIS HDRFlow Installation Script
+;--------------------------------
+
+!ifndef VERSION
+ !define VERSION 0_5_0
+ !define VERSION_DOT 0.5.0
+!endif
+
+;--------------------------------
+;Configuration
+
+!ifdef OUTFILE
+ OutFile "${OUTFILE}"
+!else
+ OutFile hdrflow-${VERSION_DOT}-runtime.exe
+!endif
+
+SetCompressor /SOLID lzma
+
+InstType "Full"
+
+InstallDir $PROGRAMFILES\HDRFlow
+InstallDirRegKey HKLM Software\HDRFlow ""
+
+;--------------------------------
+;Header Files
+
+!define ALL_USERS
+
+!include "MUI.nsh"
+!include "Sections.nsh"
+!include "rez\add_to_path.nsh"
+!include "rez\write_env_str.nsh"
+
+;Names
+Name "HDRFlow"
+Caption "HDRFlow (v.${VERSION_DOT}) Setup"
+
+;Interface Settings
+!define MUI_ABORTWARNING
+
+!define MUI_HEADERIMAGE
+!define MUI_HEADERIMAGE_BITMAP "rez\hdrflow.bmp" ; optional
+!define MUI_WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\orange.bmp"
+
+!define MUI_COMPONENTSPAGE_SMALLDESC
+
+;Pages
+!define MUI_WELCOMEPAGE_TITLE "Welcome to the HDRFlow (v.${VERSION_DOT}) Setup Wizard"
+!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of HDRFlow.\r\n\r\n$_CLICK"
+
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_LICENSE "lib\openlibraries\COPYING"
+!insertmacro MUI_PAGE_COMPONENTS
+!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_INSTFILES
+
+!define MUI_FINISHPAGE_LINK "Visit the web site for the latest news, FAQs and support"
+!define MUI_FINISHPAGE_LINK_LOCATION "http://www.hdrflow.com/"
+
+!insertmacro MUI_PAGE_FINISH
+
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+
+;--------------------------------
+;Languages
+
+!insertmacro MUI_LANGUAGE "English"
+
+Section "HDRFlow" SecCore
+
+ SetDetailsPrint textonly
+ DetailPrint "Installing HDRFlow..."
+ SetDetailsPrint listonly
+
+ SectionIn 1 2 3 RO
+ SetOutPath $INSTDIR
+
+ SetOverwrite on
+
+ SetOutPath $INSTDIR\DLLs
+ File "lib\openlibraries\Multi-threaded Release DLL\*-vc80-r-${VERSION}.dll"
+ File "lib\openlibraries\Multi-threaded Release DLL\*.opl"
+
+ ; dependencies
+ File "C:\Program Files\FFmpeg\lib\avcodec-51.dll"
+ File "C:\Program Files\FFmpeg\lib\avformat-52.dll"
+ File "C:\Program Files\FFmpeg\lib\avutil-49.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:\Program Files\NVIDIA Corporation\Cg\bin\cg.dll"
+ File "C:\Program Files\NVIDIA Corporation\Cg\bin\cgGL.dll"
+ File "C:\zlib\lib\zlib1.dll"
+
+ ; Python
+ SetOutPath $INSTDIR\python
+ File "lib\openlibraries\Multi-threaded Release DLL\*.pyd"
+
+ SetOutPath $INSTDIR\shaders
+ File "lib\openlibraries\effects\shaders\sepia.cg"
+ File "lib\openlibraries\effects\shaders\sepia.frag"
+ File "lib\openlibraries\effects\shaders\fixed_function.vert"
+ File "lib\openlibraries\effects\shaders\passthrough.vert"
+ File "lib\openlibraries\effects\shaders\passthrough.cg"
+ File "lib\openlibraries\effects\shaders\rgb_to_yuv444.frag"
+ File "lib\openlibraries\effects\shaders\yuv444_to_rgb.frag"
+ File "lib\openlibraries\effects\shaders\yuv444_to_rgb.cg"
+ File "lib\openlibraries\effects\shaders\yuv444_to_rgb_deinterlace.cg"
+ File "lib\openlibraries\effects\shaders\yuv444_to_rgb_deinterlace.frag"
+ File "lib\openlibraries\effects\shaders\histogram.cg"
+ File "lib\openlibraries\effects\shaders\histogram.frag"
+ File "lib\openlibraries\effects\shaders\channel_selector.cg"
+ File "lib\openlibraries\effects\shaders\channel_selector.frag"
+
+ SetDetailsPrint both
+
+;--------------------------------
+;Path environment variable
+
+ Push "$INSTDIR\DLLs"
+ Call AddToPath
+
+;--------------------------------
+;Python environment variable
+ Push "PYTHONPATH"
+ Push "$INSTDIR\python"
+ Call WriteEnvStr
+
+;--------------------------------
+;Registry
+
+WriteRegStr HKLM "Software\HDRFlow" "CurrentVersion" "${VERSION_DOT}"
+WriteRegStr HKLM "Software\HDRFlow" "PluginsDirRelease" "$INSTDIR\DLLs"
+WriteRegStr HKLM "Software\HDRFlow" "KernelsDir" "$INSTDIR\kernels"
+WriteRegStr HKLM "Software\HDRFlow" "ShadersDir" "$INSTDIR\shaders"
+
+WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HDRFlow" "DisplayName" "HDRFlow"
+WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HDRFlow" "UninstallString" "$INSTDIR\uninst-hdrflow.exe"
+
+SectionEnd
+
+Section -post
+
+ WriteUninstaller $INSTDIR\uninst-hdrflow.exe
+
+SectionEnd
+
+;--------------------------------
+;Descriptions
+
+!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "HDRFlow development and runtime files"
+!insertmacro MUI_FUNCTION_DESCRIPTION_END
+
+;--------------------------------
+;Uninstaller Section
+
+Section Uninstall
+
+ SetDetailsPrint textonly
+ DetailPrint "Deleting Files..."
+ SetDetailsPrint listonly
+
+ DeleteRegKey HKLM "Software\HDRFlow"
+ DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HDRFlow"
+
+ Push "$INSTDIR\DLLs"
+ Call un.RemoveFromPath
+
+ Push "PYTHONPATH"
+ Call un.DeleteEnvStr
+
+ RMDir /r $INSTDIR\DLLs
+ RMDir /r $INSTDIR\include
+ RMDir /r $INSTDIR\lib
+ RMDir /r $INSTDIR\kernels
+ RMDir /r $INSTDIR\shaders
+ RMDir /r $INSTDIR
+
+ SetDetailsPrint both
+
+ SectionEnd
+
+ Function .onInit
+
+ ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HDRFlow" "UninstallString"
+ StrCmp $R0 "" done
+
+ MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
+ "HDRFlow is already installed. $\n$\nClick `OK` to remove the \
+ previous version or `Cancel` to cancel this upgrade." \
+ IDOK uninst
+ Abort
+
+;Run the uninstaller
+uninst:
+ ClearErrors
+ ; Copy the uninstaller to a temp location
+ ;GetTempFileName $0
+ ;CopyFiles $R0 $0
+ ;Start the uninstaller using the option to not copy itself
+ ExecWait '$R0 _?=$INSTDIR'
+
+ IfErrors no_remove_uninstaller
+ ; In most cases the uninstall is successful at this point.
+ ; You may also consider using a registry key to check whether
+ ; the user has chosen to uninstall. If you are using an uninstaller
+ ; components page, make sure all sections are uninstalled.
+ goto done
+ no_remove_uninstaller:
+ MessageBox MB_ICONEXCLAMATION \
+ "Unable to remove previous version of HDRFlow"
+ Abort
+
+done:
+ ; remove the copied uninstaller
+ ;Delete '$0'
+
+FunctionEnd
Added: trunk/hdrflow_sdk.nsi
===================================================================
--- trunk/hdrflow_sdk.nsi (rev 0)
+++ trunk/hdrflow_sdk.nsi 2008-02-24 14:42:19 UTC (rev 426)
@@ -0,0 +1,318 @@
+;--------------------------------
+;NSIS HDRFlow Installation Script
+;--------------------------------
+
+!ifndef VERSION
+ !define VERSION 0_5_0
+ !define VERSION_DOT 0.5.0
+!endif
+
+;--------------------------------
+;Configuration
+
+!ifdef OUTFILE
+ OutFile "${OUTFILE}"
+!else
+ OutFile hdrflow-${VERSION_DOT}-sdk.exe
+!endif
+
+SetCompressor /SOLID lzma
+
+InstType "Full"
+
+InstallDir $PROGRAMFILES\HDRFlow
+InstallDirRegKey HKLM Software\HDRFlow ""
+
+;--------------------------------
+;Header Files
+
+!define ALL_USERS
+
+!include "MUI.nsh"
+!include "Sections.nsh"
+!include "rez\add_to_path.nsh"
+!include "rez\write_env_str.nsh"
+
+;Names
+Name "HDRFlow"
+Caption "HDRFlow (v.${VERSION_DOT}) Setup"
+
+;Interface Settings
+!define MUI_ABORTWARNING
+
+!define MUI_HEADERIMAGE
+!define MUI_HEADERIMAGE_BITMAP "rez\hdrflow.bmp" ; optional
+!define MUI_WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\orange.bmp"
+
+!define MUI_COMPONENTSPAGE_SMALLDESC
+
+;Pages
+!define MUI_WELCOMEPAGE_TITLE "Welcome to HDRFlow SDK (v.${VERSION_DOT}) Setup Wizard"
+!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of HDRFlow SDK.\r\n\r\n$_CLICK"
+
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_LICENSE "lib\openlibraries\COPYING"
+!insertmacro MUI_PAGE_COMPONENTS
+!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_INSTFILES
+
+!define MUI_FINISHPAGE_LINK "Visit the web site for the latest news, FAQs and support"
+!define MUI_FINISHPAGE_LINK_LOCATION "http://www.hdrflow.com/"
+
+!insertmacro MUI_PAGE_FINISH
+
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+
+;--------------------------------
+;Languages
+
+!insertmacro MUI_LANGUAGE "English"
+
+Section "HDRFlow" SecCore
+
+ SetDetailsPrint textonly
+ DetailPrint "Installing HDRFlow SDK..."
+ SetDetailsPrint listonly
+
+ SectionIn 1 2 3 RO
+ SetOutPath $INSTDIR
+
+ SetOverwrite on
+
+ SetOutPath $INSTDIR\include\hdrflow-${VERSION_DOT}\openpluginlib\pl
+ File lib\openlibraries\src\openpluginlib\pl\allocatorstringstorage.h
+ File lib\openlibraries\src\openpluginlib\pl\bind_info.hpp
+ File lib\openlibraries\src\openpluginlib\pl\cg.hpp
+ File lib\openlibraries\src\openpluginlib\pl\config.hpp
+ File lib\openlibraries\src\openpluginlib\pl\content_handler_libxml.hpp
+ File lib\openlibraries\src\openpluginlib\pl\content_handler_msxml.hpp
+ File lib\openlibraries\src\openpluginlib\pl\cowstringopt.h
+ File lib\openlibraries\src\openpluginlib\pl\discovery_traits.hpp
+ File lib\openlibraries\src\openpluginlib\pl\flex_string.h
+ File lib\openlibraries\src\openpluginlib\pl\flex_string_details.h
+ File lib\openlibraries\src\openpluginlib\pl\flex_string_shell.h
+ File lib\openlibraries\src\openpluginlib\pl\geometry.hpp
+ File lib\openlibraries\src\openpluginlib\pl\GL_utility.hpp
+ File lib\openlibraries\src\openpluginlib\pl\openplugin.hpp
+ File lib\openlibraries\src\openpluginlib\pl\openpluginlib.hpp
+ File lib\openlibraries\src\openpluginlib\pl\pool.hpp
+ File lib\openlibraries\src\openpluginlib\pl\property.hpp
+ File lib\openlibraries\src\openpluginlib\pl\registry.hpp
+ File lib\openlibraries\src\openpluginlib\pl\shader_manager.hpp
+ File lib\openlibraries\src\openpluginlib\pl\simplestringstorage.h
+ File lib\openlibraries\src\openpluginlib\pl\smallstringopt.h
+ File lib\openlibraries\src\openpluginlib\pl\stream.hpp
+ File lib\openlibraries\src\openpluginlib\pl\string.hpp
+ File lib\openlibraries\src\openpluginlib\pl\timer.hpp
+ File lib\openlibraries\src\openpluginlib\pl\utf8_utils.hpp
+ File lib\openlibraries\src\openpluginlib\pl\vectorstringstorage.h
+
+ SetOutPath $INSTDIR\include\hdrflow-${VERSION_DOT}\openpluginlib\pl\pcos
+ File lib\openlibraries\src\openpluginlib\pl\pcos\iproperty_container.hpp
+ File lib\openlibraries\src\openpluginlib\pl\pcos\isubject.hpp
+ File lib\openlibraries\src\openpluginlib\pl\pcos\iclonable.hpp
+ File lib\openlibraries\src\openpluginlib\pl\pcos\key.hpp
+ File lib\openlibraries\src\openpluginlib\pl\pcos\observer.hpp
+ File lib\openlibraries\src\openpluginlib\pl\pcos\property.hpp
+ File lib\openlibraries\src\openpluginlib\pl\pcos\property_container.hpp
+ File lib\openlibraries\src\openpluginlib\pl\pcos\subject.hpp
+ File lib\openlibraries\src\openpluginlib\pl\pcos\visitor.hpp
+
+ SetOutPath $INSTDIR\include\hdrflow-${VERSION_DOT}\openimagelib\il
+ File lib\openlibraries\src\openimagelib\il\basic_image.hpp
+ File lib\openlibraries\src\openimagelib\il\compression_traits.hpp
+ File lib\openlibraries\src\openimagelib\il\config.hpp
+ File lib\openlibraries\src\openimagelib\il\float_traits.hpp
+ File lib\openlibraries\src\openimagelib\il\il.hpp
+ File lib\openlibraries\src\openimagelib\il\openimagelib_plugin.hpp
+ File lib\openlibraries\src\openimagelib\il\rgb_traits.hpp
+ File lib\openlibraries\src\openimagelib\il\traits.hpp
+ File lib\openlibraries\src\openimagelib\il\utility.hpp
+ File lib\openlibraries\src\openimagelib\il\yuv_traits.hpp
+ File lib\openlibraries\src\openimagelib\il\lut_functions.hpp
+
+ SetOutPath $INSTDIR\include\hdrflow-${VERSION_DOT}\openmedialib\ml
+ File lib\openlibraries\src\openmedialib\ml\audio.hpp
+ File lib\openlibraries\src\openmedialib\ml\config.hpp
+ File lib\openlibraries\src\openmedialib\ml\filter.hpp
+ File lib\openlibraries\src\openmedialib\ml\frame.hpp
+ File lib\openlibraries\src\openmedialib\ml\input.hpp
+ File lib\openlibraries\src\openmedialib\ml\ml.hpp
+ File lib\openlibraries\src\openmedialib\ml\openmedialib_plugin.hpp
+ File lib\openlibraries\src\openmedialib\ml\store.hpp
+ File lib\openlibraries\src\openmedialib\ml\utilities.hpp
+
+ SetOutPath $INSTDIR\DLLs
+ File "lib\openlibraries\Multi-threaded Debug DLL\*-vc80-d-${VERSION}.dll"
+ File "lib\openlibraries\Multi-threaded Debug DLL\*.opl"
+ File "lib\openlibraries\Multi-threaded Release DLL\*-vc80-r-${VERSION}.dll"
+
+ ; dependencies
+ File "C:\Program Files\FFmpeg\lib\avcodec-51.dll"
+ File "C:\Program Files\FFmpeg\lib\avformat-52.dll"
+ File "C:\Program Files\FFmpeg\lib\avutil-49.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:\Program Files\NVIDIA Corporation\Cg\bin\cg.dll"
+ File "C:\Program Files\NVIDIA Corporation\Cg\bin\cgGL.dll"
+ File "C:\zlib\lib\zlib1.dll"
+
+ ; Python
+ SetOutPath $INSTDIR\python
+ File "lib\openlibraries\Multi-threaded Debug DLL\HDRFlowPlugin.pyd"
+ File "lib\openlibraries\Multi-threaded Debug DLL\HDRFlowImage.pyd"
+ File "lib\openlibraries\Multi-threaded Debug DLL\HDRFlowMedia.pyd"
+
+ SetOutPath $INSTDIR\lib
+ File "lib\openlibraries\Multi-threaded Debug DLL\*_pl-vc80-d-${VERSION}.lib"
+ File "lib\openlibraries\Multi-threaded Debug DLL\*_il-vc80-d-${VERSION}.lib"
+ File "lib\openlibraries\Multi-threaded Debug DLL\*_ml-vc80-d-${VERSION}.lib"
+ File "lib\openlibraries\Multi-threaded Release DLL\*_pl-vc80-r-${VERSION}.lib"
+ File "lib\openlibraries\Multi-threaded Release DLL\*_il-vc80-r-${VERSION}.lib"
+ File "lib\openlibraries\Multi-threaded Release DLL\*_ml-vc80-r-${VERSION}.lib"
+
+ SetOutPath $INSTDIR\shaders
+ File "lib\openlibraries\effects\shaders\sepia.cg"
+ File "lib\openlibraries\effects\shaders\sepia.frag"
+ File "lib\openlibraries\effects\shaders\fixed_function.vert"
+ File "lib\openlibraries\effects\shaders\passthrough.vert"
+ File "lib\openlibraries\effects\shaders\passthrough.cg"
+ File "lib\openlibraries\effects\shaders\rgb_to_yuv444.frag"
+ File "lib\openlibraries\effects\shaders\yuv444_to_rgb.frag"
+ File "lib\openlibraries\effects\shaders\yuv444_to_rgb.cg"
+ File "lib\openlibraries\effects\shaders\yuv444_to_rgb_deinterlace.cg"
+ File "lib\openlibraries\effects\shaders\yuv444_to_rgb_deinterlace.frag"
+ File "lib\openlibraries\effects\shaders\histogram.cg"
+ File "lib\openlibraries\effects\shaders\histogram.frag"
+ File "lib\openlibraries\effects\shaders\channel_selector.cg"
+ File "lib\openlibraries\effects\shaders\channel_selector.frag"
+
+ SetDetailsPrint both
+
+;--------------------------------
+;Path environment variable
+
+ Push "$INSTDIR\DLLs"
+ Call AddToPath
+
+;--------------------------------
+;Include environment variable
+ Push "HDRFLOW_INCLUDE_PATH"
+ Push "$INSTDIR\include\hdrflow-${VERSION_DOT}"
+ Call WriteEnvStr
+
+;--------------------------------
+;Lib environment variable
+ Push "HDRFLOW_LIB_PATH"
+ Push "$INSTDIR\lib"
+ Call WriteEnvStr
+
+;--------------------------------
+;Python environment variable
+ Push "PYTHONPATH"
+ Push "$INSTDIR\python"
+ Call WriteEnvStr
+
+;--------------------------------
+;Registry
+
+WriteRegStr HKLM "Software\HDRFlow" "CurrentVersion" "${VERSION_DOT}"
+WriteRegStr HKLM "Software\HDRFlow" "PluginsDirDebug" "$INSTDIR\DLLs"
+WriteRegStr HKLM "Software\HDRFlow" "PluginsDirRelease" "$INSTDIR\DLLs"
+WriteRegStr HKLM "Software\HDRFlow" "KernelsDir" "$INSTDIR\kernels"
+WriteRegStr HKLM "Software\HDRFlow" "ShadersDir" "$INSTDIR\shaders"
+
+WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HDRFlow" "DisplayName" "HDRFlow"
+WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HDRFlow" "UninstallString" "$INSTDIR\uninst-hdrflow.exe"
+
+SectionEnd
+
+Section -post
+
+ WriteUninstaller $INSTDIR\uninst-hdrflow.exe
+
+SectionEnd
+
+;--------------------------------
+;Descriptions
+
+!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "HDRFlow development and runtime files"
+!insertmacro MUI_FUNCTION_DESCRIPTION_END
+
+;--------------------------------
+;Uninstaller Section
+
+Section Uninstall
+
+ SetDetailsPrint textonly
+ DetailPrint "Deleting Files..."
+ SetDetailsPrint listonly
+
+ DeleteRegKey HKLM "Software\HDRFlow"
+ DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HDRFlow"
+
+ Push "$INSTDIR\DLLs"
+ Call un.RemoveFromPath
+
+ Push "HDRFLOW_LIB_PATH"
+ Call un.DeleteEnvStr
+
+ Push "HDRFLOW_INCLUDE_PATH"
+ Call un.DeleteEnvStr
+
+ Push "PYTHONPATH"
+ Call un.DeleteEnvStr
+
+ RMDir /r $INSTDIR\DLLs
+ RMDir /r $INSTDIR\include
+ RMDir /r $INSTDIR\lib
+ RMDir /r $INSTDIR\plugins
+ RMDir /r $INSTDIR\kernels
+ RMDir /r $INSTDIR\shaders
+ RMDir /r $INSTDIR
+
+ SetDetailsPrint both
+
+ SectionEnd
+
+ Function .onInit
+
+ ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HDRFlow" "UninstallString"
+ StrCmp $R0 "" done
+
+ MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
+ "HDRFlow is already installed. $\n$\nClick `OK` to remove the \
+ previous version or `Cancel` to cancel this upgrade." \
+ IDOK uninst
+ Abort
+
+;Run the uninstaller
+uninst:
+ ClearErrors
+ ; Copy the uninstaller to a temp location
+ ;GetTempFileName $0
+ ;CopyFiles $R0 $0
+ ;Start the uninstaller using the option to not copy itself
+ ExecWait '$R0 _?=$INSTDIR'
+
+ IfErrors no_remove_uninstaller
+ ; In most cases the uninstall is successful at this point.
+ ; You may also consider using a registry key to check whether
+ ; the user has chosen to uninstall. If you are using an uninstaller
+ ; components page, make sure all sections are uninstalled.
+ goto done
+ no_remove_uninstaller:
+ MessageBox MB_ICONEXCLAMATION "Unable to remove previous version of HDRFlow"
+ Abort
+
+done:
+ ; remove the copied uninstaller
+ ;Delete '$0'
+
+FunctionEnd
Added: trunk/rez/add_to_path.nsh
===================================================================
--- trunk/rez/add_to_path.nsh (rev 0)
+++ trunk/rez/add_to_path.nsh 2008-02-24 14:42:19 UTC (rev 426)
@@ -0,0 +1,419 @@
+;----------------------------------------
+; from nsis.sourceforge.net
+
+!ifndef _AddToPath_nsh
+!define _AddToPath_nsh
+
+!verbose 3
+!include "WinMessages.NSH"
+!verbose 4
+
+!ifndef WriteEnvStr_RegKey
+ !ifdef ALL_USERS
+ !define WriteEnvStr_RegKey \
+ 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
+ !else
+ !define WriteEnvStr_RegKey 'HKCU "Environment"'
+ !endif
+!endif
+
+; AddToPath - Adds the given dir to the search path.
+; Input - head of the stack
+; Note - Win9x systems requires reboot
+
+Function AddToPath
+ Exch $0
+ Push $1
+ Push $2
+ Push $3
+
+ # don't add if the path doesn't exist
+ IfFileExists "$0\*.*" "" AddToPath_done
+ ReadEnvStr $1 PATH
+ Push "$1;"
+ Push "$0;"
+ Call StrStr
+ Pop $2
+ ;StrCmp $2 "" "" AddToPath_done
+ Push "$1;"
+ Push "$0\;"
+ Call StrStr
+ Pop $2
+ ;StrCmp $2 "" "" AddToPath_done
+ GetFullPathName /SHORT $3 $0
+ Push "$1;"
+ Push "$3;"
+ Call StrStr
+ Pop $2
+ ;StrCmp $2 "" "" AddToPath_done
+ Push "$1;"
+ Push "$3\;"
+ Call StrStr
+ Pop $2
+ ;StrCmp $2 "" "" AddToPath_done
+
+ Call IsNT
+ Pop $1
+ StrCmp $1 1 AddToPath_NT
+ ; Not on NT
+ StrCpy $1 $WINDIR 2
+ FileOpen $1 "$1\autoexec.bat" a
+ FileSeek $1 -1 END
+ FileReadByte $1 $2
+ IntCmp $2 26 0 +2 +2 # DOS EOF
+ FileSeek $1 -1 END # write over EOF
+ FileWrite $1 "$\r$\nSET PATH=%PATH%;$3$\r$\n"
+ FileClose $1
+ SetRebootFlag true
+ Goto AddToPath_done
+
+ AddToPath_NT:
+ ReadRegStr $1 ${WriteEnvStr_RegKey} "PATH"
+ StrCpy $2 $1 1 -1 # copy last char
+ StrCmp $2 ";" 0 +2 # if last char == ;
+ StrCpy $1 $1 -1 # remove last char
+ StrCmp $1 "" AddToPath_NTdoIt
+ StrCpy $0 "$1;$0"
+ AddToPath_NTdoIt:
+ WriteRegExpandStr ${WriteEnvStr_RegKey} "PATH" $0
+ SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
+
+ AddToPath_done:
+ Pop $3
+ Pop $2
+ Pop $1
+ Pop $0
+FunctionEnd
+
+; RemoveFromPath - Remove a given dir from the path
+; Input: head of the stack
+
+Function un.RemoveFromPath
+ Exch $0
+ Push $1
+ Push $2
+ Push $3
+ Push $4
+ Push $5
+ Push $6
+
+ IntFmt $6 "%c" 26 # DOS EOF
+
+ Call un.IsNT
+ Pop $1
+ StrCmp $1 1 unRemoveFromPath_NT
+ ; Not on NT
+ StrCpy $1 $WINDIR 2
+ FileOpen $1 "$1\autoexec.bat" r
+ GetTempFileName $4
+ FileOpen $2 $4 w
+ GetFullPathName /SHORT $0 $0
+ StrCpy $0 "SET PATH=%PATH%;$0"
+ Goto unRemoveFromPath_dosLoop
+
+ unRemoveFromPath_dosLoop:
+ FileRead $1 $3
+ StrCpy $5 $3 1 -1 # read last char
+ StrCmp $5 $6 0 +2 # if DOS EOF
+ StrCpy $3 $3 -1 # remove DOS EOF so we can compare
+ StrCmp $3 "$0$\r$\n" unRemoveFromPath_dosLoopRemoveLine
+ StrCmp $3 "$0$\n" unRemoveFromPath_dosLoopRemoveLine
+ StrCmp $3 "$0" unRemoveFromPath_dosLoopRemoveLine
+ StrCmp $3 "" unRemoveFromPath_dosLoopEnd
+ FileWrite $2 $3
+ Goto unRemoveFromPath_dosLoop
+ unRemoveFromPath_dosLoopRemoveLine:
+ SetRebootFlag true
+ Goto unRemoveFromPath_dosLoop
+
+ unRemoveFromPath_dosLoopEnd:
+ FileClose $2
+ FileClose $1
+ StrCpy $1 $WINDIR 2
+ Delete "$1\autoexec.bat"
+ CopyFiles /SILENT $4 "$1\autoexec.bat"
+ Delete $4
+ Goto unRemoveFromPath_done
+
+ unRemoveFromPath_NT:
+ ReadRegStr $1 ${WriteEnvStr_RegKey} "PATH"
+ StrCpy $5 $1 1 -1 # copy last char
+ StrCmp $5 ";" +2 # if last char != ;
+ StrCpy $1 "$1;" # append ;
+ Push $1
+ Push "$0;"
+ Call un.StrStr ; Find `$0;` in $1
+ Pop $2 ; pos of our dir
+ StrCmp $2 "" unRemoveFromPath_done
+ ; else, it is in path
+ # $0 - path to add
+ # $1 - path var
+ StrLen $3 "$0;"
+ StrLen $4 $2
+ StrCpy $5 $1 -$4 # $5 is now the part before the path to remove
+ StrCpy $6 $2 "" $3 # $6 is now the part after the path to remove
+ StrCpy $3 $5$6
+
+ StrCpy $5 $3 1 -1 # copy last char
+ StrCmp $5 ";" 0 +2 # if last char == ;
+ StrCpy $3 $3 -1 # remove last char
+
+ WriteRegExpandStr ${WriteEnvStr_RegKey} "PATH" $3
+ SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
+
+ unRemoveFromPath_done:
+ Pop $6
+ Pop $5
+ Pop $4
+ Pop $3
+ Pop $2
+ Pop $1
+ Pop $0
+FunctionEnd
+
+
+
+; AddToEnvVar - Adds the given value to the given environment var
+; Input - head of the stack $0 environement variable $1=value to add
+; Note - Win9x systems requires reboot
+
+Function AddToEnvVar
+
+ Exch $1 ; $1 has environment variable value
+ Exch
+ Exch $0 ; $0 has environment variable name
+
+ DetailPrint "Adding $1 to $0"
+ Push $2
+ Push $3
+ Push $4
+
+
+ ReadEnvStr $2 $0
+ Push "$2;"
+ Push "$1;"
+ Call StrStr
+ Pop $3
+ ;StrCmp $3 "" "" AddToEnvVar_done
+
+ Push "$2;"
+ Push "$1\;"
+ Call StrStr
+ Pop $3
+ ;StrCmp $3 "" "" AddToEnvVar_done
+
+
+ Call IsNT
+ Pop $2
+ StrCmp $2 1 AddToEnvVar_NT
+ ; Not on NT
+ StrCpy $2 $WINDIR 2
+ FileOpen $2 "$2\autoexec.bat" a
+ FileSeek $2 -1 END
+ FileReadByte $2 $3
+ IntCmp $3 26 0 +2 +2 # DOS EOF
+ FileSeek $2 -1 END # write over EOF
+ FileWrite $2 "$\r$\nSET $0=%$0%;$4$\r$\n"
+ FileClose $2
+ SetRebootFlag true
+ Goto AddToEnvVar_done
+
+ AddToEnvVar_NT:
+ ReadRegStr $2 ${WriteEnvStr_RegKey} $0
+ StrCpy $3 $2 1 -1 # copy last char
+ StrCmp $3 ";" 0 +2 # if last char == ;
+ StrCpy $2 $2 -1 # remove last char
+ StrCmp $2 "" AddToEnvVar_NTdoIt
+ StrCpy $1 "$2;$1"
+ AddToEnvVar_NTdoIt:
+ WriteRegExpandStr ${WriteEnvStr_RegKey} $0 $1
+ SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
+
+ AddToEnvVar_done:
+ Pop $4
+ Pop $3
+ Pop $2
+ Pop $1
+ Pop $0
+
+FunctionEnd
+
+; RemoveFromEnvVar - Remove a given value from a environment var
+; Input: head of the stack
+
+Function un.RemoveFromEnvVar
+
+ Exch $1 ; $1 has environment variable value
+ Exch
+ Exch $0 ; $0 has environment variable name
+
+ DetailPrint "Removing $1 from $0"
+ Push $2
+ Push $3
+ Push $4
+ Push $5
+ Push $6
+ Push $7
+
+ IntFmt $7 "%c" 26 # DOS EOF
+
+ Call un.IsNT
+ Pop $2
+ StrCmp $2 1 unRemoveFromEnvVar_NT
+ ; Not on NT
+ StrCpy $2 $WINDIR 2
+ FileOpen $2 "$2\autoexec.bat" r
+ GetTempFileName $5
+ FileOpen $3 $5 w
+ GetFullPathName /SHORT $1 $1
+ StrCpy $1 "SET $0=%$0%;$1"
+ Goto unRemoveFromEnvVar_dosLoop
+
+ unRemoveFromEnvVar_dosLoop:
+ FileRead $2 $4
+ StrCpy $6 $4 1 -1 # read last char
+ StrCmp $6 $7 0 +2 # if DOS EOF
+ StrCpy $4 $4 -1 # remove DOS EOF so we can compare
+ StrCmp $4 "$1$\r$\n" unRemoveFromEnvVar_dosLoopRemoveLine
+ StrCmp $4 "$1$\n" unRemoveFromEnvVar_dosLoopRemoveLine
+ StrCmp $4 "$1" unRemoveFromEnvVar_dosLoopRemoveLine
+ StrCmp $4 "" unRemoveFromEnvVar_dosLoopEnd
+ FileWrite $3 $4
+ Goto unRemoveFromEnvVar_dosLoop
+ unRemoveFromEnvVar_dosLoopRemoveLine:
+ SetRebootFlag true
+ Goto unRemoveFromEnvVar_dosLoop
+
+ unRemoveFromEnvVar_dosLoopEnd:
+ FileClose $3
+ FileClose $2
+ StrCpy $2 $WINDIR 2
+ Delete "$2\autoexec.bat"
+ CopyFiles /SILENT $5 "$2\autoexec.bat"
+ Delete $5
+ Goto unRemoveFromEnvVar_done
+
+ unRemoveFromEnvVar_NT:
+ ReadRegStr $2 ${WriteEnvStr_RegKey} $0
+ StrCpy $6 $2 1 -1 # copy last char
+ StrCmp $6 ";" +2 # if last char != ;
+ StrCpy $2 "$2;" # append ;
+ Push $2
+ Push "$1;"
+ Call un.StrStr ; Find `$1;` in $2
+ Pop $3 ; pos of our dir
+ StrCmp $3 "" unRemoveFromEnvVar_done
+ ; else, it is in path
+ # $1 - path to add
+ # $2 - path var
+ StrLen $4 "$1;"
+ StrLen $5 $3
+ StrCpy $6 $2 -$5 # $6 is now the part before the path to remove
+ StrCpy $7 $3 "" $4 # $7 is now the part after the path to remove
+ StrCpy $4 $6$7
+
+ StrCpy $6 $4 1 -1 # copy last char
+ StrCmp $6 ";" 0 +2 # if last char == ;
+ StrCpy $4 $4 -1 # remove last char
+
+ WriteRegExpandStr ${WriteEnvStr_RegKey} $0 $4
+ SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
+
+ unRemoveFromEnvVar_done:
+ Pop $7
+ Pop $6
+ Pop $5
+ Pop $4
+ Pop $3
+ Pop $2
+ Pop $1
+ Pop $0
+FunctionEnd
+
+
+
+
+!ifndef IsNT_KiCHiK
+!define IsNT_KiCHiK
+
+###########################################
+# Utility Functions #
+###########################################
+
+; IsNT
+; no input
+; output, top of the stack = 1 if NT or 0 if not
+;
+; Usage:
+; Call IsNT
+; Pop $R0
+; ($R0 at this point is 1 or 0)
+
+!macro IsNT un
+Function ${un}IsNT
+ Push $0
+ ReadRegStr $0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
+ StrCmp $0 "" 0 IsNT_yes
+ ; we are not NT.
+ Pop $0
+ Push 0
+ Return
+
+ IsNT_yes:
+ ; NT!!!
+ Pop $0
+ Push 1
+FunctionEnd
+!macroend
+!insertmacro IsNT ""
+!insertmacro IsNT "un."
+
+!endif ; IsNT_KiCHiK
+
+; StrStr
+; input, top of stack = string to search for
+; top of stack-1 = string to search in
+; output, top of stack (replaces with the portion of the string remaining)
+; modifies no other variables.
+;
+; Usage:
+; Push "this is a long ass string"
+; Push "ass"
+; Call StrStr
+; Pop $R0
+; ($R0 at this point is "ass string")
+
+!macro StrStr un
+Function ${un}StrStr
+Exch $R1 ; st=haystack,old$R1, $R1=needle
+ Exch ; st=old$R1,haystack
+ Exch $R2 ; st=old$R1,old$R2, $R2=haystack
+ Push $R3
+ Push $R4
+ Push $R5
+ StrLen $R3 $R1
+ StrCpy $R4 0
+ ; $R1=needle
+ ; $R2=haystack
+ ; $R3=len(needle)
+ ; $R4=cnt
+ ; $R5=tmp
+ loop:
+ StrCpy $R5 $R2 $R3 $R4
+ StrCmp $R5 $R1 done
+ StrCmp $R5 "" done
+ IntOp $R4 $R4 + 1
+ Goto loop
+done:
+ StrCpy $R1 $R2 "" $R4
+ Pop $R5
+ Pop $R4
+ Pop $R3
+ Pop $R2
+ Exch $R1
+FunctionEnd
+!macroend
+!insertmacro StrStr ""
+!insertmacro StrStr "un."
+
+!endif ; _AddToPath_nsh
Added: trunk/rez/hdrflow.bmp
===================================================================
(Binary files differ)
Property changes on: trunk/rez/hdrflow.bmp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/rez/openlibraries.spec
===================================================================
--- trunk/rez/openlibraries.spec (rev 0)
+++ trunk/rez/openlibraries.spec 2008-02-24 14:42:19 UTC (rev 426)
@@ -0,0 +1,101 @@
+
+#
+# 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.4.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-4 olib-mlt >= 0.2.2-1 olib-mlt++ >= 0.2.2-1
+BuildRequires: olib-glew-devel >= 1.3.4-4 olib-mlt-devel >= 0.2.2-1 olib-mlt++-devel >= 0.2.2-1
+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-4 olib-mlt >= 0.2.2-1 olib-mlt++ >= 0.2.2-1
+BuildRequires: olib-glew-devel >= 1.3.4-4 olib-mlt-devel >= 0.2.2-1 olib-mlt++-devel >= 0.2.2-1
+
+%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.4.0/lib" --prefix=%{_prefix} --enable-gpl --with-qtinclude=/usr/lib/qt-3.3/include --with-qtlib=/usr/lib/qt-3.3/lib --with-glewprefix=/usr/olib/0.4.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
+* Tue Sep 19 2006 Goncalo de Carvalho <go...@vm...>
+- increased the release number for Jahshaka 2.0
+* Mon Aug 16 2006 Goncalo de Carvalho <go...@vm...>
+- increased the release number for Jahshaka 2.0 RC4
+- increased version number
+* 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
Added: trunk/rez/write_env_str.nsh
===================================================================
--- trunk/rez/write_env_str.nsh (rev 0)
+++ trunk/rez/write_env_str.nsh 2008-02-24 14:42:19 UTC (rev 426)
@@ -0,0 +1,149 @@
+
+!ifndef _WriteEnvStr_nsh
+!define _WriteEnvStr_nsh
+
+!include WinMessages.nsh
+
+!ifndef WriteEnvStr_RegKey
+ !ifdef ALL_USERS
+ !define WriteEnvStr_RegKey \
+ 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
+ !else
+ !define WriteEnvStr_RegKey 'HKCU "Environment"'
+ !endif
+!endif
+
+#
+# WriteEnvStr - Writes an environment variable
+# Note: Win9x systems requires reboot
+#
+# Example:
+# Push "HOMEDIR" # name
+# Push "C:\New Home Dir\" # value
+# Call WriteEnvStr
+#
+Function WriteEnvStr
+ Exch $1 ; $1 has environment variable value
+ Exch
+ Exch $0 ; $0 has environment variable name
+ Push $2
+
+ Call IsNT
+ Pop $2
+ StrCmp $2 1 WriteEnvStr_NT
+ ; Not on NT
+ StrCpy $2 $WINDIR 2 ; Copy drive of windows (c:)
+ FileOpen $2 "$2\autoexec.bat" a
+ FileSeek $2 0 END
+ FileWrite $2 "$\r$\nSET $0=$1$\r$\n"
+ FileClose $2
+ SetRebootFlag true
+ Goto WriteEnvStr_done
+
+ WriteEnvStr_NT:
+ WriteRegExpandStr ${WriteEnvStr_RegKey} $0 $1
+ SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} \
+ 0 "STR:Environment" /TIMEOUT=5000
+
+ WriteEnvStr_done:
+ Pop $2
+ Pop $0
+ Pop $1
+FunctionEnd
+
+#
+# un.DeleteEnvStr - Removes an environment variable
+# Note: Win9x systems requires reboot
+#
+# Example:
+# Push "HOMEDIR" # name
+# Call un.DeleteEnvStr
+#
+Function un.DeleteEnvStr
+ Exch $0 ; $0 now has the name of the variable
+ Push $1
+ Push $2
+ Push $3
+ Push $4
+ Push $5
+
+ Call un.IsNT
+ Pop $1
+ StrCmp $1 1 DeleteEnvStr_NT
+ ; Not on NT
+ StrCpy $1 $WINDIR 2
+ FileOpen $1 "$1\autoexec.bat" r
+ GetTempFileName $4
+ FileOpen $2 $4 w
+ StrCpy $0 "SET $0="
+ SetRebootFlag true
+
+ DeleteEnvStr_dosLoop:
+ FileRead $1 $3
+ StrLen $5 $0
+ StrCpy $5 $3 $5
+ StrCmp $5 $0 DeleteEnvStr_dosLoop
+ StrCmp $5 "" DeleteEnvStr_dosLoopEnd
+ FileWrite $2 $3
+ Goto DeleteEnvStr_dosLoop
+
+ DeleteEnvStr_dosLoopEnd:
+ FileClose $2
+ FileClose $1
+ StrCpy $1 $WINDIR 2
+ Delete "$1\autoexec.bat"
+ CopyFiles /SILENT $4 "$1\autoexec.bat"
+ Delete $4
+ Goto DeleteEnvStr_done
+
+ DeleteEnvStr_NT:
+ DeleteRegValue ${WriteEnvStr_RegKey} $0
+ SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} \
+ 0 "STR:Environment" /TIMEOUT=5000
+
+ DeleteEnvStr_done:
+ Pop $5
+ Pop $4
+ Pop $3
+ Pop $2
+ Pop $1
+ Pop $0
+FunctionEnd
+
+!ifndef IsNT_KiCHiK
+!define IsNT_KiCHiK
+
+#
+# [un.]IsNT - Pushes 1 if running on NT, 0 if not
+#
+# Example:
+# Call IsNT
+# Pop $0
+# StrCmp $0 1 +3
+# MessageBox MB_OK "Not running on NT!"
+# Goto +2
+# MessageBox MB_OK "Running on NT!"
+#
+!macro IsNT UN
+Function ${UN}IsNT
+ Push $0
+ ReadRegStr $0 HKLM \
+ "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
+ StrCmp $0 "" 0 IsNT_yes
+ ; we are not NT.
+ Pop $0
+ Push 0
+ Return
+
+ IsNT_yes:
+ ; NT!!!
+ Pop $0
+ Push 1
+FunctionEnd
+!macroend
+!insertmacro IsNT ""
+!insertmacro IsNT "un."
+
+!endif ; IsNT_KiCHiK
+
+!endif ; _WriteEnvStr_nsh
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2008-02-24 18:00:39
|
Revision: 427
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=427&view=rev
Author: glslang
Date: 2008-02-24 10:00:36 -0800 (Sun, 24 Feb 2008)
Log Message:
-----------
+ ensures no name conflicts exist between hdrflow and olibs
Modified Paths:
--------------
trunk/hdrflow_runtime.nsi
trunk/hdrflow_sdk.nsi
trunk/lib/extras/src/imf/mfn/readers_vc8.vcproj
trunk/lib/extras/src/ppm/ppm_vc8.vcproj
trunk/lib/extras/src/raw/raw_vc8.vcproj
trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/il/config.hpp
trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/png/png_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/py/py_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/ml/config.hpp
trunk/lib/openlibraries/src/openmedialib/ml/ml_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/plugins/openal/openal_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/py/py_vc8.vcproj
trunk/lib/openlibraries/src/openpluginlib/pl/config.hpp
trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj
trunk/lib/openlibraries/test/openmedialib/player/player_vc8.vcproj
trunk/lib/openlibraries/test/openmedialib/store/store_vc8.vcproj
Modified: trunk/hdrflow_runtime.nsi
===================================================================
--- trunk/hdrflow_runtime.nsi 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/hdrflow_runtime.nsi 2008-02-24 18:00:36 UTC (rev 427)
@@ -51,7 +51,7 @@
!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of HDRFlow.\r\n\r\n$_CLICK"
!insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE "lib\openlibraries\COPYING"
+!insertmacro MUI_PAGE_LICENSE "lib\extras\COPYING"
!insertmacro MUI_PAGE_COMPONENTS
!insertmacro MUI_PAGE_DIRECTORY
!insertmacro MUI_PAGE_INSTFILES
@@ -80,6 +80,15 @@
SetOverwrite on
+ VAR /GLOBAL maya_location
+ ReadRegStr $maya_location HKLM "Software\Autodesk\Maya\2008\Setup\InstallPath" "MAYA_INSTALL_LOCATION"
+ IfErrors no_maya yes_maya
+ no_maya:
+ MessageBox MB_ICONEXCLAMATION "Unable to detect Maya 2008"
+ Quit
+
+ yes_maya:
+
SetOutPath $INSTDIR\DLLs
File "lib\openlibraries\Multi-threaded Release DLL\*-vc80-r-${VERSION}.dll"
File "lib\openlibraries\Multi-threaded Release DLL\*.opl"
@@ -118,6 +127,9 @@
File "lib\openlibraries\effects\shaders\channel_selector.cg"
File "lib\openlibraries\effects\shaders\channel_selector.frag"
+ SetOutPath $maya_location\bin\plug-ins
+ File "lib\extras\Multi-threaded Release DLL\HDRFlowMaya.mll"
+
SetDetailsPrint both
;--------------------------------
Modified: trunk/hdrflow_sdk.nsi
===================================================================
--- trunk/hdrflow_sdk.nsi 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/hdrflow_sdk.nsi 2008-02-24 18:00:36 UTC (rev 427)
@@ -80,6 +80,15 @@
SetOverwrite on
+ VAR /GLOBAL maya_location
+ ReadRegStr $maya_location HKLM "Software\Autodesk\Maya\2008\Setup\InstallPath" "MAYA_INSTALL_LOCATION"
+ IfErrors no_maya yes_maya
+ no_maya:
+ MessageBox MB_ICONEXCLAMATION "Unable to detect Maya 2008"
+ Quit
+
+ yes_maya:
+
SetOutPath $INSTDIR\include\hdrflow-${VERSION_DOT}\openpluginlib\pl
File lib\openlibraries\src\openpluginlib\pl\allocatorstringstorage.h
File lib\openlibraries\src\openpluginlib\pl\bind_info.hpp
@@ -147,7 +156,10 @@
File "lib\openlibraries\Multi-threaded Debug DLL\*-vc80-d-${VERSION}.dll"
File "lib\openlibraries\Multi-threaded Debug DLL\*.opl"
File "lib\openlibraries\Multi-threaded Release DLL\*-vc80-r-${VERSION}.dll"
-
+ File "lib\extras\Multi-threaded Debug DLL\*-vc80-d-*.dll"
+ File "lib\extras\Multi-threaded Debug DLL\*.opl"
+ File "lib\extras\Multi-threaded Release DLL\*-vc80-r-*.dll"
+
; dependencies
File "C:\Program Files\FFmpeg\lib\avcodec-51.dll"
File "C:\Program Files\FFmpeg\lib\avformat-52.dll"
@@ -192,6 +204,9 @@
File "lib\openlibraries\effects\shaders\channel_selector.cg"
File "lib\openlibraries\effects\shaders\channel_selector.frag"
+ SetOutPath $maya_location\bin\plug-ins
+ File "lib\extras\Multi-threaded Debug DLL\HDRFlowMaya.mll"
+
SetDetailsPrint both
;--------------------------------
Modified: trunk/lib/extras/src/imf/mfn/readers_vc8.vcproj
===================================================================
--- trunk/lib/extras/src/imf/mfn/readers_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/extras/src/imf/mfn/readers_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -97,6 +97,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine=""
/>
</Configuration>
<Configuration
@@ -181,6 +182,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine=""
/>
</Configuration>
</Configurations>
Modified: trunk/lib/extras/src/ppm/ppm_vc8.vcproj
===================================================================
--- trunk/lib/extras/src/ppm/ppm_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/extras/src/ppm/ppm_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -94,6 +94,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy *.opl "$(SolutionDir)$(ConfigurationName)""
/>
</Configuration>
<Configuration
@@ -176,6 +177,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy *.opl "$(SolutionDir)$(ConfigurationName)""
/>
</Configuration>
</Configurations>
Modified: trunk/lib/extras/src/raw/raw_vc8.vcproj
===================================================================
--- trunk/lib/extras/src/raw/raw_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/extras/src/raw/raw_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -97,6 +97,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy *.opl "$(SolutionDir)$(ConfigurationName)""
/>
</Configuration>
<Configuration
@@ -183,6 +184,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy *.opl "$(SolutionDir)$(ConfigurationName)""
/>
</Configuration>
</Configurations>
Modified: trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -67,9 +67,9 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="Half.lib IlmImf.lib Iex.lib"
- OutputFile="$(OutDir)\openeffectslib_tonemap-vc80-d-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrfloweffects_tonemap-vc80-d-0_5_0.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)";C:\OpenEXR\lib\Debug"
+ AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\$(ConfigurationName)";C:\OpenEXR\lib\Debug"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -152,9 +152,9 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="Half.lib IlmImf.lib Iex.lib"
- OutputFile="$(OutDir)\openeffectslib_tonemap-vc80-r-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrfloweffects_tonemap-vc80-r-0_5_0.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)";C:\OpenEXR\lib\Release"
+ AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\$(ConfigurationName)";C:\OpenEXR\lib\Release"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
Modified: trunk/lib/openlibraries/src/openimagelib/il/config.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/config.hpp 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openimagelib/il/config.hpp 2008-02-24 18:00:36 UTC (rev 427)
@@ -23,7 +23,7 @@
#endif
#ifndef OPENIMAGELIB_LIBNAME
-# define OPENIMAGELIB_LIBNAME "openimagelib_il"
+# define OPENIMAGELIB_LIBNAME "hdrflowimage_il"
#endif
#ifndef OPENIMAGELIB_TOOLSET
Modified: trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -72,14 +72,14 @@
Name="VCLinkerTool"
UseUnicodeResponseFiles="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)/openimagelib_il-vc80-d-0_5_0.dll"
+ OutputFile="$(OutDir)/hdrflowimage_il-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)""
GenerateManifest="false"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/il.pdb"
SubSystem="2"
- ImportLibrary="$(TargetDir)openimagelib_il-vc80-d-0_5_0.lib"
+ ImportLibrary="$(TargetDir)hdrflowimage_il-vc80-d-0_5_0.lib"
TargetMachine="1"
/>
<Tool
@@ -161,7 +161,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)/openimagelib_il-vc80-r-0_5_0.dll"
+ OutputFile="$(OutDir)/hdrflowimage_il-vc80-r-0_5_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)""
GenerateManifest="false"
@@ -169,7 +169,7 @@
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- ImportLibrary="$(TargetDir)openimagelib_il-vc80-r-0_5_0.lib"
+ ImportLibrary="$(TargetDir)hdrflowimage_il-vc80-r-0_5_0.lib"
TargetMachine="1"
/>
<Tool
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -68,7 +68,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openimagelib_dds-vc80-d-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowimage_dds-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
GenerateDebugInformation="true"
@@ -154,7 +154,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openimagelib_dds-vc80-r-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowimage_dds-vc80-r-0_5_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
GenerateDebugInformation="false"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -66,7 +66,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
ShowProgress="0"
- OutputFile="$(OutDir)\openimagelib_dpx-vc80-d-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowimage_dpx-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)""
GenerateDebugInformation="true"
@@ -148,7 +148,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
- OutputFile="$(OutDir)\openimagelib_dpx-vc80-r-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowimage_dpx-vc80-r-0_5_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)""
GenerateDebugInformation="true"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -68,7 +68,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="Half.lib IlmImf.lib Iex.lib"
- OutputFile="$(OutDir)\openimagelib_exr-vc80-d-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowimage_exr-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)";C:\OpenEXR\lib\Debug"
GenerateDebugInformation="true"
@@ -153,7 +153,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="Half.lib IlmImf.lib Iex.lib"
- OutputFile="$(OutDir)\openimagelib_exr-vc80-r-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowimage_exr-vc80-r-0_5_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)";C:\OpenEXR\lib\Release"
GenerateDebugInformation="true"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -68,7 +68,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="gdiplus.lib"
- OutputFile="$(OutDir)\openimagelib_gdi-vc80-d-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowimage_gdi-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
GenerateDebugInformation="true"
@@ -153,7 +153,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="gdiplus.lib"
- OutputFile="$(OutDir)\openimagelib_gdi-vc80-r-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowimage_gdi-vc80-r-0_5_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
GenerateDebugInformation="true"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -70,7 +70,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openimagelib_hdr-vc80-d-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowimage_hdr-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
GenerateDebugInformation="true"
@@ -156,7 +156,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openimagelib_hdr-vc80-r-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowimage_hdr-vc80-r-0_5_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
GenerateDebugInformation="false"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/png/png_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/png/png_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/png/png_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -68,7 +68,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="libpng13.lib zdll.lib"
- OutputFile="$(OutDir)\openimagelib_png-vc80-d-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowimage_png-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\libpng\lib;C:\zlib\lib"
GenerateDebugInformation="true"
@@ -155,7 +155,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="libpng13.lib zdll.lib"
- OutputFile="$(OutDir)\openimagelib_png-vc80-r-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowimage_png-vc80-r-0_5_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\libpng\lib;C:\zlib\lib"
GenerateDebugInformation="false"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -68,7 +68,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="qtmlClient.lib"
- OutputFile="$(OutDir)\openimagelib_quicktime-vc80-d-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowimage_quicktime-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\Program Files\QuickTime SDK\Libraries"
IgnoreDefaultLibraryNames="libcmt.lib"
@@ -154,7 +154,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="qtmlClient.lib"
- OutputFile="$(OutDir)\openimagelib_quicktime-vc80-r-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowimage_quicktime-vc80-r-0_5_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\Program Files\QuickTime SDK\Libraries"
IgnoreDefaultLibraryNames="libcmt.lib"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -67,7 +67,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openimagelib_sgi-vc80-d-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowimage_sgi-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
GenerateDebugInformation="true"
@@ -152,7 +152,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openimagelib_sgi-vc80-r-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowimage_sgi-vc80-r-0_5_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
GenerateDebugInformation="false"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -68,7 +68,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openimagelib_tga-vc80-d-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowimage_tga-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
GenerateDebugInformation="true"
@@ -154,7 +154,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openimagelib_tga-vc80-r-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowimage_tga-vc80-r-0_5_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
GenerateDebugInformation="false"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -66,9 +66,9 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="libtiff.lib"
- OutputFile="$(OutDir)\openimagelib_tiff-vc80-d-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowimage_tiff-vc80-d-0_5_0.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\libtiff\lib"
+ AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\$(ConfigurationName);C:\libtiff\lib"
IgnoreDefaultLibraryNames="msvcrt.lib"
GenerateDebugInformation="true"
SubSystem="2"
@@ -151,9 +151,9 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="libtiff.lib"
- OutputFile="$(OutDir)\openimagelib_tiff-vc80-r-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowimage_tiff-vc80-r-0_5_0.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\libtiff\lib"
+ AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\$(ConfigurationName);C:\libtiff\lib"
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
SubSystem="2"
Modified: trunk/lib/openlibraries/src/openimagelib/py/py_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/py/py_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openimagelib/py/py_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -68,7 +68,7 @@
AdditionalDependencies="boost_python-vc80-mt-gd-1_34_1.lib"
OutputFile="$(OutDir)\HDRFlowImage.pyd"
LinkIncremental="2"
- AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName);C:\Python25\Libs"
+ AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\$(ConfigurationName);C:\Python25\Libs"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -152,7 +152,7 @@
AdditionalDependencies="boost_python-vc80-mt-1_34_1.lib"
OutputFile="$(OutDir)\HDRFlowImage.pyd"
LinkIncremental="1"
- AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName);C:\Python25\Libs"
+ AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\$(ConfigurationName);C:\Python25\Libs"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
Modified: trunk/lib/openlibraries/src/openmedialib/ml/config.hpp
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/ml/config.hpp 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openmedialib/ml/config.hpp 2008-02-24 18:00:36 UTC (rev 427)
@@ -37,7 +37,7 @@
#endif
#ifndef OPENMEDIALIB_LIBNAME
-# define OPENMEDIALIB_LIBNAME "openmedialib_ml"
+# define OPENMEDIALIB_LIBNAME "hdrflowmedia_ml"
#endif
#ifndef OPENMEDIALIB_TOOLSET
Modified: trunk/lib/openlibraries/src/openmedialib/ml/ml_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/ml/ml_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openmedialib/ml/ml_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -67,12 +67,12 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openmedialib_ml-vc80-d-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowmedia_ml-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
GenerateDebugInformation="true"
SubSystem="2"
- ImportLibrary="$(TargetDir)openmedialib_ml-vc80-d-0_5_0.lib"
+ ImportLibrary="$(TargetDir)hdrflowmedia_ml-vc80-d-0_5_0.lib"
TargetMachine="1"
/>
<Tool
@@ -150,14 +150,14 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openmedialib_ml-vc80-r-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowmedia_ml-vc80-r-0_5_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- ImportLibrary="$(TargetDir)openmedialib_ml-vc80-r-0_5_0.lib"
+ ImportLibrary="$(TargetDir)hdrflowmedia_ml-vc80-r-0_5_0.lib"
TargetMachine="1"
/>
<Tool
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -68,9 +68,9 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalDependencies="avcodec.lib avformat.lib avutil.lib"
- OutputFile="$(OutDir)\openmedialib_avformat-vc80-d-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowmedia_avformat-vc80-d-0_5_0.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)";"C:\Program Files\FFmpeg\lib""
+ AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\$(ConfigurationName)";"C:\Program Files\FFmpeg\lib""
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -153,9 +153,9 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalDependencies="avcodec.lib avformat.lib avutil.lib"
- OutputFile="$(OutDir)\openmedialib_avformat-vc80-r-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowmedia_avformat-vc80-r-0_5_0.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\Boost\lib;$(SolutionDir)\src\openimagelib\il\$(ConfigurationName);"C:\Program Files\FFmpeg\lib""
+ AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\$(ConfigurationName);C:\Boost\lib;"C:\Program Files\FFmpeg\lib""
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -67,7 +67,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openmedialib_gensys-vc80-d-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowmedia_gensys-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)""
GenerateDebugInformation="true"
@@ -151,7 +151,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openmedialib_gensys-vc80-r-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowmedia_gensys-vc80-r-0_5_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)""
GenerateDebugInformation="true"
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -66,7 +66,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openmedialib_ofx-vc80-d-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowmedia_ofx-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\Boost\lib;$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
GenerateDebugInformation="true"
@@ -149,7 +149,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openmedialib_ofx-vc80-r-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowmedia_ofx-vc80-r-0_5_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\Boost\lib;$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
GenerateDebugInformation="true"
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -68,7 +68,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openmedialib_oil-vc80-d-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowmedia_oil-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\Boost\lib;$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
GenerateDebugInformation="true"
@@ -152,7 +152,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openmedialib_oil-vc80-r-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowmedia_oil-vc80-r-0_5_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\Boost\lib;$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
GenerateDebugInformation="true"
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/openal/openal_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/openal/openal_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/openal/openal_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -68,9 +68,9 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalDependencies="OpenAL32.lib"
- OutputFile="$(OutDir)\openmedialib_openal-vc80-d-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowmedia_openal-vc80-d-0_5_0.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)";"C:\Program Files\OpenAL 1.1 SDK\libs\Win32""
+ AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\$(ConfigurationName)";"C:\Program Files\OpenAL 1.1 SDK\libs\Win32""
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -152,9 +152,9 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalDependencies="OpenAL32.lib"
- OutputFile="$(OutDir)\openmedialib_openal-vc80-r-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowmedia_openal-vc80-r-0_5_0.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\Boost\lib;$(SolutionDir)\src\openimagelib\il\$(ConfigurationName);"C:\Program Files\OpenAL 1.1 SDK\libs\Win32""
+ AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\$(ConfigurationName);C:\Boost\lib;"C:\Program Files\OpenAL 1.1 SDK\libs\Win32""
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
Modified: trunk/lib/openlibraries/src/openmedialib/py/py_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/py/py_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openmedialib/py/py_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -70,7 +70,7 @@
AdditionalDependencies="boost_python-vc80-mt-gd-1_34_1.lib"
OutputFile="$(OutDir)\HDRFlowMedia.pyd"
LinkIncremental="2"
- AdditionalLibraryDirectories="C:\Boost\lib;C:\Python25\Libs;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
+ AdditionalLibraryDirectories="C:\Boost\lib;C:\Python25\Libs;$(SolutionDir)\$(ConfigurationName)"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -154,7 +154,7 @@
AdditionalDependencies="boost_python-vc80-mt-1_34_1.lib"
OutputFile="$(OutDir)\HDRFlowMedia.pyd"
LinkIncremental="1"
- AdditionalLibraryDirectories="C:\Boost\lib;C:\Python25\Libs;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
+ AdditionalLibraryDirectories="C:\Boost\lib;C:\Python25\Libs;$(SolutionDir)\$(ConfigurationName)"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/config.hpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/config.hpp 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/config.hpp 2008-02-24 18:00:36 UTC (rev 427)
@@ -23,7 +23,7 @@
#endif
#ifndef OPENPLUGINLIB_LIBNAME
-# define OPENPLUGINLIB_LIBNAME "openpluginlib_pl"
+# define OPENPLUGINLIB_LIBNAME "hdrflowplugin_pl"
#endif
#ifndef OPENPLUGINLIB_TOOLSET
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -69,13 +69,13 @@
Name="VCLinkerTool"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="winmm.lib opengl32.lib glew32.lib cg.lib cgGL.lib"
- OutputFile="$(OutDir)/openpluginlib_pl-vc80-d-0_5_0.dll"
+ OutputFile="$(OutDir)/hdrflowplugin_pl-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;"C:\Program Files\NVIDIA Corporation\Cg\lib""
GenerateDebugInformation="true"
SubSystem="2"
EntryPointSymbol=""
- ImportLibrary="$(TargetDir)openpluginlib_pl-vc80-d-0_5_0.lib"
+ ImportLibrary="$(TargetDir)hdrflowplugin_pl-vc80-d-0_5_0.lib"
TargetMachine="1"
/>
<Tool
@@ -156,14 +156,14 @@
Name="VCLinkerTool"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="winmm.lib opengl32.lib glew32.lib cg.lib cgGL.lib"
- OutputFile="$(OutDir)/openpluginlib_pl-vc80-r-0_5_0.dll"
+ OutputFile="$(OutDir)/hdrflowplugin_pl-vc80-r-0_5_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;"C:\Program Files\NVIDIA Corporation\Cg\lib""
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- ImportLibrary="$(TargetDir)openpluginlib_pl-vc80-r-0_5_0.lib"
+ ImportLibrary="$(TargetDir)hdrflowplugin_pl-vc80-r-0_5_0.lib"
TargetMachine="1"
/>
<Tool
Modified: trunk/lib/openlibraries/test/openmedialib/player/player_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/test/openmedialib/player/player_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/test/openmedialib/player/player_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -70,7 +70,7 @@
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="glew32.lib"
LinkIncremental="2"
- AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\Boost\lib;$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
+ AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\$(ConfigurationName);C:\Boost\lib"
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="1"
@@ -153,7 +153,7 @@
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="glew32.lib"
LinkIncremental="1"
- AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
+ AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\$(ConfigurationName)"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
Modified: trunk/lib/openlibraries/test/openmedialib/store/store_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/test/openmedialib/store/store_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/test/openmedialib/store/store_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -69,7 +69,7 @@
Name="VCLinkerTool"
AdditionalOptions="/LARGEADDRESSAWARE"
LinkIncremental="2"
- AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\Boost\lib;$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
+ AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\$(ConfigurationName);C:\Boost\lib"
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="1"
@@ -151,7 +151,7 @@
Name="VCLinkerTool"
AdditionalOptions="/LARGEADDRESSAWARE"
LinkIncremental="1"
- AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\Boost\lib;$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
+ AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\$(ConfigurationName);C:\Boost\lib"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2008-03-04 22:38:27
|
Revision: 429
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=429&view=rev
Author: glslang
Date: 2008-03-04 14:38:22 -0800 (Tue, 04 Mar 2008)
Log Message:
-----------
Fixes HDRFlowMaya win32 installer
Modified Paths:
--------------
trunk/hdrflow_runtime.nsi
Added Paths:
-----------
trunk/rez/msxml6_x86.msi
Modified: trunk/hdrflow_runtime.nsi
===================================================================
--- trunk/hdrflow_runtime.nsi 2008-02-24 18:28:23 UTC (rev 428)
+++ trunk/hdrflow_runtime.nsi 2008-03-04 22:38:22 UTC (rev 429)
@@ -106,7 +106,12 @@
File "C:\Program Files\NVIDIA Corporation\Cg\bin\cg.dll"
File "C:\Program Files\NVIDIA Corporation\Cg\bin\cgGL.dll"
File "C:\zlib\lib\zlib1.dll"
-
+ File "C:\Boost\lib\boost_filesystem-vc80-mt-1_34_1.dll"
+ File "C:\Boost\lib\boost_regex-vc80-mt-1_34_1.dll"
+ File "C:\Boost\lib\boost_thread-vc80-mt-1_34_1.dll"
+ File "C:\Boost\lib\boost_iostreams-vc80-mt-1_34_1.dll"
+ File "C:\Windows\System32\glew32.dll"
+
; Python
SetOutPath $INSTDIR\python
File "lib\openlibraries\Multi-threaded Release DLL\*.pyd"
@@ -157,6 +162,48 @@
SectionEnd
+Section "Windows CRT DLLs" ms_crt_dlls
+
+ SectionIn 1
+ SetOutPath $INSTDIR
+
+ SetOverwrite on
+ SetShellVarContext all
+
+ SetDetailsPrint textonly
+ DetailPrint "Installing Windows VC redistributables..."
+ SetDetailsPrint listonly
+
+ SetOutPath $INSTDIR
+ File "C:\Program Files\Microsoft Visual Studio 8\SDK\v2.0\BootStrapper\Packages\vcredist_x86\vcredist_x86.exe"
+ File "C:\Program Files\Microsoft Visual Studio 8\SDK\v2.0\BootStrapper\Packages\vcredist_x86\product.xml"
+ ExecWait '"$INSTDIR\vcredist_x86.exe" /q:a /c:"msiexec /i vcredist.msi /qn"'
+
+ SetDetailsPrint both
+
+SectionEnd
+
+Section "MSXML6 SP1"
+
+ SectionIn 1
+ SetOutPath $INSTDIR
+
+ SetOverwrite on
+ SetShellVarContext all
+
+ SetDetailsPrint textonly
+ DetailPrint "Installing MSXML6 SP1..."
+ SetDetailsPrint listonly
+
+ SetOutPath $INSTDIR
+ File "rez\msxml6_x86.msi"
+
+ ExecWait 'MsiExec.exe /qn /i "$INSTDIR\msxml6_x86.msi /qb"'
+
+ SetDetailsPrint both
+
+SectionEnd
+
Section -post
WriteUninstaller $INSTDIR\uninst-hdrflow.exe
Added: trunk/rez/msxml6_x86.msi
===================================================================
(Binary files differ)
Property changes on: trunk/rez/msxml6_x86.msi
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2008-03-08 19:53:39
|
Revision: 430
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=430&view=rev
Author: glslang
Date: 2008-03-08 11:53:37 -0800 (Sat, 08 Mar 2008)
Log Message:
-----------
Fixes tiff float loader
Modified Paths:
--------------
trunk/hdrflow_runtime.nsi
trunk/hdrflow_sdk.nsi
trunk/lib/extras/src/imf/mfn/mfn.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi_plugin.opl
trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_plugin.opl
trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.opl
Modified: trunk/hdrflow_runtime.nsi
===================================================================
--- trunk/hdrflow_runtime.nsi 2008-03-04 22:38:22 UTC (rev 429)
+++ trunk/hdrflow_runtime.nsi 2008-03-08 19:53:37 UTC (rev 430)
@@ -92,6 +92,8 @@
SetOutPath $INSTDIR\DLLs
File "lib\openlibraries\Multi-threaded Release DLL\*-vc80-r-${VERSION}.dll"
File "lib\openlibraries\Multi-threaded Release DLL\*.opl"
+ File "lib\extras\Multi-threaded Release DLL\*-vc80-r-*.dll"
+ File "lib\extras\Multi-threaded Release DLL\*.opl"
; dependencies
File "C:\Program Files\FFmpeg\lib\avcodec-51.dll"
@@ -111,6 +113,7 @@
File "C:\Boost\lib\boost_thread-vc80-mt-1_34_1.dll"
File "C:\Boost\lib\boost_iostreams-vc80-mt-1_34_1.dll"
File "C:\Windows\System32\glew32.dll"
+ File "C:\libtiff\bin\libtiff.dll"
; Python
SetOutPath $INSTDIR\python
@@ -162,7 +165,8 @@
SectionEnd
-Section "Windows CRT DLLs" ms_crt_dlls
+Section "Windows CRT DLLs" -
+SectionIn RO
SectionIn 1
SetOutPath $INSTDIR
@@ -184,6 +188,7 @@
SectionEnd
Section "MSXML6 SP1"
+SectionIn RO
SectionIn 1
SetOutPath $INSTDIR
Modified: trunk/hdrflow_sdk.nsi
===================================================================
--- trunk/hdrflow_sdk.nsi 2008-03-04 22:38:22 UTC (rev 429)
+++ trunk/hdrflow_sdk.nsi 2008-03-08 19:53:37 UTC (rev 430)
@@ -173,6 +173,7 @@
File "C:\Program Files\NVIDIA Corporation\Cg\bin\cg.dll"
File "C:\Program Files\NVIDIA Corporation\Cg\bin\cgGL.dll"
File "C:\zlib\lib\zlib1.dll"
+ File "C:\libtiff\bin\libtiff.dll"
; Python
SetOutPath $INSTDIR\python
Modified: trunk/lib/extras/src/imf/mfn/mfn.cpp
===================================================================
--- trunk/lib/extras/src/imf/mfn/mfn.cpp 2008-03-04 22:38:22 UTC (rev 429)
+++ trunk/lib/extras/src/imf/mfn/mfn.cpp 2008-03-08 19:53:37 UTC (rev 430)
@@ -67,7 +67,10 @@
input_ = ml::create_input( resource );
if( !input_ )
+ {
+ MGlobal::displayInfo( "HDRFlow: Internal Error: unable to create input. Please report to su...@cr...." );
return MS::kFailure;
+ }
}
#ifndef NDEBUG
@@ -76,7 +79,10 @@
ml::frame_type_ptr frame = input_->fetch( );
if( !frame )
+ {
+ MGlobal::displayInfo( "HDRFlow: Internal Error: unable to fetch image. Please report to su...@cr...." );
return MS::kFailure;
+ }
#ifndef NDEBUG
MGlobal::displayInfo( "HDRFlow: frame found ..." );
@@ -84,7 +90,10 @@
il::image_type_ptr im = frame->get_image( );
if( !im )
+ {
+ MGlobal::displayInfo( "HDRFlow: Internal Error: unable to get image from frame. Please report to su...@cr...." );
return MS::kFailure;
+ }
#ifndef NDEBUG
MGlobal::displayInfo( "HDRFlow: image stream found ..." );
@@ -111,7 +120,10 @@
input_->seek( idx );
ml::frame_type_ptr frame = input_->fetch( );
if( !frame )
+ {
+ MGlobal::displayInfo( "HDRFlow: Internal Error: unable to fetch image. Please report to su...@cr...." );
return MS::kFailure;
+ }
il::image_type_ptr im = il::convert( frame->get_image( ), L"r32g32b32a32f" );
if( !im )
@@ -154,7 +166,9 @@
MStatus image_reader::close( )
{
+#ifndef NDEBUG
MGlobal::displayInfo( "HDRFlow: closing..." );
+#endif
input_.reset( );
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi_plugin.opl 2008-03-04 22:38:22 UTC (rev 429)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi_plugin.opl 2008-03-08 19:53:37 UTC (rev 430)
@@ -2,6 +2,6 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openimagelib name="oil" version="0.2.0">
- <plugin name="OpenLibraries GDI+ plugin" type="input" in_filter="*.bmp *.gif *.jpg *.jpeg *.png, *.tif *.tiff *.wmf *.emf *.ico" extension='".*\.bmp", ".*\.gif", ".*\.jpg", ".*\.jpeg", ".*\.png", ".*\.tif", ".*\.tiff", ".*\.wmf", ".*\.emf", ".*\.ico"' merit="40" filename='"hdrflowimage_gdi-vc80-d-0_5_0.dll", "hdrflowimage_gdi-vc80-r-0_5_0.dll"'/>
+ <plugin name="OpenLibraries GDI+ plugin" type="input" in_filter="*.bmp *.gif *.jpg *.jpeg *.png, *.wmf *.emf *.ico" extension='".*\.bmp", ".*\.gif", ".*\.jpg", ".*\.jpeg", ".*\.png", ".*\.wmf", ".*\.emf", ".*\.ico"' merit="0" filename='"hdrflowimage_gdi-vc80-d-0_5_0.dll", "hdrflowimage_gdi-vc80-r-0_5_0.dll"'/>
</openimagelib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_plugin.opl 2008-03-04 22:38:22 UTC (rev 429)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_plugin.opl 2008-03-08 19:53:37 UTC (rev 430)
@@ -2,6 +2,6 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openimagelib name="oil" version="0.2.0">
- <plugin name="OpenLibraries QuickTime plugin" type="input" in_filter="*.sgi *.rgb *.rgba *.la *.bw *.pict *.text *.gif *.png *.pics *.tiff *.psd *.tif *.bmp *.jpg *.jif *.jpeg *.tga *.qtif *.jp2" extension='".*\.sgi", ".*\.rgb", ".*\.rgba", ".*\.la", ".*\.bw", ".*\.pict", ".*\.text", ".*\.gif", ".*\.png", ".*\.pics", ".*\.tiff", ".*\.psd", ".*\.tif", ".*\.bmp", ".*\.jpg", ".*\.jif", ".*\.jpeg", ".*\.tga", ".*\.qtif", ".*\.jp2"' merit="40" filename='"libopenimagelib_quicktime.so", "libopenimagelib_quicktime.dylib", "hdrflowimage_quicktime-vc80-d-0_5_0.dll", "hdrflowimage_quicktime-vc80-r-0_5_0.dll"'/>
+ <plugin name="OpenLibraries QuickTime plugin" type="input" in_filter="*.sgi *.rgb *.rgba *.la *.bw *.pict *.text *.gif *.png *.pics *.psd *.bmp *.jpg *.jif *.jpeg *.tga *.qtif *.jp2" extension='".*\.sgi", ".*\.rgb", ".*\.rgba", ".*\.la", ".*\.bw", ".*\.pict", ".*\.text", ".*\.gif", ".*\.png", ".*\.pics", ".*\.psd", ".*\.bmp", ".*\.jpg", ".*\.jif", ".*\.jpeg", ".*\.tga", ".*\.qtif", ".*\.jp2"' merit="0" filename='"libopenimagelib_quicktime.so", "libopenimagelib_quicktime.dylib", "hdrflowimage_quicktime-vc80-d-0_5_0.dll", "hdrflowimage_quicktime-vc80-r-0_5_0.dll"'/>
</openimagelib>
</openlibraries>
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.opl 2008-03-04 22:38:22 UTC (rev 429)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.opl 2008-03-08 19:53:37 UTC (rev 430)
@@ -2,7 +2,7 @@
<openlibraries version="1.0">
<!-- plugins go here -->
<openmedialib name="oml" version="0.1.0">
- <plugin name="OpenLibraries oil plugin" type="input" extension='".*\.jpg/sequence:.*", ".*\.png/sequence:.*", ".*\.bmp/sequence:.*", ".*\.gif/sequence:.*", ".*\.tga/sequence:.*", ".*\.exr/sequence:.*", ".*\.sgi/sequence:.*", ".*\.rgb/sequence:.*", ".*\.rgba/sequence:.*", ".*\.la/sequence:.*", ".*\.bw/sequence:.*", ".*\.tif/sequence:.*", ".*\.tiff/sequence:.*", ".*\.dpx/sequence:.*", ".*\.hdr/sequence:.*", ".*\.cr2/sequence:.*", ".*\.raw/sequence:.*"' merit="0" filename='"libopenmedialib_oil.so", "libopenmedialib_oil.dylib", "hdrflowmedia_oil-vc80-d-0_5_0.dll", "hdrflowmedia_oil-vc80-r-0_5_0.dll"'/>
+ <plugin name="OpenLibraries oil plugin" type="input" extension='".*\.jpg/sequence:.*", ".*\.png/sequence:.*", ".*\.bmp/sequence:.*", ".*\.gif/sequence:.*", ".*\.tga/sequence:.*", ".*\.exr/sequence:.*", ".*\.sgi/sequence:.*", ".*\.rgb/sequence:.*", ".*\.rgba/sequence:.*", ".*\.la/sequence:.*", ".*\.bw/sequence:.*", ".*\.tif/sequence:.*", ".*\.tiff/sequence:.*", ".*\.dpx/sequence:.*", ".*\.hdr/sequence:.*", ".*\.cr2/sequence:.*", ".*\.raw/sequence:.*", ".*\.ppm/sequence:.*"' merit="0" filename='"libopenmedialib_oil.so", "libopenmedialib_oil.dylib", "hdrflowmedia_oil-vc80-d-0_5_0.dll", "hdrflowmedia_oil-vc80-r-0_5_0.dll"'/>
<plugin name="OpenLibraries oil plugin" type="output" extension='".*\.jpg/sequence:.*", ".*\.png/sequence:.*", ".*\.bmp/sequence:.*", ".*\.gif/sequence:.*", ".*\.tga/sequence:.*", ".*\.exr/sequence:.*", ".*\.sgi/sequence:.*", ".*\.rgb/sequence:.*", ".*\.rgba/sequence:.*", ".*\.la/sequence:.*", ".*\.bw/sequence:.*", ".*\.tif/sequence:.*", ".*\.tiff/sequence:.*", ".*\.dpx/sequence:.*"' merit="0" filename='"libopenmedialib_oil.so", "libopenmedialib_oil.dylib", "hdrflowmedia_oil-vc80-d-0_5_0.dll", "hdrflowmedia_oil-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.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X