hdrflow-svn Mailing List for HDRFlow (Page 6)
Status: Pre-Alpha
Brought to you by:
glslang
Menu
▾
▴
hdrflow-svn — HDRFlow SVN notifications
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
(30) |
May
(38) |
Jun
(22) |
Jul
(53) |
Aug
(66) |
Sep
(56) |
Oct
(29) |
Nov
(13) |
Dec
(6) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(16) |
Feb
(22) |
Mar
(12) |
Apr
(4) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(6) |
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
(12) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <gl...@us...> - 2007-09-30 19:20:14
|
Revision: 337
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=337&view=rev
Author: glslang
Date: 2007-09-30 12:20:13 -0700 (Sun, 30 Sep 2007)
Log Message:
-----------
+update to 0.5.0 (*nix)
Modified Paths:
--------------
trunk/lib/openlibraries/configure.ac
trunk/lib/openlibraries/test/openimagelib/GL/_2D_scale/_2D_scale.cpp
Modified: trunk/lib/openlibraries/configure.ac
===================================================================
--- trunk/lib/openlibraries/configure.ac 2007-09-30 18:52:11 UTC (rev 336)
+++ trunk/lib/openlibraries/configure.ac 2007-09-30 19:20:13 UTC (rev 337)
@@ -12,11 +12,11 @@
dnl Versioning
dnl
OL_MAJOR=0
-OL_MINOR=4
+OL_MINOR=5
OL_SUB=0
OL_LT_CURRENT=0
-OL_LT_REVISION=4
+OL_LT_REVISION=5
OL_LT_AGE=0
AC_SUBST(OL_MAJOR)
@@ -28,7 +28,7 @@
AC_SUBST(OL_LT_AGE)
dnl
-AM_INIT_AUTOMAKE("openlibraries", 0.4.0)
+AM_INIT_AUTOMAKE("openlibraries", 0.5.0)
dnl Check for programs
AC_PROG_CXX
Modified: trunk/lib/openlibraries/test/openimagelib/GL/_2D_scale/_2D_scale.cpp
===================================================================
--- trunk/lib/openlibraries/test/openimagelib/GL/_2D_scale/_2D_scale.cpp 2007-09-30 18:52:11 UTC (rev 336)
+++ trunk/lib/openlibraries/test/openimagelib/GL/_2D_scale/_2D_scale.cpp 2007-09-30 19:20:13 UTC (rev 337)
@@ -74,7 +74,7 @@
il::openimagelib_plugin_ptr plug = boost::shared_dynamic_cast<il::openimagelib_plugin>( i->create_plugin( "" ) );
if( !plug ) return 0;
- il::image_type_ptr image = plug->load( opl::make_stream( path, std::ios::in ) );
+ il::image_type_ptr image = plug->load( path );
if( !image ) return 0;
image = il::conform( image, il::cropped | il::flipped | il::flopped );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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-09-30 18:42:01
|
Revision: 335
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=335&view=rev
Author: glslang
Date: 2007-09-30 11:41:58 -0700 (Sun, 30 Sep 2007)
Log Message:
-----------
+ unity script update
Modified Paths:
--------------
trunk/unity.sh
Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh 2007-09-30 18:39:22 UTC (rev 334)
+++ trunk/unity.sh 2007-09-30 18:41:58 UTC (rev 335)
@@ -46,7 +46,7 @@
boost_new_version=1_34_1
update_olibs_version=0
-olibs_old_version=0.5.0
+olibs_old_version=0_4_0
olibs_new_version=0_5_0
build_frameworks=0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-09-30 18:39:24
|
Revision: 334
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=334&view=rev
Author: glslang
Date: 2007-09-30 11:39:22 -0700 (Sun, 30 Sep 2007)
Log Message:
-----------
+ bump olibs to 0.5.0 (take two)
Modified Paths:
--------------
trunk/lib/openlibraries/src/openassetlib/al/al_vc8.vcproj
trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite_vc8.vcproj
trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_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/jpg/jpg_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/png/png_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_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/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/glew/glew_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/plugins/quicktime/quicktime_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/plugins/template/template_vc8.vcproj
trunk/lib/openlibraries/src/openobjectlib/plugins/X3D/X3D_vc8.vcproj
trunk/lib/openlibraries/src/openobjectlib/plugins/obj/obj_vc8.vcproj
trunk/lib/openlibraries/src/openobjectlib/sg/sg_vc8.vcproj
trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj
Modified: trunk/lib/openlibraries/src/openassetlib/al/al_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openassetlib/al/al_vc8.vcproj 2007-09-30 18:38:21 UTC (rev 333)
+++ trunk/lib/openlibraries/src/openassetlib/al/al_vc8.vcproj 2007-09-30 18:39:22 UTC (rev 334)
@@ -67,12 +67,12 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openassetlib_al-vc80-d-0.5.0.dll"
+ OutputFile="$(OutDir)\openassetlib_al-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName);$(SolutionDir)\src\openmedialib\ml\$(ConfigurationName);$(SolutionDir)\src\openobjectlib\sg\$(ConfigurationName)"
GenerateDebugInformation="true"
SubSystem="2"
- ImportLibrary="$(TargetDir)openassetlib_al-vc80-d-0.5.0.lib"
+ ImportLibrary="$(TargetDir)openassetlib_al-vc80-d-0_5_0.lib"
TargetMachine="1"
/>
<Tool
@@ -150,14 +150,14 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)/openassetlib_al-vc80-r-0.5.0.dll"
+ OutputFile="$(OutDir)/openassetlib_al-vc80-r-0_5_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName);$(SolutionDir)\src\openmedialib\ml\$(ConfigurationName);$(SolutionDir)\src\openobjectlib\sg\$(ConfigurationName)"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- ImportLibrary="$(TargetDir)openassetlib_al-vc80-r-0.5.0.lib"
+ ImportLibrary="$(TargetDir)openassetlib_al-vc80-r-0_5_0.lib"
TargetMachine="1"
/>
<Tool
Modified: trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite_vc8.vcproj 2007-09-30 18:38:21 UTC (rev 333)
+++ trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite_vc8.vcproj 2007-09-30 18:39:22 UTC (rev 334)
@@ -67,7 +67,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="sqlite-vc71-d-3_2_7.lib"
- OutputFile="$(OutDir)\openassetlib_sqlite-vc80-d-0.5.0.dll"
+ OutputFile="$(OutDir)\openassetlib_sqlite-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)src\openpluginlib\pl\$(ConfigurationName)""
GenerateDebugInformation="true"
@@ -150,7 +150,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="sqlite-vc71-r-3_2_7.lib"
- OutputFile="$(OutDir)\openassetlib_sqlite-vc80-r-0.5.0.dll"
+ OutputFile="$(OutDir)\openassetlib_sqlite-vc80-r-0_5_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)src\openpluginlib\pl\$(ConfigurationName)""
GenerateDebugInformation="true"
Modified: trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj 2007-09-30 18:38:21 UTC (rev 333)
+++ trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj 2007-09-30 18:39:22 UTC (rev 334)
@@ -67,7 +67,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="Half.lib IlmImf.lib Iex.lib"
- OutputFile="$(OutDir)\openeffectslib_tonemap-vc80-d-0.5.0.dll"
+ OutputFile="$(OutDir)\openeffectslib_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"
GenerateDebugInformation="true"
@@ -151,7 +151,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="Half.lib IlmImf.lib Iex.lib"
- OutputFile="$(OutDir)\openeffectslib_tonemap-vc80-r-0.5.0.dll"
+ OutputFile="$(OutDir)\openeffectslib_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"
GenerateDebugInformation="true"
Modified: trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj 2007-09-30 18:38:21 UTC (rev 333)
+++ trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj 2007-09-30 18:39:22 UTC (rev 334)
@@ -72,14 +72,14 @@
Name="VCLinkerTool"
UseUnicodeResponseFiles="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)/openimagelib_il-vc80-d-0.5.0.dll"
+ OutputFile="$(OutDir)/openimagelib_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)openimagelib_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)/openimagelib_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)openimagelib_il-vc80-r-0_5_0.lib"
TargetMachine="1"
/>
<Tool
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_vc8.vcproj 2007-09-30 18:38:21 UTC (rev 333)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_vc8.vcproj 2007-09-30 18:39:22 UTC (rev 334)
@@ -68,7 +68,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openimagelib_3D_lightmap-vc80-d-0.5.0.dll"
+ OutputFile="$(OutDir)\openimagelib_3D_lightmap-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_3D_lightmap-vc80-r-0.5.0.dll"
+ OutputFile="$(OutDir)\openimagelib_3D_lightmap-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/bmp/bmp_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_vc8.vcproj 2007-09-30 18:38:21 UTC (rev 333)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_vc8.vcproj 2007-09-30 18:39:22 UTC (rev 334)
@@ -71,7 +71,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="gdiplus.lib"
- OutputFile="$(OutDir)/openimagelib_bmp-vc80-d-0.5.0.dll"
+ OutputFile="$(OutDir)/openimagelib_bmp-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
GenerateDebugInformation="true"
@@ -160,7 +160,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="gdiplus.lib"
- OutputFile="$(OutDir)/openimagelib_bmp-vc80-r-0.5.0.dll"
+ OutputFile="$(OutDir)/openimagelib_bmp-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/dds/dds_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.vcproj 2007-09-30 18:38:21 UTC (rev 333)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.vcproj 2007-09-30 18:39:22 UTC (rev 334)
@@ -68,7 +68,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openimagelib_dds-vc80-d-0.5.0.dll"
+ OutputFile="$(OutDir)\openimagelib_dds-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
GenerateDebugInformation="true"
@@ -153,7 +153,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openimagelib_dds-vc80-r-0.5.0.dll"
+ OutputFile="$(OutDir)\openimagelib_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 2007-09-30 18:38:21 UTC (rev 333)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_vc8.vcproj 2007-09-30 18:39:22 UTC (rev 334)
@@ -66,7 +66,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
ShowProgress="0"
- OutputFile="$(OutDir)\openimagelib_dpx-vc80-d-0.5.0.dll"
+ OutputFile="$(OutDir)\openimagelib_dpx-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)""
GenerateDebugInformation="true"
@@ -147,7 +147,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
- OutputFile="$(OutDir)\openimagelib_dpx-vc80-r-0.5.0.dll"
+ OutputFile="$(OutDir)\openimagelib_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 2007-09-30 18:38:21 UTC (rev 333)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj 2007-09-30 18:39:22 UTC (rev 334)
@@ -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)\openimagelib_exr-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)";C:\OpenEXR\lib\Debug"
GenerateDebugInformation="true"
@@ -152,7 +152,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="Half.lib IlmImf.lib Iex.lib"
- OutputFile="$(OutDir)\openimagelib_exr-vc80-r-0.5.0.dll"
+ OutputFile="$(OutDir)\openimagelib_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 2007-09-30 18:38:21 UTC (rev 333)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_vc8.vcproj 2007-09-30 18:39:22 UTC (rev 334)
@@ -68,7 +68,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="gdiplus.lib"
- OutputFile="$(OutDir)\openimagelib_gdi-vc80-d-0.5.0.dll"
+ OutputFile="$(OutDir)\openimagelib_gdi-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
GenerateDebugInformation="true"
@@ -152,7 +152,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="gdiplus.lib"
- OutputFile="$(OutDir)\openimagelib_gdi-vc80-r-0.5.0.dll"
+ OutputFile="$(OutDir)\openimagelib_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 2007-09-30 18:38:21 UTC (rev 333)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_vc8.vcproj 2007-09-30 18:39:22 UTC (rev 334)
@@ -70,7 +70,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openimagelib_hdr-vc80-d-0.5.0.dll"
+ OutputFile="$(OutDir)\openimagelib_hdr-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
GenerateDebugInformation="true"
@@ -155,7 +155,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openimagelib_hdr-vc80-r-0.5.0.dll"
+ OutputFile="$(OutDir)\openimagelib_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/jpg/jpg_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_vc8.vcproj 2007-09-30 18:38:21 UTC (rev 333)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_vc8.vcproj 2007-09-30 18:39:22 UTC (rev 334)
@@ -71,7 +71,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="libjpeg.lib libjpeghdr.lib"
- OutputFile="$(OutDir)/openimagelib_jpg-vc80-d-0.5.0.dll"
+ OutputFile="$(OutDir)/openimagelib_jpg-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;"C:\Program Files\HDR\lib""
IgnoreDefaultLibraryNames="libc.lib"
@@ -161,7 +161,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="libjpeg.lib libjpeghdr.lib"
- OutputFile="$(OutDir)/openimagelib_jpg-vc80-r-0.5.0.dll"
+ OutputFile="$(OutDir)/openimagelib_jpg-vc80-r-0_5_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;"C:\Program Files\HDR\lib""
IgnoreDefaultLibraryNames="libc.lib"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/png/png_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/png/png_vc8.vcproj 2007-09-30 18:38:21 UTC (rev 333)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/png/png_vc8.vcproj 2007-09-30 18:39:22 UTC (rev 334)
@@ -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)\openimagelib_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"
@@ -154,7 +154,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="libpng13.lib zdll.lib"
- OutputFile="$(OutDir)\openimagelib_png-vc80-r-0.5.0.dll"
+ OutputFile="$(OutDir)\openimagelib_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/psd/psd_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_vc8.vcproj 2007-09-30 18:38:21 UTC (rev 333)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_vc8.vcproj 2007-09-30 18:39:22 UTC (rev 334)
@@ -67,7 +67,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openimagelib_psd-vc80-d-0.5.0.dll"
+ OutputFile="$(OutDir)\openimagelib_psd-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
GenerateDebugInformation="true"
@@ -151,7 +151,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openimagelib_psd-vc80-r-0.5.0.dll"
+ OutputFile="$(OutDir)\openimagelib_psd-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/quicktime/quicktime_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_vc8.vcproj 2007-09-30 18:38:21 UTC (rev 333)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_vc8.vcproj 2007-09-30 18:39:22 UTC (rev 334)
@@ -68,7 +68,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="qtmlClient.lib"
- OutputFile="$(OutDir)\openimagelib_quicktime-vc80-d-0.5.0.dll"
+ OutputFile="$(OutDir)\openimagelib_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"
@@ -153,7 +153,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="qtmlClient.lib"
- OutputFile="$(OutDir)\openimagelib_quicktime-vc80-r-0.5.0.dll"
+ OutputFile="$(OutDir)\openimagelib_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 2007-09-30 18:38:21 UTC (rev 333)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_vc8.vcproj 2007-09-30 18:39:22 UTC (rev 334)
@@ -67,7 +67,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openimagelib_sgi-vc80-d-0.5.0.dll"
+ OutputFile="$(OutDir)\openimagelib_sgi-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
GenerateDebugInformation="true"
@@ -151,7 +151,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openimagelib_sgi-vc80-r-0.5.0.dll"
+ OutputFile="$(OutDir)\openimagelib_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 2007-09-30 18:38:21 UTC (rev 333)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_vc8.vcproj 2007-09-30 18:39:22 UTC (rev 334)
@@ -68,7 +68,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openimagelib_tga-vc80-d-0.5.0.dll"
+ OutputFile="$(OutDir)\openimagelib_tga-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
GenerateDebugInformation="true"
@@ -153,7 +153,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openimagelib_tga-vc80-r-0.5.0.dll"
+ OutputFile="$(OutDir)\openimagelib_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 2007-09-30 18:38:21 UTC (rev 333)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_vc8.vcproj 2007-09-30 18:39:22 UTC (rev 334)
@@ -66,7 +66,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="libtiff.lib"
- OutputFile="$(OutDir)\openimagelib_tiff-vc80-d-0.5.0.dll"
+ OutputFile="$(OutDir)\openimagelib_tiff-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\libtiff\lib"
IgnoreDefaultLibraryNames="msvcrt.lib"
@@ -150,7 +150,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="libtiff.lib"
- OutputFile="$(OutDir)\openimagelib_tiff-vc80-r-0.5.0.dll"
+ OutputFile="$(OutDir)\openimagelib_tiff-vc80-r-0_5_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\libtiff\lib"
IgnoreDefaultLibraryNames=""
Modified: trunk/lib/openlibraries/src/openmedialib/ml/ml_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/ml/ml_vc8.vcproj 2007-09-30 18:38:21 UTC (rev 333)
+++ trunk/lib/openlibraries/src/openmedialib/ml/ml_vc8.vcproj 2007-09-30 18:39:22 UTC (rev 334)
@@ -67,12 +67,12 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openmedialib_ml-vc80-d-0.5.0.dll"
+ OutputFile="$(OutDir)\openmedialib_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)openmedialib_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)\openmedialib_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)openmedialib_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 2007-09-30 18:38:21 UTC (rev 333)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_vc8.vcproj 2007-09-30 18:39:22 UTC (rev 334)
@@ -68,7 +68,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalDependencies="avcodec-51.lib avformat-51.lib avutil-49.lib"
- OutputFile="$(OutDir)\openmedialib_avformat-vc80-d-0.5.0.dll"
+ OutputFile="$(OutDir)\openmedialib_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""
GenerateDebugInformation="true"
@@ -152,7 +152,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalDependencies="avcodec-51.lib avformat-51.lib avutil-49.lib"
- OutputFile="$(OutDir)\openmedialib_avformat-vc80-r-0.5.0.dll"
+ OutputFile="$(OutDir)\openmedialib_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""
GenerateDebugInformation="true"
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_vc8.vcproj 2007-09-30 18:38:21 UTC (rev 333)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_vc8.vcproj 2007-09-30 18:39:22 UTC (rev 334)
@@ -67,7 +67,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openmedialib_gensys-vc80-d-0.5.0.dll"
+ OutputFile="$(OutDir)\openmedialib_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"
@@ -150,7 +150,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openmedialib_gensys-vc80-r-0.5.0.dll"
+ OutputFile="$(OutDir)\openmedialib_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/glew/glew_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/glew/glew_vc8.vcproj 2007-09-30 18:38:21 UTC (rev 333)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/glew/glew_vc8.vcproj 2007-09-30 18:39:22 UTC (rev 334)
@@ -68,7 +68,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalDependencies="glew32.lib"
- OutputFile="$(OutDir)\openmedialib_glew-vc80-d-0.5.0.dll"
+ OutputFile="$(OutDir)\openmedialib_glew-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"
@@ -151,7 +151,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalDependencies="glew32.lib"
- OutputFile="$(OutDir)\openmedialib_glew-vc80-r-0.5.0.dll"
+ OutputFile="$(OutDir)\openmedialib_glew-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/ofx/ofx_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_vc8.vcproj 2007-09-30 18:38:21 UTC (rev 333)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_vc8.vcproj 2007-09-30 18:39:22 UTC (rev 334)
@@ -66,7 +66,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openmedialib_ofx-vc80-d-0.5.0.dll"
+ OutputFile="$(OutDir)\openmedialib_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"
@@ -148,7 +148,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openmedialib_ofx-vc80-r-0.5.0.dll"
+ OutputFile="$(OutDir)\openmedialib_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 2007-09-30 18:38:21 UTC (rev 333)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_vc8.vcproj 2007-09-30 18:39:22 UTC (rev 334)
@@ -68,7 +68,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openmedialib_oil-vc80-d-0.5.0.dll"
+ OutputFile="$(OutDir)\openmedialib_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"
@@ -151,7 +151,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openmedialib_oil-vc80-r-0.5.0.dll"
+ OutputFile="$(OutDir)\openmedialib_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 2007-09-30 18:38:21 UTC (rev 333)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/openal/openal_vc8.vcproj 2007-09-30 18:39:22 UTC (rev 334)
@@ -68,7 +68,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalDependencies="OpenAL32.lib"
- OutputFile="$(OutDir)\openmedialib_openal-vc80-d-0.5.0.dll"
+ OutputFile="$(OutDir)\openmedialib_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""
GenerateDebugInformation="true"
@@ -151,7 +151,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalDependencies="OpenAL32.lib"
- OutputFile="$(OutDir)\openmedialib_openal-vc80-r-0.5.0.dll"
+ OutputFile="$(OutDir)\openmedialib_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""
GenerateDebugInformation="true"
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_vc8.vcproj 2007-09-30 18:38:21 UTC (rev 333)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_vc8.vcproj 2007-09-30 18:39:22 UTC (rev 334)
@@ -68,7 +68,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="CVClient.lib QTMLClient.lib"
- OutputFile="$(OutDir)\openmedialib_quicktime-vc80-d-0.5.0.dll"
+ OutputFile="$(OutDir)\openmedialib_quicktime-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\QuickTime SDK\Libraries""
GenerateDebugInformation="true"
@@ -152,7 +152,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="CVClient.lib QTMLClient.lib"
- OutputFile="$(OutDir)\openmedialib_quicktime-vc80-r-0.5.0.dll"
+ OutputFile="$(OutDir)\openmedialib_quicktime-vc80-r-0_5_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)";"C:\Program Files\QuickTime SDK\Libraries""
GenerateDebugInformation="true"
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/template/template_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/template/template_vc8.vcproj 2007-09-30 18:38:21 UTC (rev 333)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/template/template_vc8.vcproj 2007-09-30 18:39:22 UTC (rev 334)
@@ -67,7 +67,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
- OutputFile="$(OutDir)\openmedialib_template-vc80-d-0.5.0.dll"
+ OutputFile="$(OutDir)\openmedialib_template-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 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
- OutputFile="$(OutDir)\openmedialib_template-vc80-r-0.5.0.dll"
+ OutputFile="$(OutDir)\openmedialib_template-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/openobjectlib/plugins/X3D/X3D_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openobjectlib/plugins/X3D/X3D_vc8.vcproj 2007-09-30 18:38:21 UTC (rev 333)
+++ trunk/lib/openlibraries/src/openobjectlib/plugins/X3D/X3D_vc8.vcproj 2007-09-30 18:39:22 UTC (rev 334)
@@ -72,7 +72,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)/openobjectlib_x3d-vc80-d-0.5.0.dll"
+ OutputFile="$(OutDir)/openobjectlib_x3d-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
GenerateDebugInformation="true"
@@ -160,7 +160,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)/openobjectlib_x3d-vc80-r-0.5.0.dll"
+ OutputFile="$(OutDir)/openobjectlib_x3d-vc80-r-0_5_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
GenerateDebugInformation="false"
Modified: trunk/lib/openlibraries/src/openobjectlib/plugins/obj/obj_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openobjectlib/plugins/obj/obj_vc8.vcproj 2007-09-30 18:38:21 UTC (rev 333)
+++ trunk/lib/openlibraries/src/openobjectlib/plugins/obj/obj_vc8.vcproj 2007-09-30 18:39:22 UTC (rev 334)
@@ -69,7 +69,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)/openobjectlib_obj-vc80-d-0.5.0.dll"
+ OutputFile="$(OutDir)/openobjectlib_obj-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
GenerateDebugInformation="true"
@@ -155,7 +155,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)/openobjectlib_obj-vc80-r-0.5.0.dll"
+ OutputFile="$(OutDir)/openobjectlib_obj-vc80-r-0_5_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
GenerateDebugInformation="false"
Modified: trunk/lib/openlibraries/src/openobjectlib/sg/sg_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openobjectlib/sg/sg_vc8.vcproj 2007-09-30 18:38:21 UTC (rev 333)
+++ trunk/lib/openlibraries/src/openobjectlib/sg/sg_vc8.vcproj 2007-09-30 18:39:22 UTC (rev 334)
@@ -74,13 +74,13 @@
IgnoreImportLibrary="false"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="opengl32.lib glu32.lib glew32.lib cg.lib cgGL.lib"
- OutputFile="$(OutDir)/openobjectlib_sg-vc80-d-0.5.0.dll"
+ OutputFile="$(OutDir)/openobjectlib_sg-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;"C:\Program Files\NVIDIA Corporation\Cg\lib";$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/sg.pdb"
SubSystem="2"
- ImportLibrary="$(TargetDir)openobjectlib_sg-vc80-d-0.5.0.lib"
+ ImportLibrary="$(TargetDir)openobjectlib_sg-vc80-d-0_5_0.lib"
TargetMachine="1"
/>
<Tool
@@ -163,14 +163,14 @@
IgnoreImportLibrary="false"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="opengl32.lib glu32.lib glew32.lib cg.lib cgGL.lib"
- OutputFile="$(OutDir)/openobjectlib_sg-vc80-r-0.5.0.dll"
+ OutputFile="$(OutDir)/openobjectlib_sg-vc80-r-0_5_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;"C:\Program Files\NVIDIA Corporation\Cg\lib";$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
GenerateDebugInformation="false"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- ImportLibrary="$(TargetDir)openobjectlib_sg-vc80-r-0.5.0.lib"
+ ImportLibrary="$(TargetDir)openobjectlib_sg-vc80-r-0_5_0.lib"
TargetMachine="1"
/>
<Tool
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj 2007-09-30 18:38:21 UTC (rev 333)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj 2007-09-30 18:39:22 UTC (rev 334)
@@ -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)/openpluginlib_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)openpluginlib_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)/openpluginlib_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)openpluginlib_pl-vc80-r-0_5_0.lib"
TargetMachine="1"
/>
<Tool
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-09-30 18:38:23
|
Revision: 333
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=333&view=rev
Author: glslang
Date: 2007-09-30 11:38:21 -0700 (Sun, 30 Sep 2007)
Log Message:
-----------
+ bump olibs to 0.5.0 (take two)
Modified Paths:
--------------
trunk/unity.sh
Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh 2007-09-30 18:30:54 UTC (rev 332)
+++ trunk/unity.sh 2007-09-30 18:38:21 UTC (rev 333)
@@ -46,8 +46,8 @@
boost_new_version=1_34_1
update_olibs_version=0
-olibs_old_version=0.4.0
-olibs_new_version=0.5.0
+olibs_old_version=0.5.0
+olibs_new_version=0_5_0
build_frameworks=0
build_umbrella=0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-09-30 18:30:57
|
Revision: 332
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=332&view=rev
Author: glslang
Date: 2007-09-30 11:30:54 -0700 (Sun, 30 Sep 2007)
Log Message:
-----------
+ bump olibs to 0.5.0
Modified Paths:
--------------
trunk/lib/openlibraries/src/openassetlib/al/al_vc8.vcproj
trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite_vc8.vcproj
trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_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/jpg/jpg_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/png/png_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_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/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/glew/glew_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/plugins/quicktime/quicktime_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/plugins/template/template_vc8.vcproj
trunk/lib/openlibraries/src/openobjectlib/plugins/X3D/X3D_vc8.vcproj
trunk/lib/openlibraries/src/openobjectlib/plugins/obj/obj_vc8.vcproj
trunk/lib/openlibraries/src/openobjectlib/sg/sg_vc8.vcproj
trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj
Modified: trunk/lib/openlibraries/src/openassetlib/al/al_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openassetlib/al/al_vc8.vcproj 2007-09-30 17:50:37 UTC (rev 331)
+++ trunk/lib/openlibraries/src/openassetlib/al/al_vc8.vcproj 2007-09-30 18:30:54 UTC (rev 332)
@@ -67,12 +67,12 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openassetlib_al-vc80-d-0_4_0.dll"
+ OutputFile="$(OutDir)\openassetlib_al-vc80-d-0.5.0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName);$(SolutionDir)\src\openmedialib\ml\$(ConfigurationName);$(SolutionDir)\src\openobjectlib\sg\$(ConfigurationName)"
GenerateDebugInformation="true"
SubSystem="2"
- ImportLibrary="$(TargetDir)openassetlib_al-vc80-d-0_4_0.lib"
+ ImportLibrary="$(TargetDir)openassetlib_al-vc80-d-0.5.0.lib"
TargetMachine="1"
/>
<Tool
@@ -150,14 +150,14 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)/openassetlib_al-vc80-r-0_4_0.dll"
+ OutputFile="$(OutDir)/openassetlib_al-vc80-r-0.5.0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName);$(SolutionDir)\src\openmedialib\ml\$(ConfigurationName);$(SolutionDir)\src\openobjectlib\sg\$(ConfigurationName)"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- ImportLibrary="$(TargetDir)openassetlib_al-vc80-r-0_4_0.lib"
+ ImportLibrary="$(TargetDir)openassetlib_al-vc80-r-0.5.0.lib"
TargetMachine="1"
/>
<Tool
Modified: trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite_vc8.vcproj 2007-09-30 17:50:37 UTC (rev 331)
+++ trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite_vc8.vcproj 2007-09-30 18:30:54 UTC (rev 332)
@@ -67,7 +67,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="sqlite-vc71-d-3_2_7.lib"
- OutputFile="$(OutDir)\openassetlib_sqlite-vc80-d-0_4_0.dll"
+ OutputFile="$(OutDir)\openassetlib_sqlite-vc80-d-0.5.0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)src\openpluginlib\pl\$(ConfigurationName)""
GenerateDebugInformation="true"
@@ -150,7 +150,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="sqlite-vc71-r-3_2_7.lib"
- OutputFile="$(OutDir)\openassetlib_sqlite-vc80-r-0_4_0.dll"
+ OutputFile="$(OutDir)\openassetlib_sqlite-vc80-r-0.5.0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)src\openpluginlib\pl\$(ConfigurationName)""
GenerateDebugInformation="true"
Modified: trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj 2007-09-30 17:50:37 UTC (rev 331)
+++ trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj 2007-09-30 18:30:54 UTC (rev 332)
@@ -67,7 +67,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="Half.lib IlmImf.lib Iex.lib"
- OutputFile="$(OutDir)\openeffectslib_tonemap-vc80-d-0_4_0.dll"
+ OutputFile="$(OutDir)\openeffectslib_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"
GenerateDebugInformation="true"
@@ -151,7 +151,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="Half.lib IlmImf.lib Iex.lib"
- OutputFile="$(OutDir)\openeffectslib_tonemap-vc80-r-0_4_0.dll"
+ OutputFile="$(OutDir)\openeffectslib_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"
GenerateDebugInformation="true"
Modified: trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj 2007-09-30 17:50:37 UTC (rev 331)
+++ trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj 2007-09-30 18:30:54 UTC (rev 332)
@@ -72,14 +72,14 @@
Name="VCLinkerTool"
UseUnicodeResponseFiles="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)/openimagelib_il-vc80-d-0_4_0.dll"
+ OutputFile="$(OutDir)/openimagelib_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_4_0.lib"
+ ImportLibrary="$(TargetDir)openimagelib_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_4_0.dll"
+ OutputFile="$(OutDir)/openimagelib_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_4_0.lib"
+ ImportLibrary="$(TargetDir)openimagelib_il-vc80-r-0.5.0.lib"
TargetMachine="1"
/>
<Tool
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_vc8.vcproj 2007-09-30 17:50:37 UTC (rev 331)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_vc8.vcproj 2007-09-30 18:30:54 UTC (rev 332)
@@ -68,7 +68,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openimagelib_3D_lightmap-vc80-d-0_4_0.dll"
+ OutputFile="$(OutDir)\openimagelib_3D_lightmap-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_3D_lightmap-vc80-r-0_4_0.dll"
+ OutputFile="$(OutDir)\openimagelib_3D_lightmap-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/bmp/bmp_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_vc8.vcproj 2007-09-30 17:50:37 UTC (rev 331)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_vc8.vcproj 2007-09-30 18:30:54 UTC (rev 332)
@@ -71,7 +71,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="gdiplus.lib"
- OutputFile="$(OutDir)/openimagelib_bmp-vc80-d-0_4_0.dll"
+ OutputFile="$(OutDir)/openimagelib_bmp-vc80-d-0.5.0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
GenerateDebugInformation="true"
@@ -160,7 +160,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="gdiplus.lib"
- OutputFile="$(OutDir)/openimagelib_bmp-vc80-r-0_4_0.dll"
+ OutputFile="$(OutDir)/openimagelib_bmp-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/dds/dds_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.vcproj 2007-09-30 17:50:37 UTC (rev 331)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.vcproj 2007-09-30 18:30:54 UTC (rev 332)
@@ -68,7 +68,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openimagelib_dds-vc80-d-0_4_0.dll"
+ OutputFile="$(OutDir)\openimagelib_dds-vc80-d-0.5.0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
GenerateDebugInformation="true"
@@ -153,7 +153,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openimagelib_dds-vc80-r-0_4_0.dll"
+ OutputFile="$(OutDir)\openimagelib_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 2007-09-30 17:50:37 UTC (rev 331)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_vc8.vcproj 2007-09-30 18:30:54 UTC (rev 332)
@@ -66,7 +66,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
ShowProgress="0"
- OutputFile="$(OutDir)\openimagelib_dpx-vc80-d-0_4_0.dll"
+ OutputFile="$(OutDir)\openimagelib_dpx-vc80-d-0.5.0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)""
GenerateDebugInformation="true"
@@ -147,7 +147,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
- OutputFile="$(OutDir)\openimagelib_dpx-vc80-r-0_4_0.dll"
+ OutputFile="$(OutDir)\openimagelib_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 2007-09-30 17:50:37 UTC (rev 331)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj 2007-09-30 18:30:54 UTC (rev 332)
@@ -68,7 +68,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="Half.lib IlmImf.lib Iex.lib"
- OutputFile="$(OutDir)\openimagelib_exr-vc80-d-0_4_0.dll"
+ OutputFile="$(OutDir)\openimagelib_exr-vc80-d-0.5.0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)";C:\OpenEXR\lib\Debug"
GenerateDebugInformation="true"
@@ -152,7 +152,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="Half.lib IlmImf.lib Iex.lib"
- OutputFile="$(OutDir)\openimagelib_exr-vc80-r-0_4_0.dll"
+ OutputFile="$(OutDir)\openimagelib_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 2007-09-30 17:50:37 UTC (rev 331)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_vc8.vcproj 2007-09-30 18:30:54 UTC (rev 332)
@@ -68,7 +68,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="gdiplus.lib"
- OutputFile="$(OutDir)\openimagelib_gdi-vc80-d-0_4_0.dll"
+ OutputFile="$(OutDir)\openimagelib_gdi-vc80-d-0.5.0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
GenerateDebugInformation="true"
@@ -152,7 +152,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="gdiplus.lib"
- OutputFile="$(OutDir)\openimagelib_gdi-vc80-r-0_4_0.dll"
+ OutputFile="$(OutDir)\openimagelib_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 2007-09-30 17:50:37 UTC (rev 331)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_vc8.vcproj 2007-09-30 18:30:54 UTC (rev 332)
@@ -70,7 +70,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openimagelib_hdr-vc80-d-0_4_0.dll"
+ OutputFile="$(OutDir)\openimagelib_hdr-vc80-d-0.5.0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
GenerateDebugInformation="true"
@@ -155,7 +155,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openimagelib_hdr-vc80-r-0_4_0.dll"
+ OutputFile="$(OutDir)\openimagelib_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/jpg/jpg_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_vc8.vcproj 2007-09-30 17:50:37 UTC (rev 331)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_vc8.vcproj 2007-09-30 18:30:54 UTC (rev 332)
@@ -71,7 +71,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="libjpeg.lib libjpeghdr.lib"
- OutputFile="$(OutDir)/openimagelib_jpg-vc80-d-0_4_0.dll"
+ OutputFile="$(OutDir)/openimagelib_jpg-vc80-d-0.5.0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;"C:\Program Files\HDR\lib""
IgnoreDefaultLibraryNames="libc.lib"
@@ -161,7 +161,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="libjpeg.lib libjpeghdr.lib"
- OutputFile="$(OutDir)/openimagelib_jpg-vc80-r-0_4_0.dll"
+ OutputFile="$(OutDir)/openimagelib_jpg-vc80-r-0.5.0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;"C:\Program Files\HDR\lib""
IgnoreDefaultLibraryNames="libc.lib"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/png/png_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/png/png_vc8.vcproj 2007-09-30 17:50:37 UTC (rev 331)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/png/png_vc8.vcproj 2007-09-30 18:30:54 UTC (rev 332)
@@ -68,7 +68,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="libpng13.lib zdll.lib"
- OutputFile="$(OutDir)\openimagelib_png-vc80-d-0_4_0.dll"
+ OutputFile="$(OutDir)\openimagelib_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"
@@ -154,7 +154,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="libpng13.lib zdll.lib"
- OutputFile="$(OutDir)\openimagelib_png-vc80-r-0_4_0.dll"
+ OutputFile="$(OutDir)\openimagelib_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/psd/psd_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_vc8.vcproj 2007-09-30 17:50:37 UTC (rev 331)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_vc8.vcproj 2007-09-30 18:30:54 UTC (rev 332)
@@ -67,7 +67,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openimagelib_psd-vc80-d-0_4_0.dll"
+ OutputFile="$(OutDir)\openimagelib_psd-vc80-d-0.5.0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
GenerateDebugInformation="true"
@@ -151,7 +151,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openimagelib_psd-vc80-r-0_4_0.dll"
+ OutputFile="$(OutDir)\openimagelib_psd-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/quicktime/quicktime_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_vc8.vcproj 2007-09-30 17:50:37 UTC (rev 331)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_vc8.vcproj 2007-09-30 18:30:54 UTC (rev 332)
@@ -68,7 +68,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="qtmlClient.lib"
- OutputFile="$(OutDir)\openimagelib_quicktime-vc80-d-0_4_0.dll"
+ OutputFile="$(OutDir)\openimagelib_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"
@@ -153,7 +153,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="qtmlClient.lib"
- OutputFile="$(OutDir)\openimagelib_quicktime-vc80-r-0_4_0.dll"
+ OutputFile="$(OutDir)\openimagelib_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 2007-09-30 17:50:37 UTC (rev 331)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_vc8.vcproj 2007-09-30 18:30:54 UTC (rev 332)
@@ -67,7 +67,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openimagelib_sgi-vc80-d-0_4_0.dll"
+ OutputFile="$(OutDir)\openimagelib_sgi-vc80-d-0.5.0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
GenerateDebugInformation="true"
@@ -151,7 +151,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openimagelib_sgi-vc80-r-0_4_0.dll"
+ OutputFile="$(OutDir)\openimagelib_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 2007-09-30 17:50:37 UTC (rev 331)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_vc8.vcproj 2007-09-30 18:30:54 UTC (rev 332)
@@ -68,7 +68,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openimagelib_tga-vc80-d-0_4_0.dll"
+ OutputFile="$(OutDir)\openimagelib_tga-vc80-d-0.5.0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
GenerateDebugInformation="true"
@@ -153,7 +153,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openimagelib_tga-vc80-r-0_4_0.dll"
+ OutputFile="$(OutDir)\openimagelib_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 2007-09-30 17:50:37 UTC (rev 331)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_vc8.vcproj 2007-09-30 18:30:54 UTC (rev 332)
@@ -66,7 +66,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="libtiff.lib"
- OutputFile="$(OutDir)\openimagelib_tiff-vc80-d-0_4_0.dll"
+ OutputFile="$(OutDir)\openimagelib_tiff-vc80-d-0.5.0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\libtiff\lib"
IgnoreDefaultLibraryNames="msvcrt.lib"
@@ -150,7 +150,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="libtiff.lib"
- OutputFile="$(OutDir)\openimagelib_tiff-vc80-r-0_4_0.dll"
+ OutputFile="$(OutDir)\openimagelib_tiff-vc80-r-0.5.0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\libtiff\lib"
IgnoreDefaultLibraryNames=""
Modified: trunk/lib/openlibraries/src/openmedialib/ml/ml_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/ml/ml_vc8.vcproj 2007-09-30 17:50:37 UTC (rev 331)
+++ trunk/lib/openlibraries/src/openmedialib/ml/ml_vc8.vcproj 2007-09-30 18:30:54 UTC (rev 332)
@@ -67,12 +67,12 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openmedialib_ml-vc80-d-0_4_0.dll"
+ OutputFile="$(OutDir)\openmedialib_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_4_0.lib"
+ ImportLibrary="$(TargetDir)openmedialib_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_4_0.dll"
+ OutputFile="$(OutDir)\openmedialib_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_4_0.lib"
+ ImportLibrary="$(TargetDir)openmedialib_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 2007-09-30 17:50:37 UTC (rev 331)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_vc8.vcproj 2007-09-30 18:30:54 UTC (rev 332)
@@ -68,7 +68,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalDependencies="avcodec-51.lib avformat-51.lib avutil-49.lib"
- OutputFile="$(OutDir)\openmedialib_avformat-vc80-d-0_4_0.dll"
+ OutputFile="$(OutDir)\openmedialib_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""
GenerateDebugInformation="true"
@@ -152,7 +152,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalDependencies="avcodec-51.lib avformat-51.lib avutil-49.lib"
- OutputFile="$(OutDir)\openmedialib_avformat-vc80-r-0_4_0.dll"
+ OutputFile="$(OutDir)\openmedialib_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""
GenerateDebugInformation="true"
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_vc8.vcproj 2007-09-30 17:50:37 UTC (rev 331)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_vc8.vcproj 2007-09-30 18:30:54 UTC (rev 332)
@@ -67,7 +67,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openmedialib_gensys-vc80-d-0_4_0.dll"
+ OutputFile="$(OutDir)\openmedialib_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"
@@ -150,7 +150,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openmedialib_gensys-vc80-r-0_4_0.dll"
+ OutputFile="$(OutDir)\openmedialib_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/glew/glew_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/glew/glew_vc8.vcproj 2007-09-30 17:50:37 UTC (rev 331)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/glew/glew_vc8.vcproj 2007-09-30 18:30:54 UTC (rev 332)
@@ -68,7 +68,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalDependencies="glew32.lib"
- OutputFile="$(OutDir)\openmedialib_glew-vc80-d-0_4_0.dll"
+ OutputFile="$(OutDir)\openmedialib_glew-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"
@@ -151,7 +151,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalDependencies="glew32.lib"
- OutputFile="$(OutDir)\openmedialib_glew-vc80-r-0_4_0.dll"
+ OutputFile="$(OutDir)\openmedialib_glew-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/ofx/ofx_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_vc8.vcproj 2007-09-30 17:50:37 UTC (rev 331)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_vc8.vcproj 2007-09-30 18:30:54 UTC (rev 332)
@@ -66,7 +66,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openmedialib_ofx-vc80-d-0_4_0.dll"
+ OutputFile="$(OutDir)\openmedialib_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"
@@ -148,7 +148,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openmedialib_ofx-vc80-r-0_4_0.dll"
+ OutputFile="$(OutDir)\openmedialib_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 2007-09-30 17:50:37 UTC (rev 331)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_vc8.vcproj 2007-09-30 18:30:54 UTC (rev 332)
@@ -68,7 +68,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openmedialib_oil-vc80-d-0_4_0.dll"
+ OutputFile="$(OutDir)\openmedialib_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"
@@ -151,7 +151,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openmedialib_oil-vc80-r-0_4_0.dll"
+ OutputFile="$(OutDir)\openmedialib_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 2007-09-30 17:50:37 UTC (rev 331)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/openal/openal_vc8.vcproj 2007-09-30 18:30:54 UTC (rev 332)
@@ -68,7 +68,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalDependencies="OpenAL32.lib"
- OutputFile="$(OutDir)\openmedialib_openal-vc80-d-0_4_0.dll"
+ OutputFile="$(OutDir)\openmedialib_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""
GenerateDebugInformation="true"
@@ -151,7 +151,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalDependencies="OpenAL32.lib"
- OutputFile="$(OutDir)\openmedialib_openal-vc80-r-0_4_0.dll"
+ OutputFile="$(OutDir)\openmedialib_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""
GenerateDebugInformation="true"
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_vc8.vcproj 2007-09-30 17:50:37 UTC (rev 331)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_vc8.vcproj 2007-09-30 18:30:54 UTC (rev 332)
@@ -68,7 +68,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="CVClient.lib QTMLClient.lib"
- OutputFile="$(OutDir)\openmedialib_quicktime-vc80-d-0_4_0.dll"
+ OutputFile="$(OutDir)\openmedialib_quicktime-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\QuickTime SDK\Libraries""
GenerateDebugInformation="true"
@@ -152,7 +152,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="CVClient.lib QTMLClient.lib"
- OutputFile="$(OutDir)\openmedialib_quicktime-vc80-r-0_4_0.dll"
+ OutputFile="$(OutDir)\openmedialib_quicktime-vc80-r-0.5.0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)";"C:\Program Files\QuickTime SDK\Libraries""
GenerateDebugInformation="true"
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/template/template_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/template/template_vc8.vcproj 2007-09-30 17:50:37 UTC (rev 331)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/template/template_vc8.vcproj 2007-09-30 18:30:54 UTC (rev 332)
@@ -67,7 +67,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
- OutputFile="$(OutDir)\openmedialib_template-vc80-d-0_4_0.dll"
+ OutputFile="$(OutDir)\openmedialib_template-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 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
- OutputFile="$(OutDir)\openmedialib_template-vc80-r-0_4_0.dll"
+ OutputFile="$(OutDir)\openmedialib_template-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/openobjectlib/plugins/X3D/X3D_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openobjectlib/plugins/X3D/X3D_vc8.vcproj 2007-09-30 17:50:37 UTC (rev 331)
+++ trunk/lib/openlibraries/src/openobjectlib/plugins/X3D/X3D_vc8.vcproj 2007-09-30 18:30:54 UTC (rev 332)
@@ -72,7 +72,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)/openobjectlib_x3d-vc80-d-0_4_0.dll"
+ OutputFile="$(OutDir)/openobjectlib_x3d-vc80-d-0.5.0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
GenerateDebugInformation="true"
@@ -160,7 +160,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)/openobjectlib_x3d-vc80-r-0_4_0.dll"
+ OutputFile="$(OutDir)/openobjectlib_x3d-vc80-r-0.5.0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
GenerateDebugInformation="false"
Modified: trunk/lib/openlibraries/src/openobjectlib/plugins/obj/obj_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openobjectlib/plugins/obj/obj_vc8.vcproj 2007-09-30 17:50:37 UTC (rev 331)
+++ trunk/lib/openlibraries/src/openobjectlib/plugins/obj/obj_vc8.vcproj 2007-09-30 18:30:54 UTC (rev 332)
@@ -69,7 +69,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)/openobjectlib_obj-vc80-d-0_4_0.dll"
+ OutputFile="$(OutDir)/openobjectlib_obj-vc80-d-0.5.0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
GenerateDebugInformation="true"
@@ -155,7 +155,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)/openobjectlib_obj-vc80-r-0_4_0.dll"
+ OutputFile="$(OutDir)/openobjectlib_obj-vc80-r-0.5.0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
GenerateDebugInformation="false"
Modified: trunk/lib/openlibraries/src/openobjectlib/sg/sg_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openobjectlib/sg/sg_vc8.vcproj 2007-09-30 17:50:37 UTC (rev 331)
+++ trunk/lib/openlibraries/src/openobjectlib/sg/sg_vc8.vcproj 2007-09-30 18:30:54 UTC (rev 332)
@@ -74,13 +74,13 @@
IgnoreImportLibrary="false"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="opengl32.lib glu32.lib glew32.lib cg.lib cgGL.lib"
- OutputFile="$(OutDir)/openobjectlib_sg-vc80-d-0_4_0.dll"
+ OutputFile="$(OutDir)/openobjectlib_sg-vc80-d-0.5.0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;"C:\Program Files\NVIDIA Corporation\Cg\lib";$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/sg.pdb"
SubSystem="2"
- ImportLibrary="$(TargetDir)openobjectlib_sg-vc80-d-0_4_0.lib"
+ ImportLibrary="$(TargetDir)openobjectlib_sg-vc80-d-0.5.0.lib"
TargetMachine="1"
/>
<Tool
@@ -163,14 +163,14 @@
IgnoreImportLibrary="false"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="opengl32.lib glu32.lib glew32.lib cg.lib cgGL.lib"
- OutputFile="$(OutDir)/openobjectlib_sg-vc80-r-0_4_0.dll"
+ OutputFile="$(OutDir)/openobjectlib_sg-vc80-r-0.5.0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;"C:\Program Files\NVIDIA Corporation\Cg\lib";$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
GenerateDebugInformation="false"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- ImportLibrary="$(TargetDir)openobjectlib_sg-vc80-r-0_4_0.lib"
+ ImportLibrary="$(TargetDir)openobjectlib_sg-vc80-r-0.5.0.lib"
TargetMachine="1"
/>
<Tool
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj 2007-09-30 17:50:37 UTC (rev 331)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj 2007-09-30 18:30:54 UTC (rev 332)
@@ -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_4_0.dll"
+ OutputFile="$(OutDir)/openpluginlib_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_4_0.lib"
+ ImportLibrary="$(TargetDir)openpluginlib_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_4_0.dll"
+ OutputFile="$(OutDir)/openpluginlib_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_4_0.lib"
+ ImportLibrary="$(TargetDir)openpluginlib_pl-vc80-r-0.5.0.lib"
TargetMachine="1"
/>
<Tool
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-09-30 17:50:39
|
Revision: 331
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=331&view=rev
Author: glslang
Date: 2007-09-30 10:50:37 -0700 (Sun, 30 Sep 2007)
Log Message:
-----------
+ encode to float by normalising to [0.0-1.0]. Workaround for maya plugin release
Modified Paths:
--------------
trunk/lib/extras/src/imf/mfn/mfn.cpp
trunk/lib/extras/src/ppm/ppm_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/il/utility.cpp
Modified: trunk/lib/extras/src/imf/mfn/mfn.cpp
===================================================================
--- trunk/lib/extras/src/imf/mfn/mfn.cpp 2007-09-30 16:10:39 UTC (rev 330)
+++ trunk/lib/extras/src/imf/mfn/mfn.cpp 2007-09-30 17:50:37 UTC (rev 331)
@@ -135,28 +135,32 @@
MGlobal::displayInfo( "HDRFlow: loading image..." );
#endif
- im_ = il::convert( im_, L"r32g32b32a32f" );
- if( !im_ )
+ il::image_type_ptr im = il::convert( im_, L"r32g32b32a32f" );
+ if( !im )
{
+ im = il::convert( il::convert( im_, L"b8g8r8a8" ), L"r32g32b32a32f" );
+ if( !im )
+ {
#ifndef NDEBUG
- MGlobal::displayInfo( "HDRFlow: Internal Error: conversion to floating point format failed. Please report to su...@cr...." );
+ MGlobal::displayInfo( "HDRFlow: Internal Error: conversion to floating point format failed. Please report to su...@cr...." );
#endif
- return MS::kFailure;
+ return MS::kFailure;
+ }
}
- int width = im_->width( );
- int height = im_->height( );
- int pitch = im_->pitch( );
- int linesize = im_->linesize( );
+ int width = im->width( );
+ int height = im->height( );
+ int pitch = im->pitch( );
+ int linesize = im->linesize( );
- image.create( im_->width( ), im_->height( ), 4, MImage::kFloat );
+ image.create( im->width( ), im->height( ), 4, MImage::kFloat );
- const float* src = reinterpret_cast<const float*>( im_->data( ) );
+ const float* src = reinterpret_cast<const float*>( im->data( ) );
float* dst = image.floatPixels( );
for( int i = 0; i < height; ++i )
{
- memcpy( dst, src, im_->linesize( ) * sizeof( float ) );
+ memcpy( dst, src, im->linesize( ) * sizeof( float ) );
src += pitch;
dst += width * 4;
Modified: trunk/lib/extras/src/ppm/ppm_plugin.cpp
===================================================================
--- trunk/lib/extras/src/ppm/ppm_plugin.cpp 2007-09-30 16:10:39 UTC (rev 330)
+++ trunk/lib/extras/src/ppm/ppm_plugin.cpp 2007-09-30 17:50:37 UTC (rev 331)
@@ -46,14 +46,16 @@
const unsigned short* data = reinterpret_cast<const unsigned short*>( stream->data( ) );
il::image_type::pointer texels = im->data( );
-
+
+ float one_over_65535 = 1.0f / 65535.0f;
+
for( int i = 0; i < height; ++i )
{
for( int j = 0; j < width; ++j )
{
- ( ( float* ) texels )[ 0 ] = *data++;
- ( ( float* ) texels )[ 1 ] = *data++;
- ( ( float* ) texels )[ 2 ] = *data++;
+ ( ( float* ) texels )[ 0 ] = *data++ * one_over_65535;
+ ( ( float* ) texels )[ 1 ] = *data++ * one_over_65535;
+ ( ( float* ) texels )[ 2 ] = *data++ * one_over_65535;
( ( float* ) texels )[ 3 ] = 1.0f;
texels += 4 * sizeof( float );
Modified: trunk/lib/openlibraries/src/openimagelib/il/utility.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/utility.cpp 2007-09-30 16:10:39 UTC (rev 330)
+++ trunk/lib/openlibraries/src/openimagelib/il/utility.cpp 2007-09-30 17:50:37 UTC (rev 331)
@@ -1695,14 +1695,16 @@
size_type orig_width = width;
+ float one_over_255 = 1.0f / 255.0f;
+
while( height-- )
{
while( width-- )
{
- *dst++ = *( src + 2 );
- *dst++ = *( src + 1 );
- *dst++ = *( src + 0 );
- *dst++ = *( src + 3 );
+ *dst++ = *( src + 2 ) * one_over_255;
+ *dst++ = *( src + 1 ) * one_over_255;
+ *dst++ = *( src + 0 ) * one_over_255;
+ *dst++ = *( src + 3 ) * one_over_255;
src += 4;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-09-30 16:10:44
|
Revision: 330
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=330&view=rev
Author: glslang
Date: 2007-09-30 09:10:39 -0700 (Sun, 30 Sep 2007)
Log Message:
-----------
+ bug fix in b8g8r8a8 to r32g32b32a32f conversion
Modified Paths:
--------------
trunk/lib/openlibraries/src/openimagelib/il/utility.cpp
Modified: trunk/lib/openlibraries/src/openimagelib/il/utility.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/utility.cpp 2007-09-30 16:07:07 UTC (rev 329)
+++ trunk/lib/openlibraries/src/openimagelib/il/utility.cpp 2007-09-30 16:10:39 UTC (rev 330)
@@ -1703,6 +1703,8 @@
*dst++ = *( src + 1 );
*dst++ = *( src + 0 );
*dst++ = *( src + 3 );
+
+ src += 4;
}
dst = dptr += dst_pitch;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-09-30 16:07:10
|
Revision: 329
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=329&view=rev
Author: glslang
Date: 2007-09-30 09:07:07 -0700 (Sun, 30 Sep 2007)
Log Message:
-----------
+ add dpx to maya plugin
Modified Paths:
--------------
trunk/lib/extras/src/imf/mfn/mfn.cpp
Modified: trunk/lib/extras/src/imf/mfn/mfn.cpp
===================================================================
--- trunk/lib/extras/src/imf/mfn/mfn.cpp 2007-09-30 15:15:05 UTC (rev 328)
+++ trunk/lib/extras/src/imf/mfn/mfn.cpp 2007-09-30 16:07:07 UTC (rev 329)
@@ -192,12 +192,13 @@
extensions.append( "tif" );
extensions.append( "cr2" );
extensions.append( "raw" );
+ extensions.append( "dpx" );
CHECK_MSTATUS( plugin.registerImageFile( "HDRFlow", hdrflow::extras::mfn::image_reader::creator, extensions ) );
pl::init( );
#ifndef NDEBUG
- MGlobal::displayInfo( "HDRFlow: initialised ..." );
+ MGlobal::displayInfo( "HDRFlow: initialised. Please contact su...@cr... for support." );
#endif
return MS::kSuccess;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-09-30 15:15:11
|
Revision: 328
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=328&view=rev
Author: glslang
Date: 2007-09-30 08:15:05 -0700 (Sun, 30 Sep 2007)
Log Message:
-----------
+ b8g8r8a8 to r32g32b32a32f conversion (all of this needs generalisation with swizzling support)
Modified Paths:
--------------
trunk/lib/openlibraries/src/openimagelib/il/utility.cpp
Modified: trunk/lib/openlibraries/src/openimagelib/il/utility.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/utility.cpp 2007-09-30 14:57:49 UTC (rev 327)
+++ trunk/lib/openlibraries/src/openimagelib/il/utility.cpp 2007-09-30 15:15:05 UTC (rev 328)
@@ -1677,6 +1677,43 @@
return dst_img;
}
+static image_type_ptr b8g8r8a8_to_r32g32b32a32f( image_type_ptr src_img, const std::wstring &format )
+{
+ size_type width = src_img->width( );
+ size_type height = src_img->height( );
+
+ image_type_ptr dst_img = allocate( src_img, format );
+ if( dst_img != 0 )
+ {
+ image_type::const_pointer src = ( image_type::const_pointer ) src_img->data( );
+ size_type src_pitch = src_img->pitch( );
+ float* dst = ( float* ) dst_img->data( );
+ size_type dst_pitch = dst_img->pitch( );
+
+ image_type::const_pointer sptr = src;
+ float* dptr = dst;
+
+ size_type orig_width = width;
+
+ while( height-- )
+ {
+ while( width-- )
+ {
+ *dst++ = *( src + 2 );
+ *dst++ = *( src + 1 );
+ *dst++ = *( src + 0 );
+ *dst++ = *( src + 3 );
+ }
+
+ dst = dptr += dst_pitch;
+ src = sptr += src_pitch;
+ width = orig_width;
+ }
+ }
+
+ return dst_img;
+}
+
inline bool is_rgb_packed( const std::wstring &pf )
{
return pf == L"a8b8g8r8" || pf == L"a8r8g8b8" || pf == L"b8g8r8" || pf == L"b8g8r8a8" || pf == L"r8g8b8" || pf == L"r8g8b8a8";
@@ -1815,6 +1852,8 @@
return rgb_to_yuv422( src, dst_pf, 4, 2, 1, 0 );
else if ( dst_pf == L"yuv411" )
return rgb_to_yuv411( src, dst_pf, 4, 2, 1, 0 );
+ else if ( dst_pf == L"r32g32b32a32f" )
+ return b8g8r8a8_to_r32g32b32a32f( src, dst_pf );
}
else if ( src_pf == L"a8r8g8b8" )
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-09-30 14:57:50
|
Revision: 327
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=327&view=rev
Author: glslang
Date: 2007-09-30 07:57:49 -0700 (Sun, 30 Sep 2007)
Log Message:
-----------
+ build fixes
Modified Paths:
--------------
trunk/unity.sh
Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh 2007-09-30 14:55:34 UTC (rev 326)
+++ trunk/unity.sh 2007-09-30 14:57:49 UTC (rev 327)
@@ -19,7 +19,7 @@
if [ $# -eq "0" ]
then
- echo "usage: `basename $0` options (-evbfioxupasm)"
+ echo "usage: `basename $0` options (-evbfioxupasmd)"
echo " -e ) update Boost version (Win32 only)"
echo " -v ) boost_old_version"
echo " -b ) boost_new_version"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-09-30 14:55:36
|
Revision: 326
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=326&view=rev
Author: glslang
Date: 2007-09-30 07:55:34 -0700 (Sun, 30 Sep 2007)
Log Message:
-----------
+ build fixes
Modified Paths:
--------------
trunk/lib/extras/src/imf/mfn/mfn.cpp
Modified: trunk/lib/extras/src/imf/mfn/mfn.cpp
===================================================================
--- trunk/lib/extras/src/imf/mfn/mfn.cpp 2007-09-30 14:33:59 UTC (rev 325)
+++ trunk/lib/extras/src/imf/mfn/mfn.cpp 2007-09-30 14:55:34 UTC (rev 326)
@@ -62,6 +62,7 @@
virtual MStatus close( );
private:
+ pl::string pathname_;
il::image_type_ptr im_;
};
@@ -89,7 +90,7 @@
#ifndef NDEBUG
MGlobal::displayInfo( "HDRFlow: plugin found ..." );
#endif
- im_ = plug->load( pl::make_stream( pathname.asChar( ), std::ios::in ) );
+ im_ = plug->load( pathname.asChar( ) );
if( im_ )
{
#ifndef NDEBUG
@@ -170,6 +171,10 @@
MStatus image_reader::close( )
{
+#ifndef NDEBUG
+ MGlobal::displayInfo( "HDRFlow: closing..." );
+#endif
+
im_.reset( );
return MS::kSuccess;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-09-30 14:34:00
|
Revision: 325
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=325&view=rev
Author: glslang
Date: 2007-09-30 07:33:59 -0700 (Sun, 30 Sep 2007)
Log Message:
-----------
+ build fixes
Modified Paths:
--------------
trunk/unity.sh
Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh 2007-09-30 13:56:58 UTC (rev 324)
+++ trunk/unity.sh 2007-09-30 14:33:59 UTC (rev 325)
@@ -20,7 +20,7 @@
if [ $# -eq "0" ]
then
echo "usage: `basename $0` options (-evbfioxupasm)"
- echo " -e ) update_boost_version"
+ echo " -e ) update Boost version (Win32 only)"
echo " -v ) boost_old_version"
echo " -b ) boost_new_version"
echo " -f ) build OS/X frameworks"
@@ -32,6 +32,7 @@
echo " -a ) build application"
echo " -s ) strip symbols"
echo " -m ) package maya plugins"
+ echo " -d ) update OpenLibraries version (Win32 only)"
echo
echo " Examples:"
echo " sh ./unity.sh -fu - build OS/X umbrella framework"
@@ -44,6 +45,10 @@
boost_old_version=1_34
boost_new_version=1_34_1
+update_olibs_version=0
+olibs_old_version=0.4.0
+olibs_new_version=0.5.0
+
build_frameworks=0
build_umbrella=0
build_installer=0
@@ -60,7 +65,7 @@
extras_image_plugins="ppm raw"
-while getopts "v:b:efi:o:x:upasm" option
+while getopts "v:b:efi:o:x:upasmd" option
do
case $option in
e ) update_boost_version=1;;
@@ -75,6 +80,7 @@
a ) build_application=1;;
s ) strip_symbols=1;;
m ) build_maya_plugins=1;;
+ d ) update_olibs_version=1;;
esac
done
@@ -89,6 +95,15 @@
done
fi
+if [ "$update_olibs_version" -eq 1 ]
+then
+ find . -type f -name '*.vcproj' -print | while read i
+ do cp $i $i.unity.bak &&
+ sed -e "s|-$olibs_old_version.dll|-$olibs_new_version.dll|g" -e "s|$olibs_old_version.lib|$olibs_new_version.lib|g" $i.unity.bak > $i &&
+ rm -f $i.unity.bak
+ done
+fi
+
make_framework_dir( )
{
framework_dir="$output_directory/$1.framework"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-09-30 13:57:06
|
Revision: 324
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=324&view=rev
Author: glslang
Date: 2007-09-30 06:56:58 -0700 (Sun, 30 Sep 2007)
Log Message:
-----------
+ generalise the plugin versioning in the installers
Modified Paths:
--------------
trunk/lib/openlibraries/installer/openlibraries_runtime.nsi
trunk/lib/openlibraries/installer/openlibraries_sdk.nsi
Modified: trunk/lib/openlibraries/installer/openlibraries_runtime.nsi
===================================================================
--- trunk/lib/openlibraries/installer/openlibraries_runtime.nsi 2007-09-30 12:11:13 UTC (rev 323)
+++ trunk/lib/openlibraries/installer/openlibraries_runtime.nsi 2007-09-30 13:56:58 UTC (rev 324)
@@ -4,6 +4,7 @@
!ifndef VERSION
!define VERSION 0.4.0
+ !define VERSION_DOT 0.4.0
!endif
;--------------------------------
@@ -12,7 +13,7 @@
!ifdef OUTFILE
OutFile "${OUTFILE}"
!else
- OutFile openlibraries-${VERSION}-runtime.exe
+ OutFile openlibraries-${VERSION_DOT}-runtime.exe
!endif
SetCompressor /SOLID lzma
@@ -34,7 +35,7 @@
;Names
Name "OpenLibraries"
-Caption "OpenLibraries (v.${VERSION}) Setup"
+Caption "OpenLibraries (v.${VERSION_DOT}) Setup"
;Interface Settings
!define MUI_ABORTWARNING
@@ -46,7 +47,7 @@
!define MUI_COMPONENTSPAGE_SMALLDESC
;Pages
-!define MUI_WELCOMEPAGE_TITLE "Welcome to the OpenLibraries (v.${VERSION}) Setup Wizard"
+!define MUI_WELCOMEPAGE_TITLE "Welcome to the OpenLibraries (v.${VERSION_DOT}) Setup Wizard"
!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of OpenLibraries.\r\n\r\n$_CLICK"
!insertmacro MUI_PAGE_WELCOME
@@ -80,11 +81,11 @@
SetOverwrite on
SetOutPath $INSTDIR\bin
- File "..\src\openpluginlib\pl\Multi-threaded Release DLL\openpluginlib_pl-vc80-r-0_4_0.dll"
- File "..\src\openimagelib\il\Multi-threaded Release DLL\openimagelib_il-vc80-r-0_4_0.dll"
- File "..\src\openmedialib\ml\Multi-threaded Release DLL\openmedialib_ml-vc80-r-0_4_0.dll"
- File "..\src\openobjectlib\sg\Multi-threaded Release DLL\openobjectlib_sg-vc80-r-0_4_0.dll"
- File "..\src\openassetlib\al\Multi-threaded Release DLL\openassetlib_al-vc80-r-0_4_0.dll"
+ File "..\src\openpluginlib\pl\Multi-threaded Release DLL\openpluginlib_pl-vc80-r-${VERSION}.dll"
+ File "..\src\openimagelib\il\Multi-threaded Release DLL\openimagelib_il-vc80-r-${VERSION}.dll"
+ File "..\src\openmedialib\ml\Multi-threaded Release DLL\openmedialib_ml-vc80-r-${VERSION}.dll"
+ File "..\src\openobjectlib\sg\Multi-threaded Release DLL\openobjectlib_sg-vc80-r-${VERSION}.dll"
+ File "..\src\openassetlib\al\Multi-threaded Release DLL\openassetlib_al-vc80-r-${VERSION}.dll"
; dependencies
File "C:\Program Files\FFmpeg\lib\avcodec-51.dll"
@@ -109,41 +110,41 @@
SetOutPath $INSTDIR\plugins\release
File "..\src\openimagelib\plugins\3D_lightmap\3D_lightmap_plugin.opl"
- File "..\src\openimagelib\plugins\3D_lightmap\Multi-threaded Release DLL\openimagelib_3D_lightmap-vc80-r-0_4_0.dll"
+ File "..\src\openimagelib\plugins\3D_lightmap\Multi-threaded Release DLL\openimagelib_3D_lightmap-vc80-r-${VERSION}.dll"
File "..\src\openimagelib\plugins\dds\dds_plugin.opl"
- File "..\src\openimagelib\plugins\dds\Multi-threaded Release DLL\openimagelib_dds-vc80-r-0_4_0.dll"
+ File "..\src\openimagelib\plugins\dds\Multi-threaded Release DLL\openimagelib_dds-vc80-r-${VERSION}.dll"
File "..\src\openimagelib\plugins\dpx\dpx_plugin.opl"
- File "..\src\openimagelib\plugins\dpx\Multi-threaded Release DLL\openimagelib_dpx-vc80-r-0_4_0.dll"
+ File "..\src\openimagelib\plugins\dpx\Multi-threaded Release DLL\openimagelib_dpx-vc80-r-${VERSION}.dll"
File "..\src\openimagelib\plugins\exr\exr_plugin.opl"
- File "..\src\openimagelib\plugins\exr\Multi-threaded Release DLL\openimagelib_exr-vc80-r-0_4_0.dll"
+ File "..\src\openimagelib\plugins\exr\Multi-threaded Release DLL\openimagelib_exr-vc80-r-${VERSION}.dll"
File "..\src\openimagelib\plugins\gdi+\gdi_plugin.opl"
- File "..\src\openimagelib\plugins\gdi+\Multi-threaded Release DLL\openimagelib_gdi-vc80-r-0_4_0.dll"
+ File "..\src\openimagelib\plugins\gdi+\Multi-threaded Release DLL\openimagelib_gdi-vc80-r-${VERSION}.dll"
File "..\src\openimagelib\plugins\hdr\hdr_plugin.opl"
- File "..\src\openimagelib\plugins\hdr\Multi-threaded Release DLL\openimagelib_hdr-vc80-r-0_4_0.dll"
+ File "..\src\openimagelib\plugins\hdr\Multi-threaded Release DLL\openimagelib_hdr-vc80-r-${VERSION}.dll"
File "..\src\openimagelib\plugins\jpg\jpg_plugin.opl"
- File "..\src\openimagelib\plugins\jpg\Multi-threaded Release DLL\openimagelib_jpg-vc80-r-0_4_0.dll"
+ File "..\src\openimagelib\plugins\jpg\Multi-threaded Release DLL\openimagelib_jpg-vc80-r-${VERSION}.dll"
File "..\src\openimagelib\plugins\sgi\sgi_plugin.opl"
- File "..\src\openimagelib\plugins\sgi\Multi-threaded Release DLL\openimagelib_sgi-vc80-r-0_4_0.dll"
+ File "..\src\openimagelib\plugins\sgi\Multi-threaded Release DLL\openimagelib_sgi-vc80-r-${VERSION}.dll"
File "..\src\openimagelib\plugins\tga\tga_plugin.opl"
- File "..\src\openimagelib\plugins\tga\Multi-threaded Release DLL\openimagelib_tga-vc80-r-0_4_0.dll"
+ File "..\src\openimagelib\plugins\tga\Multi-threaded Release DLL\openimagelib_tga-vc80-r-${VERSION}.dll"
File "..\src\openmedialib\plugins\oil\oil_plugin.opl"
- File "..\src\openmedialib\plugins\oil\Multi-threaded Release DLL\openmedialib_oil-vc80-r-0_4_0.dll"
+ File "..\src\openmedialib\plugins\oil\Multi-threaded Release DLL\openmedialib_oil-vc80-r-${VERSION}.dll"
File "..\src\openmedialib\plugins\gensys\gensys_plugin.opl"
- File "..\src\openmedialib\plugins\gensys\Multi-threaded Release DLL\openmedialib_gensys-vc80-r-0_4_0.dll"
+ File "..\src\openmedialib\plugins\gensys\Multi-threaded Release DLL\openmedialib_gensys-vc80-r-${VERSION}.dll"
File "..\src\openmedialib\plugins\quicktime\quicktime_plugin.opl"
- File "..\src\openmedialib\plugins\quicktime\Multi-threaded Release DLL\openmedialib_quicktime-vc80-r-0_4_0.dll"
+ File "..\src\openmedialib\plugins\quicktime\Multi-threaded Release DLL\openmedialib_quicktime-vc80-r-${VERSION}.dll"
File "..\src\openmedialib\plugins\ofx\ofx_plugin.opl"
- File "..\src\openmedialib\plugins\ofx\Multi-threaded Release DLL\openmedialib_ofx-vc80-r-0_4_0.dll"
+ File "..\src\openmedialib\plugins\ofx\Multi-threaded Release DLL\openmedialib_ofx-vc80-r-${VERSION}.dll"
;File "..\src\openobjectlib\plugins\3ds\3ds_plugin.opl"
- ;File "..\src\openobjectlib\plugins\3ds\Multi-threaded Release DLL\openobjectlib_3ds-vc80-r-0_4_0.dll"
+ ;File "..\src\openobjectlib\plugins\3ds\Multi-threaded Release DLL\openobjectlib_3ds-vc80-r-${VERSION}.dll"
File "..\src\openobjectlib\plugins\obj\obj_plugin.opl"
- File "..\src\openobjectlib\plugins\obj\Multi-threaded Release DLL\openobjectlib_obj-vc80-r-0_4_0.dll"
+ File "..\src\openobjectlib\plugins\obj\Multi-threaded Release DLL\openobjectlib_obj-vc80-r-${VERSION}.dll"
File "..\src\openobjectlib\plugins\X3D\x3d_plugin.opl"
- File "..\src\openobjectlib\plugins\X3D\Multi-threaded Release DLL\openobjectlib_x3d-vc80-r-0_4_0.dll"
+ File "..\src\openobjectlib\plugins\X3D\Multi-threaded Release DLL\openobjectlib_x3d-vc80-r-${VERSION}.dll"
File "..\src\openassetlib\plugins\sqlite\sqlite3_metadata_plugin.opl"
- File "..\src\openassetlib\plugins\sqlite\Multi-threaded Release DLL\openassetlib_sqlite-vc80-r-0_4_0.dll"
+ File "..\src\openassetlib\plugins\sqlite\Multi-threaded Release DLL\openassetlib_sqlite-vc80-r-${VERSION}.dll"
File "..\src\openeffectslib\plugins\tonemap\tonemap_plugin.opl"
- File "..\src\openeffectslib\plugins\tonemap\Multi-threaded Release DLL\openeffectslib_tonemap-vc80-r-0_4_0.dll"
+ File "..\src\openeffectslib\plugins\tonemap\Multi-threaded Release DLL\openeffectslib_tonemap-vc80-r-${VERSION}.dll"
SetOutPath $INSTDIR\shaders
File "..\effects\shaders\sepia.cg"
@@ -179,7 +180,7 @@
;--------------------------------
;Registry
-WriteRegStr HKLM "Software\OpenLibraries" "CurrentVersion" "${VERSION}"
+WriteRegStr HKLM "Software\OpenLibraries" "CurrentVersion" "${VERSION_DOT}"
WriteRegStr HKLM "Software\OpenLibraries" "PluginsDirRelease" "$INSTDIR\plugins\release"
WriteRegStr HKLM "Software\OpenLibraries" "KernelsDir" "$INSTDIR\kernels"
WriteRegStr HKLM "Software\OpenLibraries" "ShadersDir" "$INSTDIR\shaders"
Modified: trunk/lib/openlibraries/installer/openlibraries_sdk.nsi
===================================================================
--- trunk/lib/openlibraries/installer/openlibraries_sdk.nsi 2007-09-30 12:11:13 UTC (rev 323)
+++ trunk/lib/openlibraries/installer/openlibraries_sdk.nsi 2007-09-30 13:56:58 UTC (rev 324)
@@ -3,7 +3,8 @@
;--------------------------------
!ifndef VERSION
- !define VERSION 0.4.0
+ !define VERSION 0_4_0
+ !define VERSION_DOT 0.4.0
!endif
;--------------------------------
@@ -12,7 +13,7 @@
!ifdef OUTFILE
OutFile "${OUTFILE}"
!else
- OutFile openlibraries-${VERSION}-sdk.exe
+ OutFile openlibraries-${VERSION_DOT}-sdk.exe
!endif
SetCompressor /SOLID lzma
@@ -34,7 +35,7 @@
;Names
Name "OpenLibraries"
-Caption "OpenLibraries (v.${VERSION}) Setup"
+Caption "OpenLibraries (v.${VERSION_DOT}) Setup"
;Interface Settings
!define MUI_ABORTWARNING
@@ -46,7 +47,7 @@
!define MUI_COMPONENTSPAGE_SMALLDESC
;Pages
-!define MUI_WELCOMEPAGE_TITLE "Welcome to the OpenLibraries (v.${VERSION}) Setup Wizard"
+!define MUI_WELCOMEPAGE_TITLE "Welcome to the OpenLibraries (v.${VERSION_DOT}) Setup Wizard"
!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of OpenLibraries.\r\n\r\n$_CLICK"
!insertmacro MUI_PAGE_WELCOME
@@ -79,7 +80,7 @@
SetOverwrite on
- SetOutPath $INSTDIR\include\openlibraries-${VERSION}\openpluginlib\pl
+ SetOutPath $INSTDIR\include\openlibraries-${VERSION_DOT}\openpluginlib\pl
File ..\src\openpluginlib\pl\allocatorstringstorage.h
File ..\src\openpluginlib\pl\bind_info.hpp
File ..\src\openpluginlib\pl\cg.hpp
@@ -107,7 +108,7 @@
File ..\src\openpluginlib\pl\utf8_utils.hpp
File ..\src\openpluginlib\pl\vectorstringstorage.h
- SetOutPath $INSTDIR\include\openlibraries-${VERSION}\openpluginlib\pl\pcos
+ SetOutPath $INSTDIR\include\openlibraries-${VERSION_DOT}\openpluginlib\pl\pcos
File ..\src\openpluginlib\pl\pcos\iproperty_container.hpp
File ..\src\openpluginlib\pl\pcos\isubject.hpp
File ..\src\openpluginlib\pl\pcos\iclonable.hpp
@@ -118,7 +119,7 @@
File ..\src\openpluginlib\pl\pcos\subject.hpp
File ..\src\openpluginlib\pl\pcos\visitor.hpp
- SetOutPath $INSTDIR\include\openlibraries-${VERSION}\openimagelib\il
+ SetOutPath $INSTDIR\include\openlibraries-${VERSION_DOT}\openimagelib\il
File ..\src\openimagelib\il\basic_image.hpp
File ..\src\openimagelib\il\compression_traits.hpp
File ..\src\openimagelib\il\config.hpp
@@ -130,7 +131,7 @@
File ..\src\openimagelib\il\utility.hpp
File ..\src\openimagelib\il\yuv_traits.hpp
- SetOutPath $INSTDIR\include\openlibraries-${VERSION}\openmedialib\ml
+ SetOutPath $INSTDIR\include\openlibraries-${VERSION_DOT}\openmedialib\ml
File ..\src\openmedialib\ml\audio.hpp
File ..\src\openmedialib\ml\config.hpp
File ..\src\openmedialib\ml\filter.hpp
@@ -141,7 +142,7 @@
File ..\src\openmedialib\ml\store.hpp
File ..\src\openmedialib\ml\utilities.hpp
- SetOutPath $INSTDIR\include\openlibraries-${VERSION}\openobjectlib\sg
+ SetOutPath $INSTDIR\include\openlibraries-${VERSION_DOT}\openobjectlib\sg
File ..\src\openobjectlib\sg\appearance.hpp
File ..\src\openobjectlib\sg\bbox_volume.hpp
File ..\src\openobjectlib\sg\calculate_tangent_space.hpp
@@ -160,7 +161,7 @@
File ..\src\openobjectlib\sg\spatial.hpp
File ..\src\openobjectlib\sg\spirit.hpp
- SetOutPath $INSTDIR\include\openlibraries-${VERSION}\openassetlib\al
+ SetOutPath $INSTDIR\include\openlibraries-${VERSION_DOT}\openassetlib\al
File ..\src\openassetlib\al\al.hpp
File ..\src\openassetlib\al\al_plugin.hpp
File ..\src\openassetlib\al\asset.hpp
@@ -170,16 +171,16 @@
File ..\src\openassetlib\al\set.hpp
SetOutPath $INSTDIR\bin
- File "..\src\openpluginlib\pl\Multi-threaded Debug DLL\openpluginlib_pl-vc80-d-0_4_0.dll"
- File "..\src\openpluginlib\pl\Multi-threaded Release DLL\openpluginlib_pl-vc80-r-0_4_0.dll"
- File "..\src\openimagelib\il\Multi-threaded Debug DLL\openimagelib_il-vc80-d-0_4_0.dll"
- File "..\src\openimagelib\il\Multi-threaded Release DLL\openimagelib_il-vc80-r-0_4_0.dll"
- File "..\src\openmedialib\ml\Multi-threaded Debug DLL\openmedialib_ml-vc80-d-0_4_0.dll"
- File "..\src\openmedialib\ml\Multi-threaded Release DLL\openmedialib_ml-vc80-r-0_4_0.dll"
- File "..\src\openobjectlib\sg\Multi-threaded Debug DLL\openobjectlib_sg-vc80-d-0_4_0.dll"
- File "..\src\openobjectlib\sg\Multi-threaded Release DLL\openobjectlib_sg-vc80-r-0_4_0.dll"
- File "..\src\openassetlib\al\Multi-threaded Debug DLL\openassetlib_al-vc80-d-0_4_0.dll"
- File "..\src\openassetlib\al\Multi-threaded Release DLL\openassetlib_al-vc80-r-0_4_0.dll"
+ File "..\src\openpluginlib\pl\Multi-threaded Debug DLL\openpluginlib_pl-vc80-d-${VERSION}.dll"
+ File "..\src\openpluginlib\pl\Multi-threaded Release DLL\openpluginlib_pl-vc80-r-${VERSION}.dll"
+ File "..\src\openimagelib\il\Multi-threaded Debug DLL\openimagelib_il-vc80-d-${VERSION}.dll"
+ File "..\src\openimagelib\il\Multi-threaded Release DLL\openimagelib_il-vc80-r-${VERSION}.dll"
+ File "..\src\openmedialib\ml\Multi-threaded Debug DLL\openmedialib_ml-vc80-d-${VERSION}.dll"
+ File "..\src\openmedialib\ml\Multi-threaded Release DLL\openmedialib_ml-vc80-r-${VERSION}.dll"
+ File "..\src\openobjectlib\sg\Multi-threaded Debug DLL\openobjectlib_sg-vc80-d-${VERSION}.dll"
+ File "..\src\openobjectlib\sg\Multi-threaded Release DLL\openobjectlib_sg-vc80-r-${VERSION}.dll"
+ File "..\src\openassetlib\al\Multi-threaded Debug DLL\openassetlib_al-vc80-d-${VERSION}.dll"
+ File "..\src\openassetlib\al\Multi-threaded Release DLL\openassetlib_al-vc80-r-${VERSION}.dll"
; dependencies
File "C:\Program Files\FFmpeg\lib\avcodec-51.dll"
@@ -203,90 +204,90 @@
File "..\src\openassetlib\py\Multi-threaded Debug DLL\HDRFlowAsset.pyd"
SetOutPath $INSTDIR\lib
- File "..\src\openpluginlib\pl\Multi-threaded Debug DLL\openpluginlib_pl-vc80-d-0_4_0.lib"
- File "..\src\openpluginlib\pl\Multi-threaded Release DLL\openpluginlib_pl-vc80-r-0_4_0.lib"
- File "..\src\openimagelib\il\Multi-threaded Debug DLL\openimagelib_il-vc80-d-0_4_0.lib"
- File "..\src\openimagelib\il\Multi-threaded Release DLL\openimagelib_il-vc80-r-0_4_0.lib"
- File "..\src\openmedialib\ml\Multi-threaded Debug DLL\openmedialib_ml-vc80-d-0_4_0.lib"
- File "..\src\openmedialib\ml\Multi-threaded Release DLL\openmedialib_ml-vc80-r-0_4_0.lib"
- File "..\src\openobjectlib\sg\Multi-threaded Debug DLL\openobjectlib_sg-vc80-d-0_4_0.lib"
- File "..\src\openobjectlib\sg\Multi-threaded Release DLL\openobjectlib_sg-vc80-r-0_4_0.lib"
- File "..\src\openassetlib\al\Multi-threaded Debug DLL\openassetlib_al-vc80-d-0_4_0.lib"
- File "..\src\openassetlib\al\Multi-threaded Release DLL\openassetlib_al-vc80-r-0_4_0.lib"
+ File "..\src\openpluginlib\pl\Multi-threaded Debug DLL\openpluginlib_pl-vc80-d-${VERSION}.lib"
+ File "..\src\openpluginlib\pl\Multi-threaded Release DLL\openpluginlib_pl-vc80-r-${VERSION}.lib"
+ File "..\src\openimagelib\il\Multi-threaded Debug DLL\openimagelib_il-vc80-d-${VERSION}.lib"
+ File "..\src\openimagelib\il\Multi-threaded Release DLL\openimagelib_il-vc80-r-${VERSION}.lib"
+ File "..\src\openmedialib\ml\Multi-threaded Debug DLL\openmedialib_ml-vc80-d-${VERSION}.lib"
+ File "..\src\openmedialib\ml\Multi-threaded Release DLL\openmedialib_ml-vc80-r-${VERSION}.lib"
+ File "..\src\openobjectlib\sg\Multi-threaded Debug DLL\openobjectlib_sg-vc80-d-${VERSION}.lib"
+ File "..\src\openobjectlib\sg\Multi-threaded Release DLL\openobjectlib_sg-vc80-r-${VERSION}.lib"
+ File "..\src\openassetlib\al\Multi-threaded Debug DLL\openassetlib_al-vc80-d-${VERSION}.lib"
+ File "..\src\openassetlib\al\Multi-threaded Release DLL\openassetlib_al-vc80-r-${VERSION}.lib"
SetOutPath $INSTDIR\plugins\debug
File "..\src\openimagelib\plugins\3D_lightmap\3D_lightmap_plugin.opl"
- File "..\src\openimagelib\plugins\3D_lightmap\Multi-threaded Debug DLL\openimagelib_3D_lightmap-vc80-d-0_4_0.dll"
+ File "..\src\openimagelib\plugins\3D_lightmap\Multi-threaded Debug DLL\openimagelib_3D_lightmap-vc80-d-${VERSION}.dll"
File "..\src\openimagelib\plugins\dds\dds_plugin.opl"
- File "..\src\openimagelib\plugins\dds\Multi-threaded Debug DLL\openimagelib_dds-vc80-d-0_4_0.dll"
+ File "..\src\openimagelib\plugins\dds\Multi-threaded Debug DLL\openimagelib_dds-vc80-d-${VERSION}.dll"
File "..\src\openimagelib\plugins\dpx\dpx_plugin.opl"
- File "..\src\openimagelib\plugins\dpx\Multi-threaded Debug DLL\openimagelib_dpx-vc80-d-0_4_0.dll"
+ File "..\src\openimagelib\plugins\dpx\Multi-threaded Debug DLL\openimagelib_dpx-vc80-d-${VERSION}.dll"
File "..\src\openimagelib\plugins\exr\exr_plugin.opl"
- File "..\src\openimagelib\plugins\exr\Multi-threaded Debug DLL\openimagelib_exr-vc80-d-0_4_0.dll"
+ File "..\src\openimagelib\plugins\exr\Multi-threaded Debug DLL\openimagelib_exr-vc80-d-${VERSION}.dll"
File "..\src\openimagelib\plugins\gdi+\gdi_plugin.opl"
- File "..\src\openimagelib\plugins\gdi+\Multi-threaded Debug DLL\openimagelib_gdi-vc80-d-0_4_0.dll"
+ File "..\src\openimagelib\plugins\gdi+\Multi-threaded Debug DLL\openimagelib_gdi-vc80-d-${VERSION}.dll"
File "..\src\openimagelib\plugins\hdr\hdr_plugin.opl"
- File "..\src\openimagelib\plugins\hdr\Multi-threaded Debug DLL\openimagelib_hdr-vc80-d-0_4_0.dll"
+ File "..\src\openimagelib\plugins\hdr\Multi-threaded Debug DLL\openimagelib_hdr-vc80-d-${VERSION}.dll"
File "..\src\openimagelib\plugins\jpg\jpg_plugin.opl"
- File "..\src\openimagelib\plugins\jpg\Multi-threaded Debug DLL\openimagelib_jpg-vc80-d-0_4_0.dll"
+ File "..\src\openimagelib\plugins\jpg\Multi-threaded Debug DLL\openimagelib_jpg-vc80-d-${VERSION}.dll"
File "..\src\openimagelib\plugins\sgi\sgi_plugin.opl"
- File "..\src\openimagelib\plugins\sgi\Multi-threaded Debug DLL\openimagelib_sgi-vc80-d-0_4_0.dll"
+ File "..\src\openimagelib\plugins\sgi\Multi-threaded Debug DLL\openimagelib_sgi-vc80-d-${VERSION}.dll"
File "..\src\openimagelib\plugins\tga\tga_plugin.opl"
- File "..\src\openimagelib\plugins\tga\Multi-threaded Debug DLL\openimagelib_tga-vc80-d-0_4_0.dll"
+ File "..\src\openimagelib\plugins\tga\Multi-threaded Debug DLL\openimagelib_tga-vc80-d-${VERSION}.dll"
File "..\src\openmedialib\plugins\oil\oil_plugin.opl"
- File "..\src\openmedialib\plugins\oil\Multi-threaded Debug DLL\openmedialib_oil-vc80-d-0_4_0.dll"
+ File "..\src\openmedialib\plugins\oil\Multi-threaded Debug DLL\openmedialib_oil-vc80-d-${VERSION}.dll"
File "..\src\openmedialib\plugins\gensys\gensys_plugin.opl"
- File "..\src\openmedialib\plugins\gensys\Multi-threaded Debug DLL\openmedialib_gensys-vc80-d-0_4_0.dll"
+ File "..\src\openmedialib\plugins\gensys\Multi-threaded Debug DLL\openmedialib_gensys-vc80-d-${VERSION}.dll"
File "..\src\openmedialib\plugins\quicktime\quicktime_plugin.opl"
- File "..\src\openmedialib\plugins\quicktime\Multi-threaded Debug DLL\openmedialib_quicktime-vc80-d-0_4_0.dll"
+ File "..\src\openmedialib\plugins\quicktime\Multi-threaded Debug DLL\openmedialib_quicktime-vc80-d-${VERSION}.dll"
File "..\src\openmedialib\plugins\ofx\ofx_plugin.opl"
- File "..\src\openmedialib\plugins\ofx\Multi-threaded Debug DLL\openmedialib_ofx-vc80-d-0_4_0.dll"
+ File "..\src\openmedialib\plugins\ofx\Multi-threaded Debug DLL\openmedialib_ofx-vc80-d-${VERSION}.dll"
;File "..\src\openobjectlib\plugins\3ds\3ds_plugin.opl"
- ;File "..\src\openobjectlib\plugins\3ds\Multi-threaded Debug DLL\openobjectlib_3ds-vc80-d-0_4_0.dll"
+ ;File "..\src\openobjectlib\plugins\3ds\Multi-threaded Debug DLL\openobjectlib_3ds-vc80-d-${VERSION}.dll"
File "..\src\openobjectlib\plugins\obj\obj_plugin.opl"
- File "..\src\openobjectlib\plugins\obj\Multi-threaded Debug DLL\openobjectlib_obj-vc80-d-0_4_0.dll"
+ File "..\src\openobjectlib\plugins\obj\Multi-threaded Debug DLL\openobjectlib_obj-vc80-d-${VERSION}.dll"
File "..\src\openobjectlib\plugins\X3D\x3d_plugin.opl"
- File "..\src\openobjectlib\plugins\X3D\Multi-threaded Debug DLL\openobjectlib_x3d-vc80-d-0_4_0.dll"
+ File "..\src\openobjectlib\plugins\X3D\Multi-threaded Debug DLL\openobjectlib_x3d-vc80-d-${VERSION}.dll"
File "..\src\openassetlib\plugins\sqlite\sqlite3_metadata_plugin.opl"
- File "..\src\openassetlib\plugins\sqlite\Multi-threaded Debug DLL\openassetlib_sqlite-vc80-d-0_4_0.dll"
+ File "..\src\openassetlib\plugins\sqlite\Multi-threaded Debug DLL\openassetlib_sqlite-vc80-d-${VERSION}.dll"
File "..\src\openeffectslib\plugins\tonemap\tonemap_plugin.opl"
- File "..\src\openeffectslib\plugins\tonemap\Multi-threaded Debug DLL\openeffectslib_tonemap-vc80-d-0_4_0.dll"
+ File "..\src\openeffectslib\plugins\tonemap\Multi-threaded Debug DLL\openeffectslib_tonemap-vc80-d-${VERSION}.dll"
SetOutPath $INSTDIR\plugins\release
File "..\src\openimagelib\plugins\3D_lightmap\3D_lightmap_plugin.opl"
- File "..\src\openimagelib\plugins\3D_lightmap\Multi-threaded Release DLL\openimagelib_3D_lightmap-vc80-r-0_4_0.dll"
+ File "..\src\openimagelib\plugins\3D_lightmap\Multi-threaded Release DLL\openimagelib_3D_lightmap-vc80-r-${VERSION}.dll"
File "..\src\openimagelib\plugins\dds\dds_plugin.opl"
- File "..\src\openimagelib\plugins\dds\Multi-threaded Release DLL\openimagelib_dds-vc80-r-0_4_0.dll"
+ File "..\src\openimagelib\plugins\dds\Multi-threaded Release DLL\openimagelib_dds-vc80-r-${VERSION}.dll"
File "..\src\openimagelib\plugins\dpx\dpx_plugin.opl"
- File "..\src\openimagelib\plugins\dpx\Multi-threaded Release DLL\openimagelib_dpx-vc80-r-0_4_0.dll"
+ File "..\src\openimagelib\plugins\dpx\Multi-threaded Release DLL\openimagelib_dpx-vc80-r-${VERSION}.dll"
File "..\src\openimagelib\plugins\exr\exr_plugin.opl"
- File "..\src\openimagelib\plugins\exr\Multi-threaded Release DLL\openimagelib_exr-vc80-r-0_4_0.dll"
+ File "..\src\openimagelib\plugins\exr\Multi-threaded Release DLL\openimagelib_exr-vc80-r-${VERSION}.dll"
File "..\src\openimagelib\plugins\gdi+\gdi_plugin.opl"
- File "..\src\openimagelib\plugins\gdi+\Multi-threaded Release DLL\openimagelib_gdi-vc80-r-0_4_0.dll"
+ File "..\src\openimagelib\plugins\gdi+\Multi-threaded Release DLL\openimagelib_gdi-vc80-r-${VERSION}.dll"
File "..\src\openimagelib\plugins\hdr\hdr_plugin.opl"
- File "..\src\openimagelib\plugins\hdr\Multi-threaded Release DLL\openimagelib_hdr-vc80-r-0_4_0.dll"
+ File "..\src\openimagelib\plugins\hdr\Multi-threaded Release DLL\openimagelib_hdr-vc80-r-${VERSION}.dll"
File "..\src\openimagelib\plugins\jpg\jpg_plugin.opl"
- File "..\src\openimagelib\plugins\jpg\Multi-threaded Release DLL\openimagelib_jpg-vc80-r-0_4_0.dll"
+ File "..\src\openimagelib\plugins\jpg\Multi-threaded Release DLL\openimagelib_jpg-vc80-r-${VERSION}.dll"
File "..\src\openimagelib\plugins\sgi\sgi_plugin.opl"
- File "..\src\openimagelib\plugins\sgi\Multi-threaded Release DLL\openimagelib_sgi-vc80-r-0_4_0.dll"
+ File "..\src\openimagelib\plugins\sgi\Multi-threaded Release DLL\openimagelib_sgi-vc80-r-${VERSION}.dll"
File "..\src\openimagelib\plugins\tga\tga_plugin.opl"
- File "..\src\openimagelib\plugins\tga\Multi-threaded Release DLL\openimagelib_tga-vc80-r-0_4_0.dll"
+ File "..\src\openimagelib\plugins\tga\Multi-threaded Release DLL\openimagelib_tga-vc80-r-${VERSION}.dll"
File "..\src\openmedialib\plugins\oil\oil_plugin.opl"
- File "..\src\openmedialib\plugins\oil\Multi-threaded Release DLL\openmedialib_oil-vc80-r-0_4_0.dll"
+ File "..\src\openmedialib\plugins\oil\Multi-threaded Release DLL\openmedialib_oil-vc80-r-${VERSION}.dll"
File "..\src\openmedialib\plugins\gensys\gensys_plugin.opl"
- File "..\src\openmedialib\plugins\gensys\Multi-threaded Release DLL\openmedialib_gensys-vc80-r-0_4_0.dll"
+ File "..\src\openmedialib\plugins\gensys\Multi-threaded Release DLL\openmedialib_gensys-vc80-r-${VERSION}.dll"
File "..\src\openmedialib\plugins\quicktime\quicktime_plugin.opl"
- File "..\src\openmedialib\plugins\quicktime\Multi-threaded Release DLL\openmedialib_quicktime-vc80-r-0_4_0.dll"
+ File "..\src\openmedialib\plugins\quicktime\Multi-threaded Release DLL\openmedialib_quicktime-vc80-r-${VERSION}.dll"
File "..\src\openmedialib\plugins\ofx\ofx_plugin.opl"
- File "..\src\openmedialib\plugins\ofx\Multi-threaded Release DLL\openmedialib_ofx-vc80-r-0_4_0.dll"
+ File "..\src\openmedialib\plugins\ofx\Multi-threaded Release DLL\openmedialib_ofx-vc80-r-${VERSION}.dll"
;File "..\src\openobjectlib\plugins\3ds\3ds_plugin.opl"
- ;File "..\src\openobjectlib\plugins\3ds\Multi-threaded Release DLL\openobjectlib_3ds-vc80-r-0_4_0.dll"
+ ;File "..\src\openobjectlib\plugins\3ds\Multi-threaded Release DLL\openobjectlib_3ds-vc80-r-${VERSION}.dll"
File "..\src\openobjectlib\plugins\obj\obj_plugin.opl"
- File "..\src\openobjectlib\plugins\obj\Multi-threaded Release DLL\openobjectlib_obj-vc80-r-0_4_0.dll"
+ File "..\src\openobjectlib\plugins\obj\Multi-threaded Release DLL\openobjectlib_obj-vc80-r-${VERSION}.dll"
File "..\src\openobjectlib\plugins\X3D\x3d_plugin.opl"
- File "..\src\openobjectlib\plugins\X3D\Multi-threaded Release DLL\openobjectlib_x3d-vc80-r-0_4_0.dll"
+ File "..\src\openobjectlib\plugins\X3D\Multi-threaded Release DLL\openobjectlib_x3d-vc80-r-${VERSION}.dll"
File "..\src\openeffectslib\plugins\tonemap\tonemap_plugin.opl"
- File "..\src\openeffectslib\plugins\tonemap\Multi-threaded Release DLL\openeffectslib_tonemap-vc80-r-0_4_0.dll"
+ File "..\src\openeffectslib\plugins\tonemap\Multi-threaded Release DLL\openeffectslib_tonemap-vc80-r-${VERSION}.dll"
SetOutPath $INSTDIR\shaders
File "..\effects\shaders\sepia.cg"
@@ -311,8 +312,6 @@
Push "$INSTDIR\bin"
Call AddToPath
- Push "$INSTDIR\bin\Debug"
- Call AddToPath
;--------------------------------
;Include environment variable
@@ -335,7 +334,7 @@
;--------------------------------
;Registry
-WriteRegStr HKLM "Software\OpenLibraries" "CurrentVersion" "${VERSION}"
+WriteRegStr HKLM "Software\OpenLibraries" "CurrentVersion" "${VERSION_DOT}"
WriteRegStr HKLM "Software\OpenLibraries" "PluginsDirDebug" "$INSTDIR\plugins\debug"
WriteRegStr HKLM "Software\OpenLibraries" "PluginsDirRelease" "$INSTDIR\plugins\release"
WriteRegStr HKLM "Software\OpenLibraries" "KernelsDir" "$INSTDIR\kernels"
@@ -374,9 +373,6 @@
Push "$INSTDIR\bin"
Call un.RemoveFromPath
- Push "$INSTDIR\bin\Debug"
- Call un.RemoveFromPath
-
Push "OPENLIBRARIES_LIB_PATH"
Call un.DeleteEnvStr
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-09-30 12:11:15
|
Revision: 323
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=323&view=rev
Author: glslang
Date: 2007-09-30 05:11:13 -0700 (Sun, 30 Sep 2007)
Log Message:
-----------
+ build fix
Modified Paths:
--------------
trunk/lib/extras/src/ppm/ppm_vc8.vcproj
Modified: trunk/lib/extras/src/ppm/ppm_vc8.vcproj
===================================================================
--- trunk/lib/extras/src/ppm/ppm_vc8.vcproj 2007-09-30 11:16:29 UTC (rev 322)
+++ trunk/lib/extras/src/ppm/ppm_vc8.vcproj 2007-09-30 12:11:13 UTC (rev 323)
@@ -63,6 +63,7 @@
/>
<Tool
Name="VCLinkerTool"
+ IgnoreImportLibrary="true"
OutputFile="$(OutDir)\hdrflow_extras_ppm-vc80-d-0_1_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\..\openlibraries\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openimagelib\il\$(ConfigurationName)""
@@ -142,6 +143,7 @@
/>
<Tool
Name="VCLinkerTool"
+ IgnoreImportLibrary="true"
OutputFile="$(OutDir)\hdrflow_extras_ppm-vc80-r-0_1_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\..\openlibraries\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openimagelib\il\$(ConfigurationName)""
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-09-30 11:16:31
|
Revision: 322
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=322&view=rev
Author: glslang
Date: 2007-09-30 04:16:29 -0700 (Sun, 30 Sep 2007)
Log Message:
-----------
+ build fixes
Modified Paths:
--------------
trunk/lib/extras/src/ppm/ppm_plugin.cpp
trunk/lib/extras/src/raw/raw.cpp
Modified: trunk/lib/extras/src/ppm/ppm_plugin.cpp
===================================================================
--- trunk/lib/extras/src/ppm/ppm_plugin.cpp 2007-09-29 20:54:22 UTC (rev 321)
+++ trunk/lib/extras/src/ppm/ppm_plugin.cpp 2007-09-30 11:16:29 UTC (rev 322)
@@ -68,10 +68,10 @@
struct PPM_DECLSPEC ppm_plugin : public il::openimagelib_plugin
{
- virtual il::image_type_ptr load( pl::stream_ptr stream )
- { return load_ppm( stream ); }
+ virtual il::image_type_ptr load( const pl::string& uri )
+ { return load_ppm( pl::make_stream( uri, std::ios::in ) ); }
- virtual bool store( pl::stream_ptr, il::image_type_ptr )
+ virtual bool store( const pl::string&, il::image_type_ptr )
{ return false; }
};
Modified: trunk/lib/extras/src/raw/raw.cpp
===================================================================
--- trunk/lib/extras/src/raw/raw.cpp 2007-09-29 20:54:22 UTC (rev 321)
+++ trunk/lib/extras/src/raw/raw.cpp 2007-09-30 11:16:29 UTC (rev 322)
@@ -79,7 +79,7 @@
{
il::openimagelib_plugin_ptr plug = boost::shared_dynamic_cast<il::openimagelib_plugin>( i->create_plugin( "" ) );
if( plug )
- return plug->load( pl::make_stream( output_path, std::ios::in ) );
+ return plug->load( output_path );
}
return il::image_type_ptr( );
@@ -116,13 +116,13 @@
set_raw_properties( );
}
- virtual il::image_type_ptr load( pl::stream_ptr stream )
+ virtual il::image_type_ptr load( const pl::string& uri )
{
- raw_props_.get_property_with_key( pcos::key::from_string( "path" ) ) = stream->path( );
+ raw_props_.get_property_with_key( pcos::key::from_string( "path" ) ) = uri;
return dcraw( raw_props_ );
}
- virtual bool store( pl::stream_ptr, il::image_type_ptr )
+ virtual bool store( const pl::string&, il::image_type_ptr )
{ return false; }
private:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-09-29 20:54:23
|
Revision: 321
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=321&view=rev
Author: glslang
Date: 2007-09-29 13:54:22 -0700 (Sat, 29 Sep 2007)
Log Message:
-----------
+ fixes tiff reader (strips != 1)
Modified Paths:
--------------
trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.cpp
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.cpp 2007-09-29 12:49:48 UTC (rev 320)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.cpp 2007-09-29 20:54:22 UTC (rev 321)
@@ -85,9 +85,6 @@
if( !im )
return il::image_type_ptr( );
- if( orientation == ORIENTATION_TOPLEFT )
- im->set_flipped( true );
-
il::image_type::pointer data = im->data( );
int bytes_per_pixel = components * bpp / 8;
@@ -126,14 +123,29 @@
if( is_float )
pitch *= sizeof( float );
- unsigned int rows;
+ unsigned int rows, strip_size;
TIFFGetField( tif, TIFFTAG_ROWSPERSTRIP, &rows );
+ strip_size = TIFFStripSize( tif );
+
+ typedef std::vector<unsigned char> buffer_t;
+ buffer_t buf( strip_size );
+
+ int linesize = strip_size / rows;
+
+ tstrip_t nstrips = TIFFNumberOfStrips( tif );
+ for( tstrip_t i = 0; i < nstrips; ++i )
+ {
+ TIFFReadEncodedStrip( tif, i, &buf[ 0 ], strip_size );
+
+ buffer_t::pointer buf_data = &buf[ 0 ];
+
+ for( unsigned int j = 0; j < rows; ++j )
+ {
+ memcpy( data, buf_data, linesize );
- unsigned int strip_size = TIFFStripSize( tif );
- for( int i = 0; i < height * depth; i += rows )
- {
- tstrip_t strip = TIFFComputeStrip( tif, i, 0 );
- TIFFReadEncodedStrip( tif, strip, data + i * pitch, strip_size );
+ buf_data += linesize;
+ data += pitch;
+ }
}
}
@@ -149,7 +161,7 @@
virtual il::image_type_ptr load( const pl::string& uri )
{ return load_tiff( uri ); }
- virtual bool store( const pl::string& uri, il::image_type_ptr )
+ virtual bool store( const pl::string&, il::image_type_ptr )
{ return false; }
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-09-29 12:49:51
|
Revision: 320
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=320&view=rev
Author: glslang
Date: 2007-09-29 05:49:48 -0700 (Sat, 29 Sep 2007)
Log Message:
-----------
+ build fixes
Modified Paths:
--------------
trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj
Modified: trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj 2007-09-29 08:38:44 UTC (rev 319)
+++ trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj 2007-09-29 12:49:48 UTC (rev 320)
@@ -66,10 +66,10 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- AdditionalDependencies="Half_dll_d.lib IlmImf_dll_d.lib Iex_dll_d.lib"
+ AdditionalDependencies="Half.lib IlmImf.lib Iex.lib"
OutputFile="$(OutDir)\openeffectslib_tonemap-vc80-d-0_4_0.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)";"C:\openexr-1.4.0-vs2005\lib""
+ AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)";C:\OpenEXR\lib\Debug"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -150,10 +150,10 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- AdditionalDependencies="Half_dll.lib IlmImf_dll.lib Iex_dll.lib"
+ AdditionalDependencies="Half.lib IlmImf.lib Iex.lib"
OutputFile="$(OutDir)\openeffectslib_tonemap-vc80-r-0_4_0.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)";"C:\openexr-1.4.0-vs2005\lib""
+ AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)";C:\OpenEXR\lib\Release"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-09-29 08:38:46
|
Revision: 319
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=319&view=rev
Author: glslang
Date: 2007-09-29 01:38:44 -0700 (Sat, 29 Sep 2007)
Log Message:
-----------
+ build fixes
Modified Paths:
--------------
trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_plugin.cpp
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_plugin.cpp 2007-09-28 23:24:17 UTC (rev 318)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_plugin.cpp 2007-09-29 08:38:44 UTC (rev 319)
@@ -38,7 +38,7 @@
err = NativePathNameToFSSpec( const_cast<char*>( uri.c_str( ) ), &fsspec, kErrorIfFileNotFound );
#else
FSRef ref;
- err = FSPathMakeRef( ( const UInt8* ) stream->path( ).c_str( ), &ref, 0 );
+ err = FSPathMakeRef( ( const UInt8* ) uri.c_str( ), &ref, 0 );
if( err != noErr )
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-09-28 23:24:27
|
Revision: 318
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=318&view=rev
Author: glslang
Date: 2007-09-28 16:24:17 -0700 (Fri, 28 Sep 2007)
Log Message:
-----------
+ removes pl::stream from the interface. still used internally
Modified Paths:
--------------
trunk/lib/openlibraries/src/openassetlib/al/al.cpp
trunk/lib/openlibraries/src/openimagelib/il/openimagelib_plugin.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/png/png_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/py/il.cpp
trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.cpp
trunk/lib/openlibraries/src/openobjectlib/sg/appearance.cpp
trunk/lib/openlibraries/test/openimagelib/GL/_2D/_2D.cpp
trunk/lib/openlibraries/test/openimagelib/GL/_2D_compressed/_2D_compressed.cpp
trunk/lib/openlibraries/test/openimagelib/GL/_2D_compressed_cubemap/_2D_compressed_cubemap.cpp
trunk/lib/openlibraries/test/openimagelib/GL/_2D_crop/_2D_crop.cpp
trunk/lib/openlibraries/test/openimagelib/GL/_2D_crop2/_2D_crop2.cpp
trunk/lib/openlibraries/test/openimagelib/GL/_2D_exr/_2D_exr.cpp
trunk/lib/openlibraries/test/openimagelib/GL/_2D_sgi/_2D_sgi.cpp
Modified: trunk/lib/openlibraries/src/openassetlib/al/al.cpp
===================================================================
--- trunk/lib/openlibraries/src/openassetlib/al/al.cpp 2007-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/src/openassetlib/al/al.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -630,7 +630,7 @@
if(!plugin)
continue;
- oil::il::image_type_ptr image = boost::shared_dynamic_cast<oil::il::openimagelib_plugin>(plugin)->load( opl::make_stream( filepath, std::ios::in ));
+ oil::il::image_type_ptr image = boost::shared_dynamic_cast<oil::il::openimagelib_plugin>(plugin)->load( filepath );
if(image)
{
asset->set("width", image->width());
Modified: trunk/lib/openlibraries/src/openimagelib/il/openimagelib_plugin.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/openimagelib_plugin.hpp 2007-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/src/openimagelib/il/openimagelib_plugin.hpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -19,8 +19,8 @@
struct IL_DECLSPEC openimagelib_plugin : public olib::openpluginlib::openplugin
{
- virtual image_type_ptr load( openpluginlib::stream_ptr stream ) = 0;
- virtual bool store( openpluginlib::stream_ptr stream, image_type_ptr image ) = 0;
+ virtual image_type_ptr load( const openpluginlib::string& uri ) = 0;
+ virtual bool store( const openpluginlib::string& uri, image_type_ptr image ) = 0;
};
typedef boost::shared_ptr<openimagelib_plugin> openimagelib_plugin_ptr;
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.cpp 2007-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -87,10 +87,10 @@
class IL_DECLSPEC lightmap3D_plugin : public il::openimagelib_plugin
{
public:
- virtual il::image_type_ptr load( pl::stream_ptr stream )
+ virtual il::image_type_ptr load( const pl::string& )
{ return il::image_type_ptr( ); }
- virtual bool store( pl::stream_ptr stream, il::image_type_ptr )
+ virtual bool store( const pl::string&, il::image_type_ptr )
{ return false; }
};
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.cpp 2007-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -18,10 +18,10 @@
struct IL_DECLSPEC bmp_plugin : public il::openimagelib_plugin
{
- virtual il::image_type_ptr load( pl::stream_ptr )
+ virtual il::image_type_ptr load( const pl::string& )
{ return il::image_type_ptr( ); }
- virtual bool store( pl::stream_ptr, il::image_type_ptr )
+ virtual bool store( const pl::string&, il::image_type_ptr )
{ return false; }
};
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.cpp 2007-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -202,10 +202,10 @@
struct IL_DECLSPEC dds_plugin : public il::openimagelib_plugin
{
- virtual il::image_type_ptr load( pl::stream_ptr stream )
- { return load_dds( stream ); }
+ virtual il::image_type_ptr load( const pl::string& uri )
+ { return load_dds( pl::make_stream( uri, std::ios::in ) ); }
- virtual bool store( pl::stream_ptr, il::image_type_ptr )
+ virtual bool store( const pl::string&, il::image_type_ptr )
{ return false; }
};
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.cpp 2007-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -836,11 +836,11 @@
struct IL_DECLSPEC dpx_plugin : public il::openimagelib_plugin
{
- virtual il::image_type_ptr load( pl::stream_ptr stream )
- { return load_dpx( stream ); }
+ virtual il::image_type_ptr load( const pl::string& uri )
+ { return load_dpx( pl::make_stream( uri, std::ios::in ) ); }
- virtual bool store( pl::stream_ptr stream, il::image_type_ptr im )
- { return store_dpx( stream, im ); }
+ virtual bool store( const pl::string& uri, il::image_type_ptr im )
+ { return store_dpx( pl::make_stream( uri, std::ios::out ), im ); }
};
} } }
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.cpp 2007-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_plugin.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -21,9 +21,9 @@
void destroy( il::image_type* im )
{ delete im; }
- il::image_type_ptr load_exr( pl::stream_ptr stream )
+ il::image_type_ptr load_exr( const pl::string& uri )
{
- Imf::RgbaInputFile file( stream->path( ).c_str( ) );
+ Imf::RgbaInputFile file( uri.c_str( ) );
Imath::Box2i dw = file.header( ).dataWindow( );
int width = dw.max.x - dw.min.x + 1;
@@ -58,10 +58,10 @@
struct IL_DECLSPEC exr_plugin : public il::openimagelib_plugin
{
- virtual il::image_type_ptr load( pl::stream_ptr stream )
- { return load_exr( stream ); }
+ virtual il::image_type_ptr load( const pl::string& uri )
+ { return load_exr( uri ); }
- virtual bool store( pl::stream_ptr, il::image_type_ptr )
+ virtual bool store( const pl::string&, il::image_type_ptr )
{ return false; }
};
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_plugin.cpp 2007-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_plugin.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -79,9 +79,9 @@
}
}
- il::image_type_ptr load_image( pl::stream_ptr stream )
+ il::image_type_ptr load_image( const pl::string& uri )
{
- Gdiplus::Bitmap bitmap( ( pl::to_wstring( stream->path( ) ) ).c_str( ) );
+ Gdiplus::Bitmap bitmap( pl::to_wstring( uri ).c_str( ) );
Gdiplus::BitmapData bitmapData;
Gdiplus::Rect rect( 0, 0, bitmap.GetWidth( ), bitmap.GetHeight( ) );
@@ -147,10 +147,10 @@
class IL_DECLSPEC gdi_plugin : public il::openimagelib_plugin
{
public:
- virtual il::image_type_ptr load( pl::stream_ptr stream )
- { return load_image( stream ); }
+ virtual il::image_type_ptr load( const pl::string& uri )
+ { return load_image( uri ); }
- virtual bool store( pl::stream_ptr, il::image_type_ptr )
+ virtual bool store( const pl::string&, il::image_type_ptr )
{ return false; }
};
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_plugin.cpp 2007-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_plugin.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -277,11 +277,11 @@
struct IL_DECLSPEC hdr_plugin : public il::openimagelib_plugin
{
- virtual il::image_type_ptr load( pl::stream_ptr stream )
- { return load_hdr( stream ); }
+ virtual il::image_type_ptr load( const pl::string& uri )
+ { return load_hdr( pl::make_stream( uri, std::ios::in ) ); }
- virtual bool store( pl::stream_ptr stream, il::image_type_ptr im )
- { return store_hdr( stream, im ); }
+ virtual bool store( const pl::string& uri, il::image_type_ptr im )
+ { return store_hdr( pl::make_stream( uri, std::ios::out ), im ); }
};
} } }
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_plugin.cpp 2007-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_plugin.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -292,11 +292,11 @@
class IL_DECLSPEC jpg_plugin : public il::openimagelib_plugin
{
public:
- virtual il::image_type_ptr load( pl::stream_ptr stream )
- { return load_jpg( stream ); }
+ virtual il::image_type_ptr load( const pl::string& uri )
+ { return load_jpg( pl::make_stream( uri, std::ios::in ) ); }
- virtual bool store( pl::stream_ptr stream, il::image_type_ptr im )
- { return store_jpg( stream, im ); }
+ virtual bool store( const pl::string& uri, il::image_type_ptr im )
+ { return store_jpg( pl::make_stream( uri, std::ios::out ), im ); }
};
} } }
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/png/png_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/png/png_plugin.cpp 2007-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/png/png_plugin.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -39,10 +39,10 @@
}
}
- il::image_type_ptr load_png( pl::stream_ptr stream )
+ il::image_type_ptr load_png( const pl::string& uri )
{
// TODO: some proper exception handling is needed.
- FILE* infile = fopen( stream->path( ).c_str( ), "rb" );
+ FILE* infile = fopen( uri.c_str( ), "rb" );
if( infile == NULL ) return il::image_type_ptr( );
png_byte sig[ 8 ];
@@ -99,10 +99,10 @@
struct IL_DECLSPEC png_plugin : public il::openimagelib_plugin
{
- virtual il::image_type_ptr load( pl::stream_ptr stream )
- { return load_png( stream ); }
+ virtual il::image_type_ptr load( const pl::string& uri )
+ { return load_png( uri ); }
- virtual bool store( pl::stream_ptr, il::image_type_ptr )
+ virtual bool store( const pl::string&, il::image_type_ptr )
{ return false; }
};
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_plugin.cpp 2007-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_plugin.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -73,10 +73,10 @@
class IL_DECLSPEC psd_plugin : public il::openimagelib_plugin
{
public:
- virtual il::image_type_ptr load( pl::stream_ptr stream )
- { return load_psd( stream ); }
+ virtual il::image_type_ptr load( const pl::string& uri )
+ { return load_psd( pl::make_stream( uri, std::ios::in ) ); }
- virtual bool store( pl::stream_ptr, il::image_type_ptr )
+ virtual bool store( const pl::string&, il::image_type_ptr )
{ return false; }
};
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_plugin.cpp 2007-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_plugin.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -29,13 +29,13 @@
void destroy( il::image_type* im )
{ delete im; }
- il::image_type_ptr load_quicktime( pl::stream_ptr stream )
+ il::image_type_ptr load_quicktime( const pl::string& uri )
{
OSStatus err;
FSSpec fsspec;
#ifdef WIN32
- err = NativePathNameToFSSpec( const_cast<char*>( stream->path( ).c_str( ) ), &fsspec, kErrorIfFileNotFound );
+ err = NativePathNameToFSSpec( const_cast<char*>( uri.c_str( ) ), &fsspec, kErrorIfFileNotFound );
#else
FSRef ref;
err = FSPathMakeRef( ( const UInt8* ) stream->path( ).c_str( ), &ref, 0 );
@@ -117,10 +117,10 @@
struct IL_DECLSPEC qt_plugin : public il::openimagelib_plugin
{
- virtual il::image_type_ptr load( pl::stream_ptr stream )
- { return load_quicktime( stream ); }
+ virtual il::image_type_ptr load( const pl::string& uri )
+ { return load_quicktime( uri ); }
- virtual bool store( pl::stream_ptr stream, il::image_type_ptr )
+ virtual bool store( const pl::string& uri, il::image_type_ptr )
{ return false; }
};
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.cpp 2007-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -256,10 +256,10 @@
class IL_DECLSPEC sgi_plugin : public il::openimagelib_plugin
{
public:
- virtual il::image_type_ptr load( pl::stream_ptr stream )
- { return load_sgi( stream ); }
+ virtual il::image_type_ptr load( const pl::string& uri )
+ { return load_sgi( pl::make_stream( uri, std::ios::in ) ); }
- virtual bool store( pl::stream_ptr, il::image_type_ptr )
+ virtual bool store( const pl::string&, il::image_type_ptr )
{ return false; }
};
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_plugin.cpp 2007-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_plugin.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -222,10 +222,10 @@
class IL_DECLSPEC tga_plugin : public il::openimagelib_plugin
{
public:
- virtual il::image_type_ptr load( pl::stream_ptr stream )
- { return load_tga( stream ); }
+ virtual il::image_type_ptr load( const pl::string& uri )
+ { return load_tga( pl::make_stream( uri, std::ios::in ) ); }
- virtual bool store( pl::stream_ptr, il::image_type_ptr )
+ virtual bool store( const pl::string&, il::image_type_ptr )
{ return false; }
};
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.cpp 2007-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -40,9 +40,9 @@
return il::image_type_ptr( );
}
- il::image_type_ptr load_tiff( pl::stream_ptr stream )
+ il::image_type_ptr load_tiff( const pl::string& uri )
{
- TIFF* tif = TIFFOpen( stream->path( ).c_str( ), "r" );
+ TIFF* tif = TIFFOpen( uri.c_str( ), "r" );
if( tif == NULL )
return il::image_type_ptr( );
@@ -146,10 +146,10 @@
class IL_DECLSPEC tiff_plugin : public il::openimagelib_plugin
{
public:
- virtual il::image_type_ptr load( pl::stream_ptr stream )
- { return load_tiff( stream ); }
+ virtual il::image_type_ptr load( const pl::string& uri )
+ { return load_tiff( uri ); }
- virtual bool store( pl::stream_ptr, il::image_type_ptr )
+ virtual bool store( const pl::string& uri, il::image_type_ptr )
{ return false; }
};
Modified: trunk/lib/openlibraries/src/openimagelib/py/il.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/py/il.cpp 2007-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/src/openimagelib/py/il.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -22,7 +22,7 @@
if( !plug )
return il::image_type_ptr( );
- il::image_type_ptr image = plug->load( opl::make_stream( path, std::ios::in ) );
+ il::image_type_ptr image = plug->load( path );
if( !image )
return il::image_type_ptr( );
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.cpp 2007-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -328,7 +328,7 @@
if ( full != last_image_name_ )
{
last_image_name_ = full;
- last_image_ = plug_->load( pl::make_stream( full, std::ios::in ) );
+ last_image_ = plug_->load( full );
if ( last_image_ )
last_image_->set_writable( false );
}
@@ -338,7 +338,7 @@
{
if ( bucket_[ index ] == image_type_ptr( ) )
{
- image_type_ptr image = plug_->load( pl::make_stream( full, std::ios::in) );
+ image_type_ptr image = plug_->load( full );
if ( image )
{
bucket_[ index ] = image;
@@ -475,7 +475,7 @@
discovery::const_iterator i = plugins.begin( );
il::openimagelib_plugin_ptr plug = boost::shared_dynamic_cast<il::openimagelib_plugin>( i->create_plugin( "" ) );
if ( plug == 0 ) return false;
- return plug->store( pl::make_stream( out, std::ios::out ), image );
+ return plug->store( out.str( ), image );
}
private:
Modified: trunk/lib/openlibraries/src/openobjectlib/sg/appearance.cpp
===================================================================
--- trunk/lib/openlibraries/src/openobjectlib/sg/appearance.cpp 2007-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/src/openobjectlib/sg/appearance.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -144,7 +144,7 @@
il::openimagelib_plugin_ptr plug = boost::shared_dynamic_cast<il::openimagelib_plugin>( i->create_plugin( "" ) );
if( !plug ) return false;
- im_ = plug->load( opl::make_stream( path.native_file_string( ), std::ios::in ) );
+ im_ = plug->load( path.native_file_string( ) );
if( !im_ ) return false;
if( !opl::is_compressed_format( im_->pf( ).c_str( ) ) && im_->count( ) == 1 && im_->depth( ) == 1 )
Modified: trunk/lib/openlibraries/test/openimagelib/GL/_2D/_2D.cpp
===================================================================
--- trunk/lib/openlibraries/test/openimagelib/GL/_2D/_2D.cpp 2007-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/test/openimagelib/GL/_2D/_2D.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -64,18 +64,18 @@
};
}
-static GLuint download_texture( const boost::filesystem::path& path )
+static GLuint download_texture( const pl::string& path )
{
typedef pl::discovery<query_traits> oil_discovery;
- oil_discovery plugins( query_traits( pl::to_wstring( path.native_file_string( ).c_str( ) ) ) );
+ oil_discovery plugins( query_traits( pl::to_wstring( path.c_str( ) ) ) );
if( plugins.empty( ) ) return 0;
oil_discovery::const_iterator i = plugins.begin( );
il::openimagelib_plugin_ptr plug = boost::shared_dynamic_cast<il::openimagelib_plugin>( i->create_plugin( "" ) );
if( !plug ) return 0;
- il::image_type_ptr image = plug->load( pl::make_stream( path.native_file_string( ), std::ios::in ) );
+ il::image_type_ptr image = plug->load( path );
if( !image ) return 0;
image = il::conform( image, il::cropped | il::flipped | il::flopped );
Modified: trunk/lib/openlibraries/test/openimagelib/GL/_2D_compressed/_2D_compressed.cpp
===================================================================
--- trunk/lib/openlibraries/test/openimagelib/GL/_2D_compressed/_2D_compressed.cpp 2007-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/test/openimagelib/GL/_2D_compressed/_2D_compressed.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -73,7 +73,7 @@
il::openimagelib_plugin_ptr plug = boost::shared_static_cast<il::openimagelib_plugin>( i->create_plugin( "" ) );
if( !plug ) return 0;
- il::image_type_ptr image = plug->load( opl::make_stream( path, std::ios::in ) );
+ il::image_type_ptr image = plug->load( path );
if( !image ) return 0;
GLuint id;
Modified: trunk/lib/openlibraries/test/openimagelib/GL/_2D_compressed_cubemap/_2D_compressed_cubemap.cpp
===================================================================
--- trunk/lib/openlibraries/test/openimagelib/GL/_2D_compressed_cubemap/_2D_compressed_cubemap.cpp 2007-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/test/openimagelib/GL/_2D_compressed_cubemap/_2D_compressed_cubemap.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -75,7 +75,7 @@
il::openimagelib_plugin_ptr plug = boost::shared_dynamic_cast<il::openimagelib_plugin>( i->create_plugin( "" ) );
if( !plug ) return 0;
- il::image_type_ptr image = plug->load( opl::make_stream( path, std::ios::in ) );
+ il::image_type_ptr image = plug->load( path );
if( !image ) return 0;
glActiveTexture( GL_TEXTURE0 );
Modified: trunk/lib/openlibraries/test/openimagelib/GL/_2D_crop/_2D_crop.cpp
===================================================================
--- trunk/lib/openlibraries/test/openimagelib/GL/_2D_crop/_2D_crop.cpp 2007-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/test/openimagelib/GL/_2D_crop/_2D_crop.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -78,7 +78,7 @@
il::openimagelib_plugin_ptr plug = boost::shared_dynamic_cast<il::openimagelib_plugin>( i->create_plugin( "" ) );
if( !plug ) return 0;
- il::image_type_ptr image = plug->load( opl::make_stream( path, std::ios::in ) );
+ il::image_type_ptr image = plug->load( path );
if( !image ) return 0;
orig = image;
Modified: trunk/lib/openlibraries/test/openimagelib/GL/_2D_crop2/_2D_crop2.cpp
===================================================================
--- trunk/lib/openlibraries/test/openimagelib/GL/_2D_crop2/_2D_crop2.cpp 2007-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/test/openimagelib/GL/_2D_crop2/_2D_crop2.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -101,7 +101,7 @@
il::openimagelib_plugin_ptr plug = boost::shared_dynamic_cast<il::openimagelib_plugin>( i->create_plugin( "" ) );
if( !plug ) return 0;
- il::image_type_ptr image = plug->load( opl::make_stream( path, std::ios::in ) );
+ il::image_type_ptr image = plug->load( path );
if( !image ) return 0;
orig = image;
Modified: trunk/lib/openlibraries/test/openimagelib/GL/_2D_exr/_2D_exr.cpp
===================================================================
--- trunk/lib/openlibraries/test/openimagelib/GL/_2D_exr/_2D_exr.cpp 2007-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/test/openimagelib/GL/_2D_exr/_2D_exr.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -74,7 +74,7 @@
il::openimagelib_plugin_ptr plug = boost::shared_dynamic_cast<il::openimagelib_plugin>( i->create_plugin( "" ) );
if( !plug ) return 0;
- il::image_type_ptr image = plug->load( opl::make_stream( path, std::ios::in ) );
+ il::image_type_ptr image = plug->load( path );
if( !image ) return 0;
image = il::tm_linear( image );
Modified: trunk/lib/openlibraries/test/openimagelib/GL/_2D_sgi/_2D_sgi.cpp
===================================================================
--- trunk/lib/openlibraries/test/openimagelib/GL/_2D_sgi/_2D_sgi.cpp 2007-09-28 22:27:52 UTC (rev 317)
+++ trunk/lib/openlibraries/test/openimagelib/GL/_2D_sgi/_2D_sgi.cpp 2007-09-28 23:24:17 UTC (rev 318)
@@ -98,7 +98,7 @@
il::openimagelib_plugin_ptr plug = boost::shared_dynamic_cast<il::openimagelib_plugin>( i->create_plugin( "" ) );
if( !plug ) return 0;
- il::image_type_ptr image = plug->load( opl::make_stream( path, std::ios::in ) );
+ il::image_type_ptr image = plug->load( path );
if( !image ) return 0;
image = il::conform( image, il::cropped | il::flipped | il::flopped );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-09-28 22:27:55
|
Revision: 317
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=317&view=rev
Author: glslang
Date: 2007-09-28 15:27:52 -0700 (Fri, 28 Sep 2007)
Log Message:
-----------
+ update to OpenEXR 1.6.0
Modified Paths:
--------------
trunk/lib/openlibraries/installer/openlibraries_runtime.nsi
trunk/lib/openlibraries/installer/openlibraries_sdk.nsi
trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj
Modified: trunk/lib/openlibraries/installer/openlibraries_runtime.nsi
===================================================================
--- trunk/lib/openlibraries/installer/openlibraries_runtime.nsi 2007-09-27 19:15:01 UTC (rev 316)
+++ trunk/lib/openlibraries/installer/openlibraries_runtime.nsi 2007-09-28 22:27:52 UTC (rev 317)
@@ -90,14 +90,15 @@
File "C:\Program Files\FFmpeg\lib\avcodec-51.dll"
File "C:\Program Files\FFmpeg\lib\avformat-51.dll"
File "C:\Program Files\FFmpeg\lib\avutil-49.dll"
- File "C:\openexr-1.4.0-vs2005\bin\Half_dll.dll"
- File "C:\openexr-1.4.0-vs2005\bin\IlmImf_dll.dll"
- File "C:\openexr-1.4.0-vs2005\bin\Iex_dll.dll"
- File "C:\openexr-1.4.0-vs2005\bin\Imath_dll.dll"
- File "C:\openexr-1.4.0-vs2005\bin\zlib1.dll"
- File "C:\openexr-1.4.0-vs2005\bin\IlmThread_dll.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
@@ -167,7 +168,8 @@
Push "$INSTDIR\bin"
Call AddToPath
-
+ Push "$INSTDIR\bin\Release"
+ Call AddToPath
;--------------------------------
;Python environment variable
Push "PYTHONPATH"
@@ -215,6 +217,9 @@
Push "$INSTDIR\bin"
Call un.RemoveFromPath
+ Push "$INSTDIR\bin\Release"
+ Call un.RemoveFromPath
+
Push "PYTHONPATH"
Call un.DeleteEnvStr
Modified: trunk/lib/openlibraries/installer/openlibraries_sdk.nsi
===================================================================
--- trunk/lib/openlibraries/installer/openlibraries_sdk.nsi 2007-09-27 19:15:01 UTC (rev 316)
+++ trunk/lib/openlibraries/installer/openlibraries_sdk.nsi 2007-09-28 22:27:52 UTC (rev 317)
@@ -185,20 +185,15 @@
File "C:\Program Files\FFmpeg\lib\avcodec-51.dll"
File "C:\Program Files\FFmpeg\lib\avformat-51.dll"
File "C:\Program Files\FFmpeg\lib\avutil-49.dll"
- File "C:\openexr-1.4.0-vs2005\bin\Half_dll_d.dll"
- File "C:\openexr-1.4.0-vs2005\bin\Half_dll.dll"
- File "C:\openexr-1.4.0-vs2005\bin\IlmImf_dll_d.dll"
- File "C:\openexr-1.4.0-vs2005\bin\IlmImf_dll.dll"
- File "C:\openexr-1.4.0-vs2005\bin\Iex_dll_d.dll"
- File "C:\openexr-1.4.0-vs2005\bin\Iex_dll.dll"
- File "C:\openexr-1.4.0-vs2005\bin\Imath_dll_d.dll"
- File "C:\openexr-1.4.0-vs2005\bin\Imath_dll.dll"
- File "C:\openexr-1.4.0-vs2005\bin\zlib1.dll"
- File "C:\openexr-1.4.0-vs2005\bin\zlib1d.dll"
- File "C:\openexr-1.4.0-vs2005\bin\IlmThread_dll_d.dll"
- File "C:\openexr-1.4.0-vs2005\bin\IlmThread_dll.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
@@ -316,6 +311,8 @@
Push "$INSTDIR\bin"
Call AddToPath
+ Push "$INSTDIR\bin\Debug"
+ Call AddToPath
;--------------------------------
;Include environment variable
@@ -367,8 +364,6 @@
Section Uninstall
- ;ExecWait 'regsvr32 GetAudio.ax -u'
-
SetDetailsPrint textonly
DetailPrint "Deleting Files..."
SetDetailsPrint listonly
@@ -379,6 +374,9 @@
Push "$INSTDIR\bin"
Call un.RemoveFromPath
+ Push "$INSTDIR\bin\Debug"
+ Call un.RemoveFromPath
+
Push "OPENLIBRARIES_LIB_PATH"
Call un.DeleteEnvStr
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj 2007-09-27 19:15:01 UTC (rev 316)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj 2007-09-28 22:27:52 UTC (rev 317)
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";"C:\openexr-1.4.0-vs2005\include\OpenEXR""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";"C:\OpenEXR\include""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING;OPENEXR_DLL"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -67,10 +67,10 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- AdditionalDependencies="Half_dll_d.lib IlmImf_dll_d.lib Iex_dll_d.lib"
+ AdditionalDependencies="Half.lib IlmImf.lib Iex.lib"
OutputFile="$(OutDir)\openimagelib_exr-vc80-d-0_4_0.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)";"C:\openexr-1.4.0-vs2005\lib""
+ AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)";C:\OpenEXR\lib\Debug"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -125,7 +125,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";"C:\openexr-1.4.0-vs2005\include\OpenEXR""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";C:\OpenEXR\include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING;OPENEXR_DLL"
ExceptionHandling="2"
RuntimeLibrary="2"
@@ -151,10 +151,10 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- AdditionalDependencies="Half_dll.lib IlmImf_dll.lib Iex_dll.lib"
+ AdditionalDependencies="Half.lib IlmImf.lib Iex.lib"
OutputFile="$(OutDir)\openimagelib_exr-vc80-r-0_4_0.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)";"C:\openexr-1.4.0-vs2005\lib""
+ AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)";C:\OpenEXR\lib\Release"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-09-27 19:15:03
|
Revision: 316
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=316&view=rev
Author: glslang
Date: 2007-09-27 12:15:01 -0700 (Thu, 27 Sep 2007)
Log Message:
-----------
+script engine eval
Modified Paths:
--------------
trunk/app/HDRFlow/ScriptEngine.cpp
Modified: trunk/app/HDRFlow/ScriptEngine.cpp
===================================================================
--- trunk/app/HDRFlow/ScriptEngine.cpp 2007-09-24 21:36:11 UTC (rev 315)
+++ trunk/app/HDRFlow/ScriptEngine.cpp 2007-09-27 19:15:01 UTC (rev 316)
@@ -101,11 +101,10 @@
for( const_iterator I = split_vec.begin( ); I != split_vec.end( ); ++I )
result_ += "# " + *I + "\n";
- std::pair<pl::string, bool> result = in_python( str, Py_eval_input );
- if( !result.second )
- result = in_python( str, Py_file_input );
-
- result_ += result.first;
+ std::pair<pl::string, bool> result = in_python( str, Py_file_input );
+ if( result.second)
+ result_ += result.first;
+
return result.second;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-09-24 21:36:13
|
Revision: 315
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=315&view=rev
Author: glslang
Date: 2007-09-24 14:36:11 -0700 (Mon, 24 Sep 2007)
Log Message:
-----------
+ updates boost to 1_34_1 on windows
Modified Paths:
--------------
trunk/lib/extras/src/noise/noise_vc8.vcproj
trunk/lib/extras/src/panoramic/panoramic_vc8.vcproj
trunk/lib/extras/src/ppm/ppm_vc8.vcproj
trunk/lib/extras/src/raw/raw_vc8.vcproj
trunk/lib/openlibraries/src/openassetlib/al/al_vc8.vcproj
trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite_vc8.vcproj
trunk/lib/openlibraries/src/openassetlib/py/py_vc8.vcproj
trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_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/jpg/jpg_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/png/png_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_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/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/glew/glew_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/plugins/quicktime/quicktime_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/plugins/template/template_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/py/py_vc8.vcproj
trunk/lib/openlibraries/src/openobjectlib/plugins/X3D/X3D_vc8.vcproj
trunk/lib/openlibraries/src/openobjectlib/plugins/obj/obj_vc8.vcproj
trunk/lib/openlibraries/src/openobjectlib/sg/sg_vc8.vcproj
trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj
trunk/lib/openlibraries/src/openpluginlib/py/py_vc8.vcproj
trunk/lib/openlibraries/test/openassetlib/unittest_filesystem_storage_plugin/unittest_filesystem_storage_plugin.vcproj
trunk/lib/openlibraries/test/openassetlib/unittest_sqlite3_metadata_plugin/unittest_sqlite3_metadata_plugin.vcproj
trunk/lib/openlibraries/test/openeffectslib/rescaler_bench/rescaler_bench_vc8.vcproj
trunk/lib/openlibraries/test/openeffectslib/tm_bench/tm_bench_vc8.vcproj
trunk/lib/openlibraries/test/openimagelib/GL/_2D/_2D_vc8.vcproj
trunk/lib/openlibraries/test/openimagelib/GL/_2D_compressed/_2D_compressed_vc8.vcproj
trunk/lib/openlibraries/test/openimagelib/GL/_2D_compressed_cubemap/_2D_compressed_cubemap_vc8.vcproj
trunk/lib/openlibraries/test/openimagelib/GL/_2D_crop/_2D_crop_vc8.vcproj
trunk/lib/openlibraries/test/openimagelib/GL/_2D_crop2/_2D_crop2_vc8.vcproj
trunk/lib/openlibraries/test/openimagelib/GL/_2D_exr/_2D_exr_vc8.vcproj
trunk/lib/openlibraries/test/openimagelib/GL/_2D_sgi/_2D_sgi_vc8.vcproj
trunk/lib/openlibraries/test/openimagelib/GL/_3D_lightmap/_3D_lightmap_vc8.vcproj
trunk/lib/openlibraries/test/openmedialib/player/player_vc8.vcproj
trunk/lib/openlibraries/test/openmedialib/store/store_vc8.vcproj
trunk/lib/openlibraries/test/openobjectlib/GL/multipass_draw/multipass_draw_vc8.vcproj
trunk/lib/openlibraries/test/openobjectlib/GL/noise_volume/noise_volume_vc8.vcproj
trunk/lib/openlibraries/test/openobjectlib/GL/obj_draw/obj_draw_vc8.vcproj
trunk/lib/openlibraries/test/openobjectlib/GL/texture_draw/texture_draw_vc8.vcproj
trunk/lib/openlibraries/test/openpluginlib/discovery/discovery_vc8.vcproj
trunk/lib/openlibraries/test/openpluginlib/enumerate/enumerate_vc8.vcproj
trunk/lib/openlibraries/test/openpluginlib/gpu_timer_query/gpu_timer_query_vc8.vcproj
trunk/lib/openlibraries/test/openpluginlib/initialization/initialization_vc8.vcproj
trunk/lib/openlibraries/test/openpluginlib/pcos/key/key_vc8.vcproj
trunk/lib/openlibraries/test/openpluginlib/pcos/property/property_vc8.vcproj
trunk/lib/openlibraries/test/openpluginlib/pcos/property_container/property_container_vc8.vcproj
trunk/lib/openlibraries/test/openpluginlib/pcos/subject-observer/subject-observer_vc8.vcproj
trunk/lib/openlibraries/test/openpluginlib/rdtsc/rdtsc_vc8.vcproj
trunk/lib/openlibraries/test/openpluginlib/sleep/sleep_vc8.vcproj
Modified: trunk/lib/extras/src/noise/noise_vc8.vcproj
===================================================================
--- trunk/lib/extras/src/noise/noise_vc8.vcproj 2007-09-23 17:01:10 UTC (rev 314)
+++ trunk/lib/extras/src/noise/noise_vc8.vcproj 2007-09-24 21:36:11 UTC (rev 315)
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)\..\openlibraries\src";"C:\Boost\include\boost-1_34";C:\OFX"
+ AdditionalIncludeDirectories=""$(SolutionDir)\..\openlibraries\src";"C:\Boost\include\boost-1_34_1";C:\OFX"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;NOISE_EXPORTS;HAVE_FLEX_STRING"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -121,7 +121,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(SolutionDir)\..\openlibraries\src";"C:\Boost\include\boost-1_34";C:\OFX"
+ AdditionalIncludeDirectories=""$(SolutionDir)\..\openlibraries\src";"C:\Boost\include\boost-1_34_1";C:\OFX"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;NOISE_EXPORTS;HAVE_FLEX_STRING"
ExceptionHandling="2"
RuntimeLibrary="2"
Modified: trunk/lib/extras/src/panoramic/panoramic_vc8.vcproj
===================================================================
--- trunk/lib/extras/src/panoramic/panoramic_vc8.vcproj 2007-09-23 17:01:10 UTC (rev 314)
+++ trunk/lib/extras/src/panoramic/panoramic_vc8.vcproj 2007-09-24 21:36:11 UTC (rev 315)
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)\..\openlibraries\src";"C:\Boost\include\boost-1_34";C:\OFX"
+ AdditionalIncludeDirectories=""$(SolutionDir)\..\openlibraries\src";"C:\Boost\include\boost-1_34_1";C:\OFX"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PANORAMIC_EXPORTS;HAVE_FLEX_STRING"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -122,7 +122,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(SolutionDir)\..\openlibraries\src";"C:\Boost\include\boost-1_34";C:\OFX"
+ AdditionalIncludeDirectories=""$(SolutionDir)\..\openlibraries\src";"C:\Boost\include\boost-1_34_1";C:\OFX"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PANORAMIC_EXPORTS;HAVE_FLEX_STRING"
ExceptionHandling="2"
RuntimeLibrary="2"
Modified: trunk/lib/extras/src/ppm/ppm_vc8.vcproj
===================================================================
--- trunk/lib/extras/src/ppm/ppm_vc8.vcproj 2007-09-23 17:01:10 UTC (rev 314)
+++ trunk/lib/extras/src/ppm/ppm_vc8.vcproj 2007-09-24 21:36:11 UTC (rev 315)
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)\..\openlibraries\src";"C:\Boost\include\boost-1_34""
+ AdditionalIncludeDirectories=""$(SolutionDir)\..\openlibraries\src";"C:\Boost\include\boost-1_34_1""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PPM_EXPORTS;HAVE_FLEX_STRING"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -120,7 +120,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(SolutionDir)\..\openlibraries\src";"C:\Boost\include\boost-1_34""
+ AdditionalIncludeDirectories=""$(SolutionDir)\..\openlibraries\src";"C:\Boost\include\boost-1_34_1""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PPM_EXPORTS;HAVE_FLEX_STRING"
ExceptionHandling="2"
RuntimeLibrary="2"
Modified: trunk/lib/extras/src/raw/raw_vc8.vcproj
===================================================================
--- trunk/lib/extras/src/raw/raw_vc8.vcproj 2007-09-23 17:01:10 UTC (rev 314)
+++ trunk/lib/extras/src/raw/raw_vc8.vcproj 2007-09-24 21:36:11 UTC (rev 315)
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)\..\openlibraries\src";"C:\Boost\include\boost-1_34""
+ AdditionalIncludeDirectories=""$(SolutionDir)\..\openlibraries\src";"C:\Boost\include\boost-1_34_1""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;RAW_EXPORTS;HAVE_FLEX_STRING;_CRT_SECURE_NO_WARNINGS;NO_JPEG;NO_LCMS"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -124,7 +124,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(SolutionDir)\..\openlibraries\src";"C:\Boost\include\boost-1_34""
+ AdditionalIncludeDirectories=""$(SolutionDir)\..\openlibraries\src";"C:\Boost\include\boost-1_34_1""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;RAW_EXPORTS;HAVE_FLEX_STRING;_CRT_SECURE_NO_WARNINGS;NO_JPEG;NO_LCMS"
ExceptionHandling="2"
RuntimeLibrary="2"
Modified: trunk/lib/openlibraries/src/openassetlib/al/al_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openassetlib/al/al_vc8.vcproj 2007-09-23 17:01:10 UTC (rev 314)
+++ trunk/lib/openlibraries/src/openassetlib/al/al_vc8.vcproj 2007-09-24 21:36:11 UTC (rev 315)
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="C:\Boost\include\boost-1_34;$(SolutionDir)\src"
+ AdditionalIncludeDirectories="C:\Boost\include\boost-1_34_1;$(SolutionDir)\src"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;AL_EXPORTS;OPENASSETLIB_BUILD;HAVE_FLEX_STRING"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -125,7 +125,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="C:\Boost\include\boost-1_34;$(SolutionDir)\src"
+ AdditionalIncludeDirectories="C:\Boost\include\boost-1_34_1;$(SolutionDir)\src"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;AL_EXPORTS;OPENASSETLIB_BUILD;HAVE_FLEX_STRING"
ExceptionHandling="2"
RuntimeLibrary="2"
Modified: trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite_vc8.vcproj 2007-09-23 17:01:10 UTC (rev 314)
+++ trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite_vc8.vcproj 2007-09-24 21:36:11 UTC (rev 315)
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="$(SolutionDir)src;C:\Boost\include\boost-1_34"
+ AdditionalIncludeDirectories="$(SolutionDir)src;C:\Boost\include\boost-1_34_1"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_EXPORTS;HAVE_FLEX_STRING;OPENASSETLIB_BUILD"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -124,7 +124,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(SolutionDir)src;C:\Boost\include\boost-1_34"
+ AdditionalIncludeDirectories="$(SolutionDir)src;C:\Boost\include\boost-1_34_1"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_EXPORTS;HAVE_FLEX_STRING;OPENASSETLIB_BUILD"
ExceptionHandling="2"
RuntimeLibrary="2"
Modified: trunk/lib/openlibraries/src/openassetlib/py/py_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openassetlib/py/py_vc8.vcproj 2007-09-23 17:01:10 UTC (rev 314)
+++ trunk/lib/openlibraries/src/openassetlib/py/py_vc8.vcproj 2007-09-24 21:36:11 UTC (rev 315)
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34";C:\Python25\include"
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";C:\Python25\include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PY_EXPORTS;AL_EXPORTS;OPENASSETLIB_BUILD;HAVE_FLEX_STRING;HAVE_BOOST_FILESYSTEM;PYTHON_BINDING"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -66,7 +66,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- AdditionalDependencies="boost_python-vc80-mt-gd-1_34.lib"
+ AdditionalDependencies="boost_python-vc80-mt-gd-1_34_1.lib"
OutputFile="$(OutDir)\HDRFlowAsset.pyd"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;C:\Python25\Libs;$(SolutionDir)src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)src\openassetlib\al\$(ConfigurationName);$(SolutionDir)src\openimagelib\il\$(ConfigurationName);$(SolutionDir)src\openmedialib\ml\$(ConfigurationName);$(SolutionDir)src\openobjectlib\sg\$(ConfigurationName)"
@@ -124,7 +124,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34";C:\Python25\include"
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";C:\Python25\include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PY_EXPORTS;AL_EXPORTS;OPENASSETLIB_BUILD;HAVE_FLEX_STRING;HAVE_BOOST_FILESYSTEM;PYTHON_BINDING"
ExceptionHandling="2"
RuntimeLibrary="2"
@@ -149,7 +149,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- AdditionalDependencies="boost_python-vc80-mt-1_34.lib"
+ AdditionalDependencies="boost_python-vc80-mt-1_34_1.lib"
OutputFile="$(OutDir)\HDRFlowAsset.pyd"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;C:\Python25\Libs;$(SolutionDir)src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)src\openassetlib\al\$(ConfigurationName);$(SolutionDir)src\openimagelib\il\$(ConfigurationName);$(SolutionDir)src\openmedialib\ml\$(ConfigurationName);$(SolutionDir)src\openobjectlib\sg\$(ConfigurationName)"
Modified: trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj 2007-09-23 17:01:10 UTC (rev 314)
+++ trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj 2007-09-24 21:36:11 UTC (rev 315)
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34";;"C:\openexr-1.4.0-vs2005\include\OpenEXR""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";;"C:\openexr-1.4.0-vs2005\include\OpenEXR""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TONEMAP_EXPORTS;ML_PLUGIN_EXPORTS;OPENMEDIALIB_BUILD;HAVE_FLEX_STRING;OPENEXR_DLL;HAVE_OPENEXR"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -124,7 +124,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34";;"C:\openexr-1.4.0-vs2005\include\OpenEXR""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";;"C:\openexr-1.4.0-vs2005\include\OpenEXR""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TONEMAP_EXPORTS;;ML_PLUGIN_EXPORTS;OPENMEDIALIB_BUILD;HAVE_FLEX_STRING;OPENEXR_DLL;HAVE_OPENEXR"
ExceptionHandling="2"
RuntimeLibrary="2"
Modified: trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj 2007-09-23 17:01:10 UTC (rev 314)
+++ trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj 2007-09-24 21:36:11 UTC (rev 315)
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""C:\Boost\include\boost-1_34";"$(SolutionDir)\src""
+ AdditionalIncludeDirectories=""C:\Boost\include\boost-1_34_1";"$(SolutionDir)\src""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING;OPENEXR_DLL;HAVE_OPENEXR"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -132,7 +132,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="3"
- AdditionalIncludeDirectories=""C:\Boost\include\boost-1_34";"$(SolutionDir)\src""
+ AdditionalIncludeDirectories=""C:\Boost\include\boost-1_34_1";"$(SolutionDir)\src""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING;OPENEXR_DLL;HAVE_OPENEXR;OPENEXR_DLL"
ExceptionHandling="2"
RuntimeLibrary="2"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_vc8.vcproj 2007-09-23 17:01:10 UTC (rev 314)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_vc8.vcproj 2007-09-24 21:36:11 UTC (rev 315)
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -125,7 +125,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
ExceptionHandling="2"
RuntimeLibrary="2"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_vc8.vcproj 2007-09-23 17:01:10 UTC (rev 314)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_vc8.vcproj 2007-09-24 21:36:11 UTC (rev 315)
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -130,7 +130,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="3"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
ExceptionHandling="2"
RuntimeLibrary="2"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.vcproj 2007-09-23 17:01:10 UTC (rev 314)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.vcproj 2007-09-24 21:36:11 UTC (rev 315)
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34";"C:\Program Files\Microsoft DirectX 9.0 SDK (Summer 2004)\Include""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";"C:\Program Files\Microsoft DirectX 9.0 SDK (Summer 2004)\Include""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -126,7 +126,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";C:\Boost\include\boost-1_34;"C:\Program Files\Microsoft DirectX 9.0 SDK (Summer 2004)\Include""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";C:\Boost\include\boost-1_34_1;"C:\Program Files\Microsoft DirectX 9.0 SDK (Summer 2004)\Include""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
ExceptionHandling="2"
RuntimeLibrary="2"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_vc8.vcproj 2007-09-23 17:01:10 UTC (rev 314)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_vc8.vcproj 2007-09-24 21:36:11 UTC (rev 315)
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -123,7 +123,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
ExceptionHandling="2"
RuntimeLibrary="2"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj 2007-09-23 17:01:10 UTC (rev 314)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj 2007-09-24 21:36:11 UTC (rev 315)
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34";"C:\openexr-1.4.0-vs2005\include\OpenEXR""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";"C:\openexr-1.4.0-vs2005\include\OpenEXR""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING;OPENEXR_DLL"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -125,7 +125,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34";"C:\openexr-1.4.0-vs2005\include\OpenEXR""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";"C:\openexr-1.4.0-vs2005\include\OpenEXR""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING;OPENEXR_DLL"
ExceptionHandling="2"
RuntimeLibrary="2"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_vc8.vcproj 2007-09-23 17:01:10 UTC (rev 314)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_vc8.vcproj 2007-09-24 21:36:11 UTC (rev 315)
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -125,7 +125,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
ExceptionHandling="2"
RuntimeLibrary="2"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_vc8.vcproj 2007-09-23 17:01:10 UTC (rev 314)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_vc8.vcproj 2007-09-24 21:36:11 UTC (rev 315)
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -128,7 +128,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
ExceptionHandling="2"
RuntimeLibrary="2"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_vc8.vcproj 2007-09-23 17:01:10 UTC (rev 314)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_vc8.vcproj 2007-09-24 21:36:11 UTC (rev 315)
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34";"C:\Program Files\HDR\include""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";"C:\Program Files\HDR\include""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING;HAVE_JPEGHDR"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -131,7 +131,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="3"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34";"C:\Program Files\HDR\include""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";"C:\Program Files\HDR\include""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING;HAVE_JPEGHDR"
ExceptionHandling="2"
RuntimeLibrary="0"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/png/png_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/png/png_vc8.vcproj 2007-09-23 17:01:10 UTC (rev 314)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/png/png_vc8.vcproj 2007-09-24 21:36:11 UTC (rev 315)
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34";C:\libpng\include;C:\zlib\include"
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";C:\libpng\include;C:\zlib\include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -126,7 +126,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34";C:\libpng\include;C:\zlib\include"
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";C:\libpng\include;C:\zlib\include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
ExceptionHandling="2"
RuntimeLibrary="2"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_vc8.vcproj 2007-09-23 17:01:10 UTC (rev 314)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_vc8.vcproj 2007-09-24 21:36:11 UTC (rev 315)
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -125,7 +125,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
RuntimeLibrary="2"
BufferSecurityCheck="false"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_vc8.vcproj 2007-09-23 17:01:10 UTC (rev 314)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_vc8.vcproj 2007-09-24 21:36:11 UTC (rev 315)
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34";"C:\Program Files\QuickTime SDK\CIncludes""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";"C:\Program Files\QuickTime SDK\CIncludes""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -126,7 +126,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34";"C:\Program Files\QuickTime SDK\CIncludes""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";"C:\Program Files\QuickTime SDK\CIncludes""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
ExceptionHandling="2"
RuntimeLibrary="2"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_vc8.vcproj 2007-09-23 17:01:10 UTC (rev 314)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_vc8.vcproj 2007-09-24 21:36:11 UTC (rev 315)
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -125,7 +125,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
RuntimeLibrary="2"
BufferSecurityCheck="false"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_vc8.vcproj 2007-09-23 17:01:10 UTC (rev 314)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_vc8.vcproj 2007-09-24 21:36:11 UTC (rev 315)
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -126,7 +126,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
ExceptionHandling="2"
RuntimeLibrary="2"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_vc8.vcproj 2007-09-23 17:01:10 UTC (rev 314)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_vc8.vcproj 2007-09-24 21:36:11 UTC (rev 315)
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34";C:\libtiff\include"
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";C:\libtiff\include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -124,7 +124,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34";C:\libtiff\include"
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";C:\libtiff\include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
ExceptionHandling="2"
RuntimeLibrary="2"
Modified: trunk/lib/openlibraries/src/openimagelib/py/py_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/py/py_vc8.vcproj 2007-09-23 17:01:10 UTC (rev 314)
+++ trunk/lib/openlibraries/src/openimagelib/py/py_vc8.vcproj 2007-09-24 21:36:11 UTC (rev 315)
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34";C:\Python25\include"
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";C:\Python25\include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PY_EXPORTS;HAVE_FLEX_STRING"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -65,7 +65,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- AdditionalDependencies="boost_python-vc80-mt-gd-1_34.lib"
+ 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)";C:\Python25\Libs"
@@ -123,7 +123,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34";C:\Python25\include"
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";C:\Python25\include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PY_EXPORTS;HAVE_FLEX_STRING"
ExceptionHandling="2"
RuntimeLibrary="2"
@@ -148,7 +148,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- AdditionalDependencies="boost_python-vc80-mt-1_34.lib"
+ AdditionalDependencies="boost_python-vc80-mt-1_34_1.lib"
OutputFile="$(OutDir)\HDRFlowImage.pyd"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)";C:\Python25\Libs"
Modified: trunk/lib/openlibraries/src/openmedialib/ml/ml_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/ml/ml_vc8.vcproj 2007-09-23 17:01:10 UTC (rev 314)
+++ trunk/lib/openlibraries/src/openmedialib/ml/ml_vc8.vcproj 2007-09-24 21:36:11 UTC (rev 315)
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;ML_EXPORTS;OPENMEDIALIB_BUILD;HAVE_FLEX_STRING"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -125,7 +125,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;ML_EXPORTS;OPENMEDIALIB_BUILD;HAVE_FLEX_STRING"
ExceptionHandling="2"
RuntimeLibrary="2"
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_vc8.vcproj 2007-09-23 17:01:10 UTC (rev 314)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_vc8.vcproj 2007-09-24 21:36:11 UTC (rev 315)
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34";"C:\Program Files\FFmpeg\include\ffmpeg""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";"C:\Program Files\FFmpeg\include\ffmpeg""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;AVFORMAT_EXPORTS;ML_PLUGIN_EXPORTS;OPENMEDIALIB_BUILD;HAVE_FLEX_STRING"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -125,7 +125,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34";"C:\Program Files\FFmpeg\include\\ffmpeg""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";"C:\Program Files\FFmpeg\include\\ffmpeg""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;AVFORMAT_EXPORTS;ML_PLUGIN_EXPORTS;OPENMEDIALIB_BUILD;HAVE_FLEX_STRING"
MinimalRebuild="false"
ExceptionHandling="2"
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_vc8.vcproj 2007-09-23 17:01:10 UTC (rev 314)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_vc8.vcproj 2007-09-24 21:36:11 UTC (rev 315)
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GENSYS_EXPORTS;ML_PLUGIN_EXPORTS;OPENMEDIALIB_BUILD;HAVE_FLEX_STRING"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -124,7 +124,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GENSYS_EXPORTS;ML_PLUGIN_EXPORTS;OPENMEDIALIB_BUILD;HAVE_FLEX_STRING"
ExceptionHandling="2"
RuntimeLibrary="2"
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/glew/glew_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/glew/glew_vc8.vcproj 2007-09-23 17:01:10 UTC (rev 314)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/glew/glew_vc8.vcproj 2007-09-24 21:36:11 UTC (rev 315)
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GLEW_EXPORTS;ML_PLUGIN_EXPORTS;OPENMEDIALIB_BUILD;HAVE_FLEX_STRING"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -125,7 +125,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GLEW_EXPORTS;ML_PLUGIN_EXPORTS;OPENMEDIALIB_BUILD;HAVE_FLEX_STRING"
ExceptionHandling="2"
RuntimeLibrary="2"
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_vc8.vcproj 2007-09-23 17:01:10 UTC (rev 314)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_vc8.vcproj 2007-09-24 21:36:11 UTC (rev 315)
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34";C:\OFX"
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";C:\OFX"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OFX_EXPORTS;ML_PLUGIN_EXPORTS;OPENMEDIALIB_BUILD;HAVE_FLEX_STRING"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -123,7 +123,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34";C:\OFX"
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";C:\OFX"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OFX_EXPORTS;ML_PLUGIN_EXPORTS;OPENMEDIALIB_BUILD;HAVE_FLEX_STRING"
ExceptionHandling="2"
RuntimeLibrary="2"
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_vc8.vcproj 2007-09-23 17:01:10 UTC (rev 314)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_vc8.vcproj 2007-09-24 21:36:11 UTC (rev 315)
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OIL_EXPORTS;ML_PLUGIN_EXPORTS;OPENMEDIALIB_BUILD;HAVE_FLEX_STRING"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -125,7 +125,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OIL_EXPORTS;ML_PLUGIN_EXPORTS;OPENMEDIALIB_BUILD;HAVE_FLEX_STRING"
ExceptionHandling="2"
RuntimeLibrary="2"
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/openal/openal_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/openal/openal_vc8.vcproj 2007-09-23 17:01:10 UTC (rev 314)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/openal/openal_vc8.vcproj 2007-09-24 21:36:11 UTC (rev 315)
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34";"C:\Program Files\OpenAL 1.1 SDK\include""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";"C:\Program Files\OpenAL 1.1 SDK\include""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OPENAL_EXPORTS;ML_PLUGIN_EXPORTS;OPENMEDIALIB_BUILD;HAVE_FLEX_STRING"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -125,7 +125,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34";"C:\Program Files\OpenAL 1.1 SDK\include""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";"C:\Program Files\OpenAL 1.1 SDK\include""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OPENAL_EXPORTS;ML_PLUGIN_EXPORTS;OPENMEDIALIB_BUILD;HAVE_FLEX_STRING"
ExceptionHandling="2"
RuntimeLibrary="2"
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_vc8.vcproj 2007-09-23 17:01:10 UTC (rev 314)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_vc8.vcproj 2007-09-24 21:36:11 UTC (rev 315)
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34";"C:\Program Files\QuickTime SDK\CIncludes""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";"C:\Program Files\QuickTime SDK\CIncludes""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;QUICKTIME_EXPORTS;ML_PLUGIN_EXPORTS;OPENMEDIALIB_BUILD;HAVE_FLEX_STRING"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -125,7 +125,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34";"C:\Program Files\QuickTime SDK\CIncludes""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";"C:\Program Files\QuickTime SDK\CIncludes""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;QUICKTIME_EXPORTS;ML_PLUGIN_EXPORTS;OPENMEDIALIB_BUILD;HAVE_FLEX_STRING"
ExceptionHandling="2"
RuntimeLibrary="2"
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/template/template_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/template/template_vc8.vcproj 2007-09-23 17:01:10 UTC (rev 314)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/template/template_vc8.vcproj 2007-09-24 21:36:11 UTC (rev 315)
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TEMPLATE_EXPORTS;ML_PLUGIN_EXPORTS;OPENMEDIALIB_BUILD;HAVE_FLEX_STRING"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -124,7 +124,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TEMPLATE_EXPORTS;ML_PLUGIN_EXPORTS;OPENMEDIALIB_BUILD;HAVE_FLEX_STRING"
ExceptionHandling="2"
RuntimeLibrary="2"
Modified: trunk/lib/openlibraries/src/openmedialib/py/py_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/py/py_vc8.vcproj 2007-09-23 17:01:10 UTC (rev 314)
+++ trunk/lib/openlibraries/src/openmedialib/py/py_vc8.vcproj 2007-09-24 21:36:11 UTC (rev 315)
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34";C:\Python25\include"
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";C:\Python25\include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PY_EXPORTS;OPENMEDIALIB_BUILD;HAVE_FLEX_STRING"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -67,7 +67,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- AdditionalDependencies="boost_python-vc80-mt-gd-1_34.lib"
+ 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)"
@@ -125,7 +125,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34";C:\Python25\include"
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";C:\Python25\include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PY_EXPORTS;OPENMEDIALIB_BUILD;HAVE_FLEX_STRING"
ExceptionHandling="2"
RuntimeLibrary="2"
@@ -151,7 +151,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- AdditionalDependencies="boost_python-vc80-mt-1_34.lib"
+ 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)"
Modified: trunk/lib/openlibraries/src/openobjectlib/plugins/X3D/X3D_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openobjectlib/plugins/X3D/X3D_vc8.vcproj 2007-09-23 17:01:10 UTC (rev 314)
+++ trunk/lib/openlibraries/src/openobjectlib/plugins/X3D/X3D_vc8.vcproj 2007-09-24 21:36:11 UTC (rev 315)
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34";"C:\Program Files\NVIDIA Corporation\Cg\include""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";"C:\Program Files\NVIDIA Corporation\Cg\include""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;X3D_EXPORTS;HAVE_FLEX_STRING;HAVE_OPENIMAGELIB;HAVE_CG_RUNTIME;HAVE_BOOST_FILESYSTEM;OPENOBJECTLIB_BUILD"
StringPooling="false"
MinimalRebuild="true"
@@ -131,7 +131,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="3"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34";"C:\Program Files\NVIDIA Corporation\Cg\include""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";"C:\Program Files\NVIDIA Corporation\Cg\include""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;X3D_EXPORTS;HAVE_FLEX_STRING;HAVE_OPENIMAGELIB;HAVE_CG_RUNTIME;HAVE_BOOST_FILESYSTEM;OPENOBJECTLIB_BUILD"
ExceptionHandling="2"
RuntimeLibrary="2"
Modified: trunk/lib/openlibraries/src/openobjectlib/plugins/obj/obj_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openobjectlib/plugins/obj/obj_vc8.vcproj 2007-09-23 17:01:10 UTC (rev 314)
+++ trunk/lib/openlibraries/src/openobjectlib/plugins/obj/obj_vc8.vcproj 2007-09-24 21:36:11 UTC (rev 315)
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""C:\Boost\include\boost-1_34";"$(SolutionDir)\src";"C:\Program Files\NVIDIA Corporation\Cg\include""
+ AdditionalIncludeDirectories=""C:\Boost\include\boost-1_34_1";"$(SolutionDir)\src";"C:\Program Files\NVIDIA Corporation\Cg\include""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OBJ_EXPORTS;HAVE_FLEX_STRING;HAVE_OPENIMAGELIB;HAVE_BOOST_FILESYSTEM;HAVE_CG_RUNTIME;OPENOBJECTLIB_BUILD"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -128,7 +128,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="3"
- AdditionalIncludeDirectories=""C:\Boost\include\boost-1_34";"$(SolutionDir)\src";"C:\Program Files\NVIDIA Corporation\Cg\include""
+ AdditionalIncludeDirectories=""C:\Boost\include\boost-1_34_1";"$(SolutionDir)\src";"C:\Program Files\NVIDIA Corporation\Cg\include""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OBJ_EXPORTS;HAVE_FLEX_STRING;HAVE_OPENIMAGELIB;HAVE_BOOST_FILESYSTEM;HAVE_CG_RUNTIME;OPENOBJECTLIB_BUILD"
ExceptionHandling="2"
RuntimeLibrary="2"
Modified: trunk/lib/openlibraries/src/openobjectlib/sg/sg_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openobjectlib/sg/sg_vc8.vcproj 2007-09-23 17:01:10 UTC (rev 314)
+++ trunk/lib/openlibraries/src/openobjectlib/sg/sg_vc8.vcproj 2007-09-24 21:36:11 UTC (rev 315)
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34";"C:\Program Files\NVIDIA Corporation\Cg\include""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";"C:\Program Files\NVIDIA Corporation\Cg\include""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SG_EXPORTS;HAVE_FLEX_STRING;HAVE_OPENIMAGELIB;HAVE_CG_RUNTIME;HAVE_BOOST_FILESYSTEM;OPENOBJECTLIB_BUILD"
StringPooling="false"
MinimalRebuild="true"
@@ -133,7 +133,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="3"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34";"C:\Program Files\NVIDIA Corporation\Cg\include""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";"C:\Program Files\NVIDIA Corporation\Cg\include""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SG_EXPORTS;HAVE_FLEX_STRING;HAVE_CG_RUNTIME;HAVE_OPENIMAGELIB;HAVE_BOOST_FILESYSTEM;OPENOBJECTLIB_BUILD"
ExceptionHandling="2"
RuntimeLibrary="2"
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj 2007-09-23 17:01:10 UTC (rev 314)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj 2007-09-24 21:36:11 UTC (rev 315)
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34";"C:\Program Files\NVIDIA Corporation\Cg\include""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";"C:\Program Files\NVIDIA Corporation\Cg\include""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OPENPLUGINLIB_EXPORTS;OPENPLUGINLIB_BUILD;HAVE_FLEX_STRING;HAVE_CG_RUNTIME;HAVE_BOOST_FILESYSTEM;HAVE_FAST_MATH"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -128,7 +128,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34";"C:\Program Files\NVIDIA Corporation\Cg\include""
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";"C:\Program Files\NVIDIA Corporation\Cg\include""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OPENPLUGINLIB_EXPORTS;OPENPLUGINLIB_BUILD;HAVE_FLEX_STRING;HAVE_CG_RUNTIME;HAVE_BOOST_FILESYSTEM;HAVE_FAST_MATH"
Ex...
[truncated message content] |
|
From: <gl...@us...> - 2007-09-23 17:01:11
|
Revision: 314
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=314&view=rev
Author: glslang
Date: 2007-09-23 10:01:10 -0700 (Sun, 23 Sep 2007)
Log Message:
-----------
+ eol-style to native
Property Changed:
----------------
trunk/app/HDRFlow/TrackSource.cpp
trunk/app/HDRFlow/TrackSource.hpp
Property changes on: trunk/app/HDRFlow/TrackSource.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/app/HDRFlow/TrackSource.hpp
___________________________________________________________________
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-09-23 16:54:03
|
Revision: 313
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=313&view=rev
Author: glslang
Date: 2007-09-23 09:53:57 -0700 (Sun, 23 Sep 2007)
Log Message:
-----------
+ trying to find a better abstraction to manipulate media and effects
Modified Paths:
--------------
trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj
trunk/app/HDRFlow/Track.cpp
trunk/app/HDRFlow/Track.hpp
Added Paths:
-----------
trunk/app/HDRFlow/TrackSource.cpp
trunk/app/HDRFlow/TrackSource.hpp
Modified: trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj
===================================================================
--- trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj 2007-09-23 13:00:10 UTC (rev 312)
+++ trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj 2007-09-23 16:53:57 UTC (rev 313)
@@ -29,6 +29,7 @@
67C0BEFB0C5BED8500E0E258 /* PlugInsPreferencesController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 67C0BEFA0C5BED8500E0E258 /* PlugInsPreferencesController.mm */; };
67C3D3220C53A71000136EE8 /* ToolbarHolder.m in Sources */ = {isa = PBXBuildFile; fileRef = 67C3D3210C53A71000136EE8 /* ToolbarHolder.m */; };
67C8D8B80C4AD8340006B871 /* bootstrap.py in Resources */ = {isa = PBXBuildFile; fileRef = 67C8D8B70C4AD8340006B871 /* bootstrap.py */; };
+ 67CF5AD90CA6B85A00B84C55 /* TrackSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67CF5AD80CA6B85A00B84C55 /* TrackSource.cpp */; };
67CF88AA0C53D62E005B6662 /* AdvancedPreferences.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 67CF88A90C53D62E005B6662 /* AdvancedPreferences.tiff */; };
67CF88AC0C53EFB8005B6662 /* PlugInsPreferences.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 67CF88AB0C53EFB8005B6662 /* PlugInsPreferences.tiff */; };
67DC62180C2EC0D9005CFE6E /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 67DC62170C2EC0D9005CFE6E /* OpenGL.framework */; };
@@ -81,6 +82,8 @@
67C3D3170C5361C600136EE8 /* ToolbarHolder.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ToolbarHolder.h; sourceTree = "<group>"; };
67C3D3210C53A71000136EE8 /* ToolbarHolder.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ToolbarHolder.m; sourceTree = "<group>"; };
67C8D8B70C4AD8340006B871 /* bootstrap.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; name = bootstrap.py; path = Scripts/bootstrap.py; sourceTree = "<group>"; };
+ 67CF5AD00CA6B74700B84C55 /* TrackSource.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = TrackSource.hpp; sourceTree = "<group>"; };
+ 67CF5AD80CA6B85A00B84C55 /* TrackSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TrackSource.cpp; sourceTree = "<group>"; };
67CF88A90C53D62E005B6662 /* AdvancedPreferences.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = AdvancedPreferences.tiff; path = Images/AdvancedPreferences.tiff; sourceTree = "<group>"; };
67CF88AB0C53EFB8005B6662 /* PlugInsPreferences.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = PlugInsPreferences.tiff; path = Images/PlugInsPreferences.tiff; sourceTree = "<group>"; };
67DC61B10C2EAB5E005CFE6E /* ViewportOpenGLView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewportOpenGLView.h; sourceTree = "<group>"; };
@@ -110,6 +113,8 @@
080E96DDFE201D6D7F000001 /* Classes */ = {
isa = PBXGroup;
children = (
+ 67CF5AD80CA6B85A00B84C55 /* TrackSource.cpp */,
+ 67CF5AD00CA6B74700B84C55 /* TrackSource.hpp */,
678014AA0C946D3E00D49569 /* Track.cpp */,
678014880C946B4200D49569 /* Track.hpp */,
676191A40C6642CC0076713C /* Bucket.hpp */,
@@ -313,6 +318,7 @@
678014AB0C946D3E00D49569 /* Track.cpp in Sources */,
6780153F0C9485DC00D49569 /* ViewportOpenGLView.mm in Sources */,
672C0AAE0C95590300BA76DB /* Bucket.cpp in Sources */,
+ 67CF5AD90CA6B85A00B84C55 /* TrackSource.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Modified: trunk/app/HDRFlow/Track.cpp
===================================================================
--- trunk/app/HDRFlow/Track.cpp 2007-09-23 13:00:10 UTC (rev 312)
+++ trunk/app/HDRFlow/Track.cpp 2007-09-23 16:53:57 UTC (rev 313)
@@ -10,14 +10,13 @@
namespace hdrflow {
Track::Track( const pl::string& uri )
- : source_( new Cache( 100 ) )
+ : source_( TrackSourcePtr( new TrackSource( uri ) ) )
{
- source_->connect( uri );
}
BucketPtr Track::media( int position )
{
- return source_->reserve_bucket( position );
+ return source_->media( position );
}
}
Modified: trunk/app/HDRFlow/Track.hpp
===================================================================
--- trunk/app/HDRFlow/Track.hpp 2007-09-23 13:00:10 UTC (rev 312)
+++ trunk/app/HDRFlow/Track.hpp 2007-09-23 16:53:57 UTC (rev 313)
@@ -8,10 +8,8 @@
#ifndef TRACK_INC_
#define TRACK_INC_
-#include <HDRFlow/openlibraries.hpp>
+#include "TrackSource.hpp"
-#include "Cache.hpp"
-
namespace pl = olib::openpluginlib;
namespace hdrflow {
@@ -24,7 +22,7 @@
BucketPtr media( int position );
private:
- CachePtr source_;
+ TrackSourcePtr source_;
};
typedef boost::shared_ptr<Track> TrackPtr;
Added: trunk/app/HDRFlow/TrackSource.cpp
===================================================================
--- trunk/app/HDRFlow/TrackSource.cpp (rev 0)
+++ trunk/app/HDRFlow/TrackSource.cpp 2007-09-23 16:53:57 UTC (rev 313)
@@ -0,0 +1,23 @@
+
+// HDRFlow - A image processing application
+
+// Copyright (c) 2007 Goncalo N. M. de Carvalho
+// Released under the GPLv3 or later.
+// For more information, see http://www.hdrflow.com.
+
+#include "TrackSource.hpp"
+
+namespace hdrflow {
+
+TrackSource::TrackSource( const pl::string& uri )
+ : source_( new Cache( 100 ) )
+{
+ source_->connect( uri );
+}
+
+BucketPtr TrackSource::media( int position )
+{
+ return source_->reserve_bucket( position );
+}
+
+}
Added: trunk/app/HDRFlow/TrackSource.hpp
===================================================================
--- trunk/app/HDRFlow/TrackSource.hpp (rev 0)
+++ trunk/app/HDRFlow/TrackSource.hpp 2007-09-23 16:53:57 UTC (rev 313)
@@ -0,0 +1,34 @@
+
+// HDRFlow - A image processing application
+
+// Copyright (c) 2007 Goncalo N. M. de Carvalho
+// Released under the GPLv3 or later.
+// For more information, see http://www.hdrflow.com.
+
+#ifndef TRACK_SOURCE_INC_
+#define TRACK_SOURCE_INC_
+
+#include <HDRFlow/openlibraries.hpp>
+
+#include "Cache.hpp"
+
+namespace pl = olib::openpluginlib;
+
+namespace hdrflow {
+
+class TrackSource
+{
+public:
+ explicit TrackSource( const pl::string& uri );
+
+ BucketPtr media( int position );
+
+private:
+ CachePtr source_;
+};
+
+typedef boost::shared_ptr<TrackSource> TrackSourcePtr;
+
+}
+
+#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
