Thread: [Hdrflow-svn] SF.net SVN: hdrflow: [134] trunk/lib/openlibraries
Status: Pre-Alpha
Brought to you by:
glslang
Menu
▾
▴
hdrflow-svn
|
From: <gl...@us...> - 2007-05-21 20:02:51
|
Revision: 134
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=134&view=rev
Author: glslang
Date: 2007-05-21 13:02:43 -0700 (Mon, 21 May 2007)
Log Message:
-----------
+ tidy ups
Modified Paths:
--------------
trunk/lib/openlibraries/openlibraries_vc8.sln
trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/bmp/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/dds/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/dpx/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_plugin.cpp
Removed Paths:
-------------
trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/config.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/bmp/config.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/dds/config.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/dpx/config.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.hpp
Modified: trunk/lib/openlibraries/openlibraries_vc8.sln
===================================================================
--- trunk/lib/openlibraries/openlibraries_vc8.sln 2007-05-20 22:48:57 UTC (rev 133)
+++ trunk/lib/openlibraries/openlibraries_vc8.sln 2007-05-21 20:02:43 UTC (rev 134)
@@ -188,13 +188,6 @@
{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "avformat", "src\openmedialib\plugins\avformat\avformat_vc8.vcproj", "{0C4F7499-83C6-4143-A392-56F299345E8A}"
- ProjectSection(ProjectDependencies) = postProject
- {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- EndProjectSection
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gensys", "src\openmedialib\plugins\gensys\gensys_vc8.vcproj", "{88BCD57E-044F-4427-A407-541BA8A938E6}"
ProjectSection(ProjectDependencies) = postProject
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
@@ -202,13 +195,6 @@
{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glew", "src\openmedialib\plugins\glew\glew_vc8.vcproj", "{649D053D-1768-40BB-8FA7-8CD91A765F32}"
- ProjectSection(ProjectDependencies) = postProject
- {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- EndProjectSection
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ofx", "src\openmedialib\plugins\ofx\ofx_vc8.vcproj", "{A60E2710-2DA9-4641-AEF6-6488A6264723}"
ProjectSection(ProjectDependencies) = postProject
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
@@ -223,13 +209,6 @@
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openal", "src\openmedialib\plugins\openal\openal_vc8.vcproj", "{68B4BE77-E59E-4A24-9AF5-D4CEFF132B51}"
- ProjectSection(ProjectDependencies) = postProject
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
- EndProjectSection
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quicktime", "src\openmedialib\plugins\quicktime\quicktime_vc8.vcproj", "{1AC3D22B-175B-4169-B74A-276F9D5BA7AB}"
ProjectSection(ProjectDependencies) = postProject
{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
@@ -237,13 +216,6 @@
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "template", "src\openmedialib\plugins\template\template_vc8.vcproj", "{18271104-A6E4-4293-A6F1-70B15AE311E5}"
- ProjectSection(ProjectDependencies) = postProject
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
- EndProjectSection
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SG", "SG", "{BD86F550-C573-4A68-955B-6CEDCC8F595D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "plugins", "plugins", "{9483FC7B-E396-43E6-84ED-EB021AC54252}"
@@ -528,18 +500,10 @@
{1C648B54-C3DC-49B5-AFC9-B205F3151F81}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{1C648B54-C3DC-49B5-AFC9-B205F3151F81}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{1C648B54-C3DC-49B5-AFC9-B205F3151F81}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {0C4F7499-83C6-4143-A392-56F299345E8A}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {0C4F7499-83C6-4143-A392-56F299345E8A}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {0C4F7499-83C6-4143-A392-56F299345E8A}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {0C4F7499-83C6-4143-A392-56F299345E8A}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
{88BCD57E-044F-4427-A407-541BA8A938E6}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
{88BCD57E-044F-4427-A407-541BA8A938E6}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{88BCD57E-044F-4427-A407-541BA8A938E6}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{88BCD57E-044F-4427-A407-541BA8A938E6}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {649D053D-1768-40BB-8FA7-8CD91A765F32}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {649D053D-1768-40BB-8FA7-8CD91A765F32}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {649D053D-1768-40BB-8FA7-8CD91A765F32}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {649D053D-1768-40BB-8FA7-8CD91A765F32}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
{A60E2710-2DA9-4641-AEF6-6488A6264723}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
{A60E2710-2DA9-4641-AEF6-6488A6264723}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{A60E2710-2DA9-4641-AEF6-6488A6264723}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
@@ -548,18 +512,10 @@
{C29BD9EC-EC1B-4D7F-8985-F85698CE66ED}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{C29BD9EC-EC1B-4D7F-8985-F85698CE66ED}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{C29BD9EC-EC1B-4D7F-8985-F85698CE66ED}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {68B4BE77-E59E-4A24-9AF5-D4CEFF132B51}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {68B4BE77-E59E-4A24-9AF5-D4CEFF132B51}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {68B4BE77-E59E-4A24-9AF5-D4CEFF132B51}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {68B4BE77-E59E-4A24-9AF5-D4CEFF132B51}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
{1AC3D22B-175B-4169-B74A-276F9D5BA7AB}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
{1AC3D22B-175B-4169-B74A-276F9D5BA7AB}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{1AC3D22B-175B-4169-B74A-276F9D5BA7AB}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{1AC3D22B-175B-4169-B74A-276F9D5BA7AB}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {18271104-A6E4-4293-A6F1-70B15AE311E5}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {18271104-A6E4-4293-A6F1-70B15AE311E5}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {18271104-A6E4-4293-A6F1-70B15AE311E5}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {18271104-A6E4-4293-A6F1-70B15AE311E5}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
{DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
{DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
@@ -723,14 +679,10 @@
{DB59A3DD-CC08-4FFD-ADFA-F659B2FC78B1} = {D9066C6C-E143-472F-860E-004E481F3E0A}
{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {F76943CD-19F1-469A-B725-38C44C2DD27F}
{1C648B54-C3DC-49B5-AFC9-B205F3151F81} = {F76943CD-19F1-469A-B725-38C44C2DD27F}
- {0C4F7499-83C6-4143-A392-56F299345E8A} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
{88BCD57E-044F-4427-A407-541BA8A938E6} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
- {649D053D-1768-40BB-8FA7-8CD91A765F32} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
{A60E2710-2DA9-4641-AEF6-6488A6264723} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
{C29BD9EC-EC1B-4D7F-8985-F85698CE66ED} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
- {68B4BE77-E59E-4A24-9AF5-D4CEFF132B51} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
{1AC3D22B-175B-4169-B74A-276F9D5BA7AB} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
- {18271104-A6E4-4293-A6F1-70B15AE311E5} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
{DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {BD86F550-C573-4A68-955B-6CEDCC8F595D}
{AE1793B8-18EA-4277-BFDD-8C9F2AFA0096} = {9483FC7B-E396-43E6-84ED-EB021AC54252}
{7A98C731-F651-4427-BD02-25133DEA7171} = {9483FC7B-E396-43E6-84ED-EB021AC54252}
Deleted: trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap.cpp 2007-05-20 22:48:57 UTC (rev 133)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap.cpp 2007-05-21 20:02:43 UTC (rev 134)
@@ -1,33 +0,0 @@
-
-// lightmap3D - An lightmap3D plugin to il.
-
-// Copyright (C) 2005-2006 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#include <openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.hpp>
-
-namespace opl = olib::openpluginlib;
-namespace lightmap = olib::openimagelib::plugins::lightmap;
-
-extern "C"
-{
- LIGHTMAP3D_DECLSPEC bool openplugin_init( void )
- {
- return true;
- }
-
- LIGHTMAP3D_DECLSPEC bool openplugin_uninit( void )
- {
- return true;
- }
-
- LIGHTMAP3D_DECLSPEC bool openplugin_create_plugin( const char*, opl::openplugin** plug )
- {
- *plug = new lightmap::lightmap3D_plugin;
- return true;
- }
-
- LIGHTMAP3D_DECLSPEC void openplugin_destroy_plugin( opl::openplugin* plug )
- { delete static_cast<lightmap::lightmap3D_plugin*>( plug ); }
-}
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-05-20 22:48:57 UTC (rev 133)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.cpp 2007-05-21 20:02:43 UTC (rev 134)
@@ -6,21 +6,19 @@
// For more information, see http://www.openlibraries.org.
#include <cstdlib>
-
#include <boost/tokenizer.hpp>
-#include <openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.hpp>
+#include <openimagelib/il/openimagelib_plugin.hpp>
namespace fs = boost::filesystem;
namespace il = olib::openimagelib::il;
+namespace pl = olib::openpluginlib;
-namespace olib { namespace openimagelib { namespace plugins { namespace lightmap {
+namespace olib { namespace openimagelib { namespace il {
-typedef il::image<unsigned char, il::surface_format> image_type;
-
namespace
{
- void destroy( image_type* im )
+ void destroy( il::image_type* im )
{ delete im; }
bool discover_lightmap_size( const boost::filesystem::path& path, int& radius )
@@ -85,10 +83,46 @@
}
}
-il::image_type_ptr lightmap3D_plugin::load( const fs::path& path )
-{ return il::image_type_ptr( generate_lightmap( path ) ); }
+class lightmap3D_plugin : public il::openimagelib_plugin
+{
+public:
+ virtual il::image_type_ptr load( const boost::filesystem::path& path )
+ { return generate_lightmap( path ); }
+
+ virtual bool store( const boost::filesystem::path&, const il::image_type_ptr& )
+ { return false; }
+};
-bool lightmap3D_plugin::store( const fs::path& path, const il::image_type_ptr& )
-{ return false; }
+} } }
-} } } }
+extern "C"
+{
+ bool openplugin_init( void )
+ {
+ return true;
+ }
+
+ bool openplugin_uninit( void )
+ {
+ return true;
+ }
+
+ bool openplugin_create_plugin( const char*, pl::openplugin** plug )
+ {
+ *plug = new il::lightmap3D_plugin;
+ return true;
+ }
+
+ void openplugin_destroy_plugin( pl::openplugin* plug )
+ { delete static_cast<il::lightmap3D_plugin*>( plug ); }
+}
+
+#ifdef WIN32
+extern "C" BOOL WINAPI DllMain( HINSTANCE hInstDLL, DWORD fdwReason, LPVOID )
+{
+ if( fdwReason == DLL_PROCESS_ATTACH )
+ DisableThreadLibraryCalls( hInstDLL );
+
+ return TRUE;
+}
+#endif
Deleted: trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.hpp 2007-05-20 22:48:57 UTC (rev 133)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.hpp 2007-05-21 20:02:43 UTC (rev 134)
@@ -1,25 +0,0 @@
-
-// 3D_lightmap - A lightmap generator plugin to il.
-
-// Copyright (C) 2005-2006 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#ifndef LIGHTMAP3D_PLUGIN_INC_
-#define LIGHTMAP3D_PLUGIN_INC_
-
-#include <openimagelib/plugins/3D_lightmap/config.hpp>
-#include <openimagelib/il/openimagelib_plugin.hpp>
-
-namespace olib { namespace openimagelib { namespace plugins { namespace lightmap {
-
-class LIGHTMAP3D_DECLSPEC lightmap3D_plugin : public olib::openimagelib::il::openimagelib_plugin
-{
-public:
- virtual il::image_type_ptr load( const boost::filesystem::path& path );
- virtual bool store( const boost::filesystem::path& path, const il::image_type_ptr& image );
-};
-
-} } } }
-
-#endif
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-05-20 22:48:57 UTC (rev 133)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_vc8.vcproj 2007-05-21 20:02:43 UTC (rev 134)
@@ -194,10 +194,6 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath=".\3D_lightmap.cpp"
- >
- </File>
- <File
RelativePath=".\3D_lightmap_plugin.cpp"
>
</File>
@@ -207,14 +203,6 @@
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
- <File
- RelativePath=".\3D_lightmap_plugin.hpp"
- >
- </File>
- <File
- RelativePath=".\config.hpp"
- >
- </File>
</Filter>
<Filter
Name="Resource Files"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/Makefile.am 2007-05-20 22:48:57 UTC (rev 133)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/Makefile.am 2007-05-21 20:02:43 UTC (rev 134)
@@ -8,15 +8,11 @@
lib_LTLIBRARIES = libopenimagelib_3D_lightmap.la
libopenimagelib_3D_lightmap_la_SOURCES = \
- config.hpp \
- 3D_lightmap.cpp \
- 3D_lightmap_plugin.hpp \
3D_lightmap_plugin.cpp
libopenimagelib_3D_lightmap_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH) \
- # end
+ $(BOOST_INCLUDE_PATH)
libopenimagelib_3D_lightmap_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS)
Deleted: trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/config.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/config.hpp 2007-05-20 22:48:57 UTC (rev 133)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/config.hpp 2007-05-21 20:02:43 UTC (rev 134)
@@ -1,25 +0,0 @@
-
-// 3D_lightmap - A lightmap generator plugin to il.
-
-// Copyright (C) 2005-2006 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#ifndef LIGHTMAP3D_CONFIG_INC_
-#define LIGHTMAP3D_CONFIG_INC_
-
-#ifdef WIN32
- #ifdef LIGHTMAP3D_EXPORTS
- #define LIGHTMAP3D_DECLSPEC __declspec( dllexport )
- #else
- #define LIGHTMAP3D_DECLSPEC __declspec( dllimport )
- #endif // LIGHTMAP3D_EXPORTS
-#else
- #ifdef LIGHTMAP3D_EXPORTS
- #define LIGHTMAP3D_DECLSPEC
- #else
- #define LIGHTMAP3D_DECLSPEC
- #endif // LIGHTMAP3D_EXPORTS
-#endif // WIN32
-
-#endif
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/bmp/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/bmp/Makefile.am 2007-05-20 22:48:57 UTC (rev 133)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/bmp/Makefile.am 2007-05-21 20:02:43 UTC (rev 134)
@@ -8,15 +8,11 @@
lib_LTLIBRARIES = libopenimagelib_bmp.la
libopenimagelib_bmp_la_SOURCES = \
- config.hpp \
- bmp.cpp \
- bmp_plugin.hpp \
bmp_plugin.cpp
libopenimagelib_bmp_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH) \
- # end
+ $(BOOST_INCLUDE_PATH)
libopenimagelib_bmp_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS)
Deleted: trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp.cpp 2007-05-20 22:48:57 UTC (rev 133)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp.cpp 2007-05-21 20:02:43 UTC (rev 134)
@@ -1,33 +0,0 @@
-
-// BMP - An BMP plugin to il.
-
-// Copyright (C) 2005-2006 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#include <openimagelib/plugins/bmp/bmp_plugin.hpp>
-
-namespace opl = olib::openpluginlib;
-namespace BMP = olib::openimagelib::plugins::BMP;
-
-extern "C"
-{
- BMP_DECLSPEC bool openplugin_init( void )
- {
- return true;
- }
-
- BMP_DECLSPEC bool openplugin_uninit( void )
- {
- return true;
- }
-
- BMP_DECLSPEC bool openplugin_create_plugin( const char*, opl::openplugin** plug )
- {
- *plug = new BMP::BMP_plugin;
- return true;
- }
-
- BMP_DECLSPEC void openplugin_destroy_plugin( opl::openplugin* plug )
- { delete static_cast<BMP::BMP_plugin*>( plug ); }
-}
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.cpp 2007-05-20 22:48:57 UTC (rev 133)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.cpp 2007-05-21 20:02:43 UTC (rev 134)
@@ -5,34 +5,57 @@
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
-#include <openimagelib/plugins/bmp/bmp_plugin.hpp>
+#include <openimagelib/il/openimagelib_plugin.hpp>
namespace il = olib::openimagelib::il;
namespace fs = boost::filesystem;
+namespace pl = olib::openpluginlib;
-namespace olib { namespace openimagelib { namespace plugins { namespace BMP {
+namespace olib { namespace openimagelib { namespace il {
namespace
{
- typedef struct tagBITMAPINFOHEADER
- {
- } BITMAPINFOHEADER, *PBITMAPINFOHEADER;
+}
+
+struct bmp_plugin : public il::openimagelib_plugin
+{
+ virtual il::image_type_ptr load( const boost::filesystem::path& )
+ { return il::image_type_ptr( ); }
- void destroy( il::image_type* im )
- { delete im; }
-
- il::image_type_ptr load_bmp( const fs::path& path )
+ virtual bool store( const boost::filesystem::path&, const il::image_type_ptr& )
+ { return false; }
+};
+
+} } }
+
+extern "C"
+{
+ bool openplugin_init( void )
{
- return il::image_type_ptr( );
+ return true;
}
+
+ bool openplugin_uninit( void )
+ {
+ return true;
+ }
+
+ bool openplugin_create_plugin( const char*, pl::openplugin** plug )
+ {
+ *plug = new il::bmp_plugin;
+ return true;
+ }
+
+ void openplugin_destroy_plugin( pl::openplugin* plug )
+ { delete static_cast<il::bmp_plugin*>( plug ); }
}
-il::image_type_ptr BMP_plugin::load( const fs::path& path )
+#ifdef WIN32
+extern "C" BOOL WINAPI DllMain( HINSTANCE hInstDLL, DWORD fdwReason, LPVOID )
{
- return il::image_type_ptr( );
+ if( fdwReason == DLL_PROCESS_ATTACH )
+ DisableThreadLibraryCalls( hInstDLL );
+
+ return TRUE;
}
-
-bool BMP_plugin::store( const fs::path& /*path*/, const il::image_type_ptr& )
-{ return false; }
-
-} } } }
+#endif
Deleted: trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.hpp 2007-05-20 22:48:57 UTC (rev 133)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.hpp 2007-05-21 20:02:43 UTC (rev 134)
@@ -1,26 +0,0 @@
-
-// BMP - A BMP plugin to il.
-
-// Copyright (C) 2005 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#ifndef BMP_PLUGIN_INC_
-#define BMP_PLUGIN_INC_
-
-#include <boost/filesystem/path.hpp>
-
-#include <openimagelib/plugins/bmp/config.hpp>
-#include <openimagelib/il/openimagelib_plugin.hpp>
-
-namespace olib { namespace openimagelib { namespace plugins { namespace BMP {
-
-struct BMP_DECLSPEC BMP_plugin : public il::openimagelib_plugin
-{
- virtual il::image_type_ptr load( const boost::filesystem::path& path );
- virtual bool store( const boost::filesystem::path& path, const il::image_type_ptr& image );
-};
-
-} } } }
-
-#endif
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_vc8.vcproj 2007-05-20 22:48:57 UTC (rev 133)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_vc8.vcproj 2007-05-21 20:02:43 UTC (rev 134)
@@ -203,10 +203,6 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath=".\bmp.cpp"
- >
- </File>
- <File
RelativePath=".\bmp_plugin.cpp"
>
</File>
@@ -216,14 +212,6 @@
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
- <File
- RelativePath=".\bmp_plugin.hpp"
- >
- </File>
- <File
- RelativePath=".\config.hpp"
- >
- </File>
</Filter>
<Filter
Name="Resource Files"
Deleted: trunk/lib/openlibraries/src/openimagelib/plugins/bmp/config.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/bmp/config.hpp 2007-05-20 22:48:57 UTC (rev 133)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/bmp/config.hpp 2007-05-21 20:02:43 UTC (rev 134)
@@ -1,25 +0,0 @@
-
-// BMP - An BMP plugin to il.
-
-// Copyright (C) 2005 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#ifndef BMP_CONFIG_INC_
-#define BMP_CONFIG_INC_
-
-#ifdef WIN32
- #ifdef BMP_EXPORTS
- #define BMP_DECLSPEC __declspec( dllexport )
- #else
- #define BMP_DECLSPEC __declspec( dllimport )
- #endif // BMP_EXPORTS
-#else
- #ifdef BMP_EXPORTS
- #define BMP_DECLSPEC extern
- #else
- #define BMP_DECLSPEC
- #endif // BMP_EXPORTS
-#endif // WIN32
-
-#endif // BMP_CONFIG_INC_
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/dds/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dds/Makefile.am 2007-05-20 22:48:57 UTC (rev 133)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dds/Makefile.am 2007-05-21 20:02:43 UTC (rev 134)
@@ -8,9 +8,6 @@
lib_LTLIBRARIES = libopenimagelib_dds.la
libopenimagelib_dds_la_SOURCES = \
- config.hpp \
- dds.cpp \
- dds_plugin.hpp \
dds_plugin.cpp
libopenimagelib_dds_la_CXXFLAGS = \
Deleted: trunk/lib/openlibraries/src/openimagelib/plugins/dds/config.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dds/config.hpp 2007-05-20 22:48:57 UTC (rev 133)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dds/config.hpp 2007-05-21 20:02:43 UTC (rev 134)
@@ -1,25 +0,0 @@
-
-// DDS - An DDS plugin to il.
-
-// Copyright (C) 2005-2006 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#ifndef DDS_CONFIG_INC_
-#define DDS_CONFIG_INC_
-
-#ifdef WIN32
- #ifdef DDS_EXPORTS
- #define DDS_DECLSPEC __declspec( dllexport )
- #else
- #define DDS_DECLSPEC __declspec( dllimport )
- #endif // DDS_EXPORTS
-#else
- #ifdef DDS_EXPORTS
- #define DDS_DECLSPEC __attribute__( ( visibility( "default" ) ) )
- #else
- #define DDS_DECLSPEC
- #endif // DDS_EXPORTS
-#endif // WIN32
-
-#endif // DDS_CONFIG_INC_
Deleted: trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds.cpp 2007-05-20 22:48:57 UTC (rev 133)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds.cpp 2007-05-21 20:02:43 UTC (rev 134)
@@ -1,33 +0,0 @@
-
-// DDS - An DDS plugin to il.
-
-// Copyright (C) 2005-2006 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#include <openimagelib/plugins/dds/dds_plugin.hpp>
-
-namespace opl = olib::openpluginlib;
-namespace DDS = olib::openimagelib::plugins::DDS;
-
-extern "C"
-{
- DDS_DECLSPEC bool openplugin_init( void )
- {
- return true;
- }
-
- DDS_DECLSPEC bool openplugin_uninit( void )
- {
- return true;
- }
-
- DDS_DECLSPEC bool openplugin_create_plugin( const char*, opl::openplugin** plug )
- {
- *plug = new DDS::DDS_plugin;
- return true;
- }
-
- DDS_DECLSPEC void openplugin_destroy_plugin( opl::openplugin* plug )
- { delete static_cast<DDS::DDS_plugin*>( plug ); }
-}
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.cpp 2007-05-20 22:48:57 UTC (rev 133)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.cpp 2007-05-21 20:02:43 UTC (rev 134)
@@ -12,12 +12,13 @@
#include <boost/filesystem/fstream.hpp>
-#include <openimagelib/plugins/dds/dds_plugin.hpp>
+#include <openimagelib/il/openimagelib_plugin.hpp>
namespace il = olib::openimagelib::il;
namespace fs = boost::filesystem;
+namespace pl = olib::openpluginlib;
-namespace olib { namespace openimagelib { namespace plugins { namespace DDS {
+namespace olib { namespace openimagelib { namespace il {
namespace
{
@@ -214,10 +215,45 @@
}
}
-il::image_type_ptr DDS_plugin::load( const fs::path& path )
-{ return load_dds( path ); }
+struct dds_plugin : public il::openimagelib_plugin
+{
+ virtual il::image_type_ptr load( const boost::filesystem::path& path )
+ { return load_dds( path ); }
+
+ virtual bool store( const boost::filesystem::path&, const il::image_type_ptr& )
+ { return false; }
+};
-bool DDS_plugin::store( const fs::path& path, const il::image_type_ptr& )
-{ return false; }
+} } }
-} } } }
+extern "C"
+{
+ bool openplugin_init( void )
+ {
+ return true;
+ }
+
+ bool openplugin_uninit( void )
+ {
+ return true;
+ }
+
+ bool openplugin_create_plugin( const char*, pl::openplugin** plug )
+ {
+ *plug = new il::dds_plugin;
+ return true;
+ }
+
+ void openplugin_destroy_plugin( pl::openplugin* plug )
+ { delete static_cast<il::dds_plugin*>( plug ); }
+}
+
+#ifdef WIN32
+extern "C" BOOL WINAPI DllMain( HINSTANCE hInstDLL, DWORD fdwReason, LPVOID )
+{
+ if( fdwReason == DLL_PROCESS_ATTACH )
+ DisableThreadLibraryCalls( hInstDLL );
+
+ return TRUE;
+}
+#endif
Deleted: trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.hpp
===================================================================
--- trunk/lib/ope...
[truncated message content] |
|
From: <gl...@us...> - 2007-05-23 19:36:36
|
Revision: 138
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=138&view=rev
Author: glslang
Date: 2007-05-23 12:36:34 -0700 (Wed, 23 May 2007)
Log Message:
-----------
+ plugins cleanups
+ enable virtual address space of 3GB on win
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/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_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_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/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/tga/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/tiff/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.cpp
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/gensys/gensys_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_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/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
Removed Paths:
-------------
trunk/lib/openlibraries/src/openimagelib/plugins/sgi/config.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/tga/config.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_plugin.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/tiff/config.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.hpp
Modified: trunk/lib/openlibraries/src/openassetlib/al/al_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openassetlib/al/al_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openassetlib/al/al_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -66,6 +66,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)\openassetlib_al-vc80-d-0_4_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)"
@@ -148,6 +149,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)/openassetlib_al-vc80-r-0_4_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)"
Modified: trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -65,6 +65,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="sqlite-vc71-d-3_2_7.lib"
OutputFile="$(OutDir)\openassetlib_sqlite-vc80-d-0_4_0.dll"
LinkIncremental="2"
@@ -147,6 +148,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="sqlite-vc71-r-3_2_7.lib"
OutputFile="$(OutDir)\openassetlib_sqlite-vc80-r-0_4_0.dll"
LinkIncremental="1"
Modified: trunk/lib/openlibraries/src/openassetlib/py/py_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openassetlib/py/py_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openassetlib/py/py_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -64,6 +64,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="boost_python-vc80-mt-gd-1_34.lib"
OutputFile="$(OutDir)\openassetlib.pyd"
LinkIncremental="2"
@@ -146,6 +147,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="boost_python-vc80-mt-1_34.lib"
OutputFile="$(OutDir)\openassetlib.pyd"
LinkIncremental="1"
Modified: trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -65,6 +65,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="Half_dll_d.lib IlmImf_dll_d.lib Iex_dll_d.lib"
OutputFile="$(OutDir)\openeffectslib_tonemap-vc80-d-0_4_0.dll"
LinkIncremental="2"
@@ -148,6 +149,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="Half_dll.lib IlmImf_dll.lib Iex_dll.lib"
OutputFile="$(OutDir)\openeffectslib_tonemap-vc80-r-0_4_0.dll"
LinkIncremental="1"
Modified: trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -71,6 +71,7 @@
<Tool
Name="VCLinkerTool"
UseUnicodeResponseFiles="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)/openimagelib_il-vc80-d-0_4_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)""
@@ -159,6 +160,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)/openimagelib_il-vc80-r-0_4_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)""
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-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -67,6 +67,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)\openimagelib_3D_lightmap-vc80-d-0_4_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
@@ -150,6 +151,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)\openimagelib_3D_lightmap-vc80-r-0_4_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -69,6 +69,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="gdiplus.lib"
OutputFile="$(OutDir)/openimagelib_bmp-vc80-d-0_4_0.dll"
LinkIncremental="2"
@@ -157,6 +158,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="gdiplus.lib"
OutputFile="$(OutDir)/openimagelib_bmp-vc80-r-0_4_0.dll"
LinkIncremental="1"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.cpp 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.cpp 2007-05-23 19:36:34 UTC (rev 138)
@@ -109,15 +109,16 @@
il::image_type_ptr ddsd_pixelformat_to_image_type( DDSURFACEDESC2 ddsd )
{
- #define MAKEFOURCC( ch0, ch1, ch2, ch3 ) \
+# ifndef MAKEFOURCC
+# define MAKEFOURCC( ch0, ch1, ch2, ch3 ) \
( ( unsigned long ) ( unsigned char ) ( ch0 ) | \
( ( unsigned long ) ( unsigned char ) ( ch1 ) << 8 ) | \
( ( unsigned long ) ( unsigned char ) ( ch2 ) << 16 ) | \
( ( unsigned long ) ( unsigned char ) ( ch3 ) << 24 ) )
+# endif
+# define DDPF_FOURCC 0x00000004
+# define DDSCAPS2_CUBEMAP 0x00000200
- #define DDPF_FOURCC 0x00000004
- #define DDSCAPS2_CUBEMAP 0x00000200
-
if( ddsd.ddpfPixelFormat.dwFlags & DDPF_FOURCC )
{
typedef il::image<unsigned char, il::dxt1> dxt1_image_type;
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -67,6 +67,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)\openimagelib_dds-vc80-d-0_4_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
@@ -151,6 +152,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)\openimagelib_dds-vc80-r-0_4_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -66,6 +66,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="Half_dll_d.lib IlmImf_dll_d.lib Iex_dll_d.lib"
OutputFile="$(OutDir)\openimagelib_exr-vc80-d-0_4_0.dll"
LinkIncremental="2"
@@ -149,6 +150,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="Half_dll.lib IlmImf_dll.lib Iex_dll.lib"
OutputFile="$(OutDir)\openimagelib_exr-vc80-r-0_4_0.dll"
LinkIncremental="1"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -66,6 +66,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="gdiplus.lib"
OutputFile="$(OutDir)\openimagelib_gdi-vc80-d-0_4_0.dll"
LinkIncremental="2"
@@ -149,6 +150,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="gdiplus.lib"
OutputFile="$(OutDir)\openimagelib_gdi-vc80-r-0_4_0.dll"
LinkIncremental="1"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -69,6 +69,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)\openimagelib_hdr-vc80-d-0_4_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
@@ -153,6 +154,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)\openimagelib_hdr-vc80-r-0_4_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -69,6 +69,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="libjpeg.lib libjpeghdr.lib"
OutputFile="$(OutDir)/openimagelib_jpg-vc80-d-0_4_0.dll"
LinkIncremental="2"
@@ -158,6 +159,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="libjpeg.lib libjpeghdr.lib"
OutputFile="$(OutDir)/openimagelib_jpg-vc80-r-0_4_0.dll"
LinkIncremental="1"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/png/png_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/png/png_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/png/png_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -66,6 +66,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="libpng13.lib zdll.lib"
OutputFile="$(OutDir)\openimagelib_png-vc80-d-0_4_0.dll"
LinkIncremental="2"
@@ -151,6 +152,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="libpng13.lib zdll.lib"
OutputFile="$(OutDir)\openimagelib_png-vc80-r-0_4_0.dll"
LinkIncremental="1"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -66,6 +66,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)\openimagelib_psd-vc80-d-0_4_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
@@ -149,6 +150,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)\openimagelib_psd-vc80-r-0_4_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -66,6 +66,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="qtmlClient.lib"
OutputFile="$(OutDir)\openimagelib_quicktime-vc80-d-0_4_0.dll"
LinkIncremental="2"
@@ -150,6 +151,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="qtmlClient.lib"
OutputFile="$(OutDir)\openimagelib_quicktime-vc80-r-0_4_0.dll"
LinkIncremental="1"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/sgi/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/sgi/Makefile.am 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/sgi/Makefile.am 2007-05-23 19:36:34 UTC (rev 138)
@@ -8,15 +8,11 @@
lib_LTLIBRARIES = libopenimagelib_sgi.la
libopenimagelib_sgi_la_SOURCES = \
- config.hpp \
- sgi.cpp \
- sgi_plugin.hpp \
sgi_plugin.cpp
libopenimagelib_sgi_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH) \
- # end
+ $(BOOST_INCLUDE_PATH)
libopenimagelib_sgi_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS)
Deleted: trunk/lib/openlibraries/src/openimagelib/plugins/sgi/config.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/sgi/config.hpp 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/sgi/config.hpp 2007-05-23 19:36:34 UTC (rev 138)
@@ -1,25 +0,0 @@
-
-// SGI - A SGI plugin to il.
-
-// Copyright (C) 2005-2006 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#ifndef SGI_CONFIG_INC_
-#define SGI_CONFIG_INC_
-
-#ifdef WIN32
- #ifdef SGI_EXPORTS
- #define SGI_DECLSPEC __declspec( dllexport )
- #else
- #define SGI_DECLSPEC __declspec( dllimport )
- #endif // SGI_EXPORTS
-#else
- #ifdef SGI_EXPORTS
- #define SGI_DECLSPEC extern
- #else
- #define SGI_DECLSPEC
- #endif // SGI_EXPORTS
-#endif // WIN32
-
-#endif // SGI_CONFIG_INC_
Deleted: trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi.cpp 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi.cpp 2007-05-23 19:36:34 UTC (rev 138)
@@ -1,33 +0,0 @@
-
-// SGI - An SGI plugin to il.
-
-// Copyright (C) 2005-2006 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#include <openimagelib/plugins/sgi/sgi_plugin.hpp>
-
-namespace opl = olib::openpluginlib;
-namespace SGI = olib::openimagelib::plugins::SGI;
-
-extern "C"
-{
- SGI_DECLSPEC bool openplugin_init( void )
- {
- return true;
- }
-
- SGI_DECLSPEC bool openplugin_uninit( void )
- {
- return true;
- }
-
- SGI_DECLSPEC bool openplugin_create_plugin( const char*, opl::openplugin** plug )
- {
- *plug = new SGI::SGI_plugin;
- return true;
- }
-
- SGI_DECLSPEC void openplugin_destroy_plugin( opl::openplugin* plug )
- { delete static_cast<SGI::SGI_plugin*>( plug ); }
-}
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.cpp 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.cpp 2007-05-23 19:36:34 UTC (rev 138)
@@ -11,12 +11,13 @@
#include <boost/filesystem/fstream.hpp>
-#include <openimagelib/plugins/sgi/sgi_plugin.hpp>
+#include <openimagelib/il/openimagelib_plugin.hpp>
namespace il = olib::openimagelib::il;
+namespace pl = olib::openpluginlib;
namespace fs = boost::filesystem;
-namespace olib { namespace openimagelib { namespace plugins { namespace SGI {
+namespace olib { namespace openimagelib { namespace il {
namespace
{
@@ -277,10 +278,47 @@
}
}
-il::image_type_ptr SGI_plugin::load( const fs::path& path )
-{ return load_sgi( path ); }
+class sgi_plugin : public il::openimagelib_plugin
+{
+public:
+ virtual il::image_type_ptr load( const fs::path& path )
+ { return load_sgi( path ); }
+
+ virtual bool store( const fs::path&, const il::image_type_ptr& )
+ { return false; }
+};
-bool SGI_plugin::store( const fs::path& path, const il::image_type_ptr& )
-{ return false; }
+} } }
-} } } }
+extern "C"
+{
+ IL_DECLSPEC bool openplugin_init( void )
+ {
+ return true;
+ }
+
+ IL_DECLSPEC bool openplugin_uninit( void )
+ {
+ return true;
+ }
+
+ IL_DECLSPEC bool openplugin_create_plugin( const char*, pl::openplugin** plug )
+ {
+ *plug = new il::sgi_plugin;
+ return true;
+ }
+
+ IL_DECLSPEC void openplugin_destroy_plugin( pl::openplugin* plug )
+ { delete static_cast<il::sgi_plugin*>( plug ); }
+}
+
+#ifdef WIN32
+extern "C" BOOL WINAPI DllMain( HINSTANCE hInstDLL, DWORD fdwReason, LPVOID )
+{
+ if( fdwReason == DLL_PROCESS_ATTACH )
+ DisableThreadLibraryCalls( hInstDLL );
+
+ return TRUE;
+}
+#endif
+
Deleted: trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.hpp 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_plugin.hpp 2007-05-23 19:36:34 UTC (rev 138)
@@ -1,27 +0,0 @@
-
-// SGI - A SGI plugin to il.
-
-// Copyright (C) 2005-2006 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#ifndef SGI_PLUGIN_INC_
-#define SGI_PLUGIN_INC_
-
-#include <boost/filesystem/path.hpp>
-
-#include <openimagelib/plugins/sgi/config.hpp>
-#include <openimagelib/il/openimagelib_plugin.hpp>
-
-namespace olib { namespace openimagelib { namespace plugins { namespace SGI {
-
-class SGI_DECLSPEC SGI_plugin : public olib::openimagelib::il::openimagelib_plugin
-{
-public:
- virtual il::image_type_ptr load( const boost::filesystem::path& path );
- virtual bool store( const boost::filesystem::path& path, const il::image_type_ptr& image );
-};
-
-} } } }
-
-#endif
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_vc8.vcproj 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_vc8.vcproj 2007-05-23 19:36:34 UTC (rev 138)
@@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SGI_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -66,6 +66,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)\openimagelib_sgi-vc80-d-0_4_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
@@ -125,7 +126,7 @@
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SGI_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
RuntimeLibrary="2"
BufferSecurityCheck="false"
EnableEnhancedInstructionSet="0"
@@ -149,6 +150,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)\openimagelib_sgi-vc80-r-0_4_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
@@ -194,10 +196,6 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath=".\sgi.cpp"
- >
- </File>
- <File
RelativePath=".\sgi_plugin.cpp"
>
</File>
@@ -207,14 +205,6 @@
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
- <File
- RelativePath=".\config.hpp"
- >
- </File>
- <File
- RelativePath=".\sgi_plugin.hpp"
- >
- </File>
</Filter>
<Filter
Name="Resource Files"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/tga/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tga/Makefile.am 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tga/Makefile.am 2007-05-23 19:36:34 UTC (rev 138)
@@ -8,9 +8,6 @@
lib_LTLIBRARIES = libopenimagelib_tga.la
libopenimagelib_tga_la_SOURCES = \
- config.hpp \
- tga.cpp \
- tga_plugin.hpp \
tga_plugin.cpp
libopenimagelib_tga_la_CXXFLAGS = \
Deleted: trunk/lib/openlibraries/src/openimagelib/plugins/tga/config.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tga/config.hpp 2007-05-22 19:28:17 UTC (rev 137)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tga/config...
[truncated message content] |
|
From: <gl...@us...> - 2007-06-15 21:39:13
|
Revision: 152
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=152&view=rev
Author: glslang
Date: 2007-06-15 14:39:08 -0700 (Fri, 15 Jun 2007)
Log Message:
-----------
RTF license for pretty install
Modified Paths:
--------------
trunk/lib/openlibraries/COPYING
Added Paths:
-----------
trunk/lib/openlibraries/COPYING.rtf
Modified: trunk/lib/openlibraries/COPYING
===================================================================
--- trunk/lib/openlibraries/COPYING 2007-06-14 20:34:49 UTC (rev 151)
+++ trunk/lib/openlibraries/COPYING 2007-06-15 21:39:08 UTC (rev 152)
@@ -456,50 +456,4 @@
DAMAGES.
END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Libraries
-
- If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change. You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
- To apply these terms, attach the following notices to the library. It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
- <one line to give the library's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the
- library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
- <signature of Ty Coon>, 1 April 1990
- Ty Coon, President of Vice
-
-That's all there is to it!
-
-
-
+
\ No newline at end of file
Added: trunk/lib/openlibraries/COPYING.rtf
===================================================================
--- trunk/lib/openlibraries/COPYING.rtf (rev 0)
+++ trunk/lib/openlibraries/COPYING.rtf 2007-06-15 21:39:08 UTC (rev 152)
@@ -0,0 +1,462 @@
+{\rtf1\ansi\deff0{\fonttbl{\f0\fswiss\fprq2\fcharset0 Arial;}}
+{\*\generator Msftedit 5.41.15.1507;}\viewkind4\uc1\pard\lang2057\f0\fs22\tab\tab GNU LESSER GENERAL PUBLIC LICENSE\par
+\tab\tab Version 2.1, February 1999\par
+\par
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.\par
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA\par
+ Everyone is permitted to copy and distribute verbatim copies\par
+ of this license document, but changing it is not allowed.\par
+\par
+[This is the first released version of the Lesser GPL. It also counts\par
+ as the successor of the GNU Library Public License, version 2, hence\par
+ the version number 2.1.]\par
+\par
+\tab\tab\tab Preamble\par
+\par
+ The licenses for most software are designed to take away your\par
+freedom to share and change it. By contrast, the GNU General Public\par
+Licenses are intended to guarantee your freedom to share and change\par
+free software--to make sure the software is free for all its users.\par
+\par
+ This license, the Lesser General Public License, applies to some\par
+specially designated software packages--typically libraries--of the\par
+Free Software Foundation and other authors who decide to use it. You\par
+can use it too, but we suggest you first think carefully about whether\par
+this license or the ordinary General Public License is the better\par
+strategy to use in any particular case, based on the explanations below.\par
+\par
+ When we speak of free software, we are referring to freedom of use,\par
+not price. Our General Public Licenses are designed to make sure that\par
+you have the freedom to distribute copies of free software (and charge\par
+for this service if you wish); that you receive source code or can get\par
+it if you want it; that you can change the software and use pieces of\par
+it in new free programs; and that you are informed that you can do\par
+these things.\par
+\par
+ To protect your rights, we need to make restrictions that forbid\par
+distributors to deny you these rights or to ask you to surrender these\par
+rights. These restrictions translate to certain responsibilities for\par
+you if you distribute copies of the library or if you modify it.\par
+\par
+ For example, if you distribute copies of the library, whether gratis\par
+or for a fee, you must give the recipients all the rights that we gave\par
+you. You must make sure that they, too, receive or can get the source\par
+code. If you link other code with the library, you must provide\par
+complete object files to the recipients, so that they can relink them\par
+with the library after making changes to the library and recompiling\par
+it. And you must show them these terms so they know their rights.\par
+\par
+ We protect your rights with a two-step method: (1) we copyright the\par
+library, and (2) we offer you this license, which gives you legal\par
+permission to copy, distribute and/or modify the library.\par
+\par
+ To protect each distributor, we want to make it very clear that\par
+there is no warranty for the free library. Also, if the library is\par
+modified by someone else and passed on, the recipients should know\par
+that what they have is not the original version, so that the original\par
+author's reputation will not be affected by problems that might be\par
+introduced by others.\par
+\page\par
+ Finally, software patents pose a constant threat to the existence of\par
+any free program. We wish to make sure that a company cannot\par
+effectively restrict the users of a free program by obtaining a\par
+restrictive license from a patent holder. Therefore, we insist that\par
+any patent license obtained for a version of the library must be\par
+consistent with the full freedom of use specified in this license.\par
+\par
+ Most GNU software, including some libraries, is covered by the\par
+ordinary GNU General Public License. This license, the GNU Lesser\par
+General Public License, applies to certain designated libraries, and\par
+is quite different from the ordinary General Public License. We use\par
+this license for certain libraries in order to permit linking those\par
+libraries into non-free programs.\par
+\par
+ When a program is linked with a library, whether statically or using\par
+a shared library, the combination of the two is legally speaking a\par
+combined work, a derivative of the original library. The ordinary\par
+General Public License therefore permits such linking only if the\par
+entire combination fits its criteria of freedom. The Lesser General\par
+Public License permits more lax criteria for linking other code with\par
+the library.\par
+\par
+ We call this license the "Lesser" General Public License because it\par
+does Less to protect the user's freedom than the ordinary General\par
+Public License. It also provides other free software developers Less\par
+of an advantage over competing non-free programs. These disadvantages\par
+are the reason we use the ordinary General Public License for many\par
+libraries. However, the Lesser license provides advantages in certain\par
+special circumstances.\par
+\par
+ For example, on rare occasions, there may be a special need to\par
+encourage the widest possible use of a certain library, so that it becomes\par
+a de-facto standard. To achieve this, non-free programs must be\par
+allowed to use the library. A more frequent case is that a free\par
+library does the same job as widely used non-free libraries. In this\par
+case, there is little to gain by limiting the free library to free\par
+software only, so we use the Lesser General Public License.\par
+\par
+ In other cases, permission to use a particular library in non-free\par
+programs enables a greater number of people to use a large body of\par
+free software. For example, permission to use the GNU C Library in\par
+non-free programs enables many more people to use the whole GNU\par
+operating system, as well as its variant, the GNU/Linux operating\par
+system.\par
+\par
+ Although the Lesser General Public License is Less protective of the\par
+users' freedom, it does ensure that the user of a program that is\par
+linked with the Library has the freedom and the wherewithal to run\par
+that program using a modified version of the Library.\par
+\par
+ The precise terms and conditions for copying, distribution and\par
+modification follow. Pay close attention to the difference between a\par
+"work based on the library" and a "work that uses the library". The\par
+former contains code derived from the library, whereas the latter must\par
+be combined with the library in order to run.\par
+\page\par
+\tab\tab GNU LESSER GENERAL PUBLIC LICENSE\par
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\par
+\par
+ 0. This License Agreement applies to any software library or other\par
+program which contains a notice placed by the copyright holder or\par
+other authorized party saying it may be distributed under the terms of\par
+this Lesser General Public License (also called "this License").\par
+Each licensee is addressed as "you".\par
+\par
+ A "library" means a collection of software functions and/or data\par
+prepared so as to be conveniently linked with application programs\par
+(which use some of those functions and data) to form executables.\par
+\par
+ The "Library", below, refers to any such software library or work\par
+which has been distributed under these terms. A "work based on the\par
+Library" means either the Library or any derivative work under\par
+copyright law: that is to say, a work containing the Library or a\par
+portion of it, either verbatim or with modifications and/or translated\par
+straightforwardly into another language. (Hereinafter, translation is\par
+included without limitation in the term "modification".)\par
+\par
+ "Source code" for a work means the preferred form of the work for\par
+making modifications to it. For a library, complete source code means\par
+all the source code for all modules it contains, plus any associated\par
+interface definition files, plus the scripts used to control compilation\par
+and installation of the library.\par
+\par
+ Activities other than copying, distribution and modification are not\par
+covered by this License; they are outside its scope. The act of\par
+running a program using the Library is not restricted, and output from\par
+such a program is covered only if its contents constitute a work based\par
+on the Library (independent of the use of the Library in a tool for\par
+writing it). Whether that is true depends on what the Library does\par
+and what the program that uses the Library does.\par
+ \par
+ 1. You may copy and distribute verbatim copies of the Library's\par
+complete source code as you receive it, in any medium, provided that\par
+you conspicuously and appropriately publish on each copy an\par
+appropriate copyright notice and disclaimer of warranty; keep intact\par
+all the notices that refer to this License and to the absence of any\par
+warranty; and distribute a copy of this License along with the\par
+Library.\par
+\par
+ You may charge a fee for the physical act of transferring a copy,\par
+and you may at your option offer warranty protection in exchange for a\par
+fee.\par
+\page\par
+ 2. You may modify your copy or copies of the Library or any portion\par
+of it, thus forming a work based on the Library, and copy and\par
+distribute such modifications or work under the terms of Section 1\par
+above, provided that you also meet all of these conditions:\par
+\par
+ a) The modified work must itself be a software library.\par
+\par
+ b) You must cause the files modified to carry prominent notices\par
+ stating that you changed the files and the date of any change.\par
+\par
+ c) You must cause the whole of the work to be licensed at no\par
+ charge to all third parties under the terms of this License.\par
+\par
+ d) If a facility in the modified Library refers to a function or a\par
+ table of data to be supplied by an application program that uses\par
+ the facility, other than as an argument passed when the facility\par
+ is invoked, then you must make a good faith effort to ensure that,\par
+ in the event an application does not supply such function or\par
+ table, the facility still operates, and performs whatever part of\par
+ its purpose remains meaningful.\par
+\par
+ (For example, a function in a library to compute square roots has\par
+ a purpose that is entirely well-defined independent of the\par
+ application. Therefore, Subsection 2d requires that any\par
+ application-supplied function or table used by this function must\par
+ be optional: if the application does not supply it, the square\par
+ root function must still compute square roots.)\par
+\par
+These requirements apply to the modified work as a whole. If\par
+identifiable sections of that work are not derived from the Library,\par
+and can be reasonably considered independent and separate works in\par
+themselves, then this License, and its terms, do not apply to those\par
+sections when you distribute them as separate works. But when you\par
+distribute the same sections as part of a whole which is a work based\par
+on the Library, the distribution of the whole must be on the terms of\par
+this License, whose permissions for other licensees extend to the\par
+entire whole, and thus to each and every part regardless of who wrote\par
+it.\par
+\par
+Thus, it is not the intent of this section to claim rights or contest\par
+your rights to work written entirely by you; rather, the intent is to\par
+exercise the right to control the distribution of derivative or\par
+collective works based on the Library.\par
+\par
+In addition, mere aggregation of another work not based on the Library\par
+with the Library (or with a work based on the Library) on a volume of\par
+a storage or distribution medium does not bring the other work under\par
+the scope of this License.\par
+\par
+ 3. You may opt to apply the terms of the ordinary GNU General Public\par
+License instead of this License to a given copy of the Library. To do\par
+this, you must alter all the notices that refer to this License, so\par
+that they refer to the ordinary GNU General Public License, version 2,\par
+instead of to this License. (If a newer version than version 2 of the\par
+ordinary GNU General Public License has appeared, then you can specify\par
+that version instead if you wish.) Do not make any other change in\par
+these notices.\par
+\page\par
+ Once this change is made in a given copy, it is irreversible for\par
+that copy, so the ordinary GNU General Public License applies to all\par
+subsequent copies and derivative works made from that copy.\par
+\par
+ This option is useful when you wish to copy part of the code of\par
+the Library into a program that is not a library.\par
+\par
+ 4. You may copy and distribute the Library (or a portion or\par
+derivative of it, under Section 2) in object code or executable form\par
+under the terms of Sections 1 and 2 above provided that you accompany\par
+it with the complete corresponding machine-readable source code, which\par
+must be distributed under the terms of Sections 1 and 2 above on a\par
+medium customarily used for software interchange.\par
+\par
+ If distribution of object code is made by offering access to copy\par
+from a designated place, then offering equivalent access to copy the\par
+source code from the same place satisfies the requirement to\par
+distribute the source code, even though third parties are not\par
+compelled to copy the source along with the object code.\par
+\par
+ 5. A program that contains no derivative of any portion of the\par
+Library, but is designed to work with the Library by being compiled or\par
+linked with it, is called a "work that uses the Library". Such a\par
+work, in isolation, is not a derivative work of the Library, and\par
+therefore falls outside the scope of this License.\par
+\par
+ However, linking a "work that uses the Library" with the Library\par
+creates an executable that is a derivative of the Library (because it\par
+contains portions of the Library), rather than a "work that uses the\par
+library". The executable is therefore covered by this License.\par
+Section 6 states terms for distribution of such executables.\par
+\par
+ When a "work that uses the Library" uses material from a header file\par
+that is part of the Library, the object code for the work may be a\par
+derivative work of the Library even though the source code is not.\par
+Whether this is true is especially significant if the work can be\par
+linked without the Library, or if the work is itself a library. The\par
+threshold for this to be true is not precisely defined by law.\par
+\par
+ If such an object file uses only numerical parameters, data\par
+structure layouts and accessors, and small macros and small inline\par
+functions (ten lines or less in length), then the use of the object\par
+file is unrestricted, regardless of whether it is legally a derivative\par
+work. (Executables containing this object code plus portions of the\par
+Library will still fall under Section 6.)\par
+\par
+ Otherwise, if the work is a derivative of the Library, you may\par
+distribute the object code for the work under the terms of Section 6.\par
+Any executables containing that work also fall under Section 6,\par
+whether or not they are linked directly with the Library itself.\par
+\page\par
+ 6. As an exception to the Sections above, you may also combine or\par
+link a "work that uses the Library" with the Library to produce a\par
+work containing portions of the Library, and distribute that work\par
+under terms of your choice, provided that the terms permit\par
+modification of the work for the customer's own use and reverse\par
+engineering for debugging such modifications.\par
+\par
+ You must give prominent notice with each copy of the work that the\par
+Library is used in it and that the Library and its use are covered by\par
+this License. You must supply a copy of this License. If the work\par
+during execution displays copyright notices, you must include the\par
+copyright notice for the Library among them, as well as a reference\par
+directing the user to the copy of this License. Also, you must do one\par
+of these things:\par
+\par
+ a) Accompany the work with the complete corresponding\par
+ machine-readable source code for the Library including whatever\par
+ changes were used in the work (which must be distributed under\par
+ Sections 1 and 2 above); and, if the work is an executable linked\par
+ with the Library, with the complete machine-readable "work that\par
+ uses the Library", as object code and/or source code, so that the\par
+ user can modify the Library and then relink to produce a modified\par
+ executable containing the modified Library. (It is understood\par
+ that the user who changes the contents of definitions files in the\par
+ Library will not necessarily be able to recompile the application\par
+ to use the modified definitions.)\par
+\par
+ b) Use a suitable shared library mechanism for linking with the\par
+ Library. A suitable mechanism is one that (1) uses at run time a\par
+ copy of the library already present on the user's computer system,\par
+ rather than copying library functions into the executable, and (2)\par
+ will operate properly with a modified version of the library, if\par
+ the user installs one, as long as the modified version is\par
+ interface-compatible with the version that the work was made with.\par
+\par
+ c) Accompany the work with a written offer, valid for at\par
+ least three years, to give the same user the materials\par
+ specified in Subsection 6a, above, for a charge no more\par
+ than the cost of performing this distribution.\par
+\par
+ d) If distribution of the work is made by offering access to copy\par
+ from a designated place, offer equivalent access to copy the above\par
+ specified materials from the same place.\par
+\par
+ e) Verify that the user has already received a copy of these\par
+ materials or that you have already sent this user a copy.\par
+\par
+ For an executable, the required form of the "work that uses the\par
+Library" must include any data and utility programs needed for\par
+reproducing the executable from it. However, as a special exception,\par
+the materials to be distributed need not include anything that is\par
+normally distributed (in either source or binary form) with the major\par
+components (compiler, kernel, and so on) of the operating system on\par
+which the executable runs, unless that component itself accompanies\par
+the executable.\par
+\par
+ It may happen that this requirement contradicts the license\par
+restrictions of other proprietary libraries that do not normally\par
+accompany the operating system. Such a contradiction means you cannot\par
+use both them and the Library together in an executable that you\par
+distribute.\par
+\page\par
+ 7. You may place library facilities that are a work based on the\par
+Library side-by-side in a single library together with other library\par
+facilities not covered by this License, and distribute such a combined\par
+library, provided that the separate distribution of the work based on\par
+the Library and of the other library facilities is otherwise\par
+permitted, and provided that you do these two things:\par
+\par
+ a) Accompany the combined library with a copy of the same work\par
+ based on the Library, uncombined with any other library\par
+ facilities. This must be distributed under the terms of the\par
+ Sections above.\par
+\par
+ b) Give prominent notice with the combined library of the fact\par
+ that part of it is a work based on the Library, and explaining\par
+ where to find the accompanying uncombined form of the same work.\par
+\par
+ 8. You may not copy, modify, sublicense, link with, or distribute\par
+the Library except as expressly provided under this License. Any\par
+attempt otherwise to copy, modify, sublicense, link with, or\par
+distribute the Library is void, and will automatically terminate your\par
+rights under this License. However, parties who have received copies,\par
+or rights, from you under this License will not have their licenses\par
+terminated so long as such parties remain in full compliance.\par
+\par
+ 9. You are not required to accept this License, since you have not\par
+signed it. However, nothing else grants you permission to modify or\par
+distribute the Library or its derivative works. These actions are\par
+prohibited by law if you do not accept this License. Therefore, by\par
+modifying or distributing the Library (or any work based on the\par
+Library), you indicate your acceptance of this License to do so, and\par
+all its terms and conditions for copying, distributing or modifying\par
+the Library or works based on it.\par
+\par
+ 10. Each time you redistribute the Library (or any work based on the\par
+Library), the recipient automatically receives a license from the\par
+original licensor to copy, distribute, link with or modify the Library\par
+subject to these terms and conditions. You may not impose any further\par
+restrictions on the recipients' exercise of the rights granted herein.\par
+You are not responsible for enforcing compliance by third parties with\par
+this License.\par
+\page\par
+ 11. If, as a consequence of a court judgment or allegation of patent\par
+infringement or for any other reason (not limited to patent issues),\par
+conditions are imposed on you (whether by court order, agreement or\par
+otherwise) that contradict the conditions of this License, they do not\par
+excuse you from the conditions of this License. If you cannot\par
+distribute so as to satisfy simultaneously your obligations under this\par
+License and any other pertinent obligations, then as a consequence you\par
+may not distribute the Library at all. For example, if a patent\par
+license would not permit royalty-free redistribution of the Library by\par
+all those who receive copies directly or indirectly through you, then\par
+the only way you could satisfy both it and this License would be to\par
+refrain entirely from distribution of the Library.\par
+\par
+If any portion of this section is held invalid or unenforceable under any\par
+particular circumstance, the balance of the section is intended to apply,\par
+and the section as a whole is intended to apply in other circumstances.\par
+\par
+It is not the purpose of this section to induce you to infringe any\par
+patents or other property right claims or to contest validity of any\par
+such claims; this section has the sole purpose of protecting the\par
+integrity of the free software distribution system which is\par
+implemented by public license practices. Many people have made\par
+generous contributions to the wide range of software distributed\par
+through that system in reliance on consistent application of that\par
+system; it is up to the author/donor to decide if he or she is willing\par
+to distribute software through any other system and a licensee cannot\par
+impose that choice.\par
+\par
+This section is intended to make thoroughly clear what is believed to\par
+be a consequence of the rest of this License.\par
+\par
+ 12. If the distribution and/or use of the Library is restricted in\par
+certain countries either by patents or by copyrighted interfaces, the\par
+original copyright holder who places the Library under this License may add\par
+an explicit geographical distribution limitation excluding those countries,\par
+so that distribution is permitted only in or among countries not thus\par
+excluded. In such case, this License incorporates the limitation as if\par
+written in the body of this License.\par
+\par
+ 13. The Free Software Foundation may publish revised and/or new\par
+versions of the Lesser General Public License from time to time.\par
+Such new versions will be similar in spirit to the present version,\par
+but may differ in detail to address new problems or concerns.\par
+\par
+Each version is given a distinguishing version number. If the Library\par
+specifies a version number of this License which applies to it and\par
+"any later version", you have the option of following the terms and\par
+conditions either of that version or of any later version published by\par
+the Free Software Foundation. If the Library does not specify a\par
+license version number, you may choose any version ever published by\par
+the Free Software Foundation.\par
+\page\par
+ 14. If you wish to incorporate parts of the Library into other free\par
+programs whose distribution conditions are incompatible with these,\par
+write to the author to ask for permission. For software which is\par
+copyrighted by the Free Software Foundation, write to the Free\par
+Software Foundation; we sometimes make exceptions for this. Our\par
+decision will be guided by the two goals of preserving the free status\par
+of all derivatives of our free software and of promoting the sharing\par
+and reuse of software generally.\par
+\par
+\tab\tab\tab NO WARRANTY\par
+\par
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO\par
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.\par
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR\par
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY\par
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE\par
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\par
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE\par
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME\par
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.\par
+\par
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN\par
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY\par
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU\par
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR\par
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE\par
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING\par
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A\par
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF\par
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH\par
+DAMAGES.\par
+\par
+\tab\tab END OF TERMS AND CONDITIONS\par
+\page\par
+}
+ |
|
From: <gl...@us...> - 2007-06-22 12:12:26
|
Revision: 156
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=156&view=rev
Author: glslang
Date: 2007-06-22 05:11:54 -0700 (Fri, 22 Jun 2007)
Log Message:
-----------
+universal build updates
Modified Paths:
--------------
trunk/lib/openlibraries/src/openpluginlib/pl/timer.hpp
trunk/lib/openlibraries/test/openeffectslib/tm_bench/Makefile.am
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/timer.hpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/timer.hpp 2007-06-22 10:19:40 UTC (rev 155)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/timer.hpp 2007-06-22 12:11:54 UTC (rev 156)
@@ -97,6 +97,7 @@
};
#endif
+#ifndef __ppc__
template<class time_value_policy, template<class> class sleep_policy>
class rdtsc : public time_value_policy, public sleep_policy<time_value_policy>
{
@@ -254,6 +255,7 @@
ticks_type stop_;
ticks_type ticks_per_microsec_;
};
+#endif
#ifndef WIN32
template<class time_value_policy, template<class> class sleep_policy>
@@ -330,8 +332,10 @@
#ifdef WIN32
typedef timer<rdtsc<time_value, event_sleep> > rdtsc_default_timer;
#else
-# if GCC_VERSION >= 40000 && !defined __ppc
+# if GCC_VERSION >= 40000 && !defined __ppc__
typedef timer<rdtsc<time_value, nanosleep_> > rdtsc_default_timer;
+# else
+ typedef timer<gettimeofday_<time_value, nanosleep_> > rdtsc_default_timer;
# endif
typedef timer<gettimeofday_<time_value, nanosleep_> > gettimeofday_default_timer;
#endif
Modified: trunk/lib/openlibraries/test/openeffectslib/tm_bench/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openeffectslib/tm_bench/Makefile.am 2007-06-22 10:19:40 UTC (rev 155)
+++ trunk/lib/openlibraries/test/openeffectslib/tm_bench/Makefile.am 2007-06-22 12:11:54 UTC (rev 156)
@@ -10,7 +10,8 @@
tm_bench_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH)
+ $(BOOST_INCLUDE_PATH) \
+ $(GLEW_INCLUDE_PATH)
tm_bench_LDFLAGS = \
$(OLIB_LDFLAGS) \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-06-24 19:43:27
|
Revision: 161
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=161&view=rev
Author: glslang
Date: 2007-06-24 12:43:26 -0700 (Sun, 24 Jun 2007)
Log Message:
-----------
+ plugins were being added twice on windows
Modified Paths:
--------------
trunk/lib/openlibraries/src/openpluginlib/pl/opl_parser_action.cpp
trunk/lib/openlibraries/test/openpluginlib/enumerate/enumerate.cpp
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/opl_parser_action.cpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/opl_parser_action.cpp 2007-06-24 18:20:51 UTC (rev 160)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/opl_parser_action.cpp 2007-06-24 19:43:26 UTC (rev 161)
@@ -92,10 +92,6 @@
fs::path tmp( to_string( *I ).c_str( ), fs::native );
filename.push_back( to_wstring( ( pa.get_branch_path( ) / tmp.leaf( ) ).string( ).c_str( ) ) );
-
-# ifdef WIN32
- filename.push_back( to_wstring( ( fs::path( opl::plugins_path( ).c_str( ), fs::native ) / tmp.leaf( ) ).string( ).c_str( ) ) );
-# endif
}
}
}
Modified: trunk/lib/openlibraries/test/openpluginlib/enumerate/enumerate.cpp
===================================================================
--- trunk/lib/openlibraries/test/openpluginlib/enumerate/enumerate.cpp 2007-06-24 18:20:51 UTC (rev 160)
+++ trunk/lib/openlibraries/test/openpluginlib/enumerate/enumerate.cpp 2007-06-24 19:43:26 UTC (rev 161)
@@ -18,7 +18,6 @@
opl::init( "" );
opl::discovery<> rez0;
- rez0.sort( opl::highest_merit_sort( ) );
std::cout << "enumerate: number of plugins available " << static_cast<unsigned int>( rez0.size( ) ) << ".\n";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-04 19:57:45
|
Revision: 227
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=227&view=rev
Author: glslang
Date: 2007-08-04 12:57:41 -0700 (Sat, 04 Aug 2007)
Log Message:
-----------
+ add gcc visibility attributes
Modified Paths:
--------------
trunk/lib/openlibraries/configure.ac
trunk/lib/openlibraries/src/openassetlib/al/Makefile.am
trunk/lib/openlibraries/src/openassetlib/al/config.hpp
trunk/lib/openlibraries/src/openimagelib/il/Makefile.am
trunk/lib/openlibraries/src/openimagelib/il/config.hpp
trunk/lib/openlibraries/src/openimagelib/il/utility.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/bmp/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/dds/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/dpx/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/exr/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/hdr/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/jpg/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/png/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/psd/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/sgi/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/tga/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/tiff/Makefile.am
trunk/lib/openlibraries/src/openmedialib/ml/Makefile.am
trunk/lib/openlibraries/src/openmedialib/ml/audio.hpp
trunk/lib/openlibraries/src/openmedialib/ml/config.hpp
trunk/lib/openlibraries/src/openmedialib/ml/frame.hpp
trunk/lib/openlibraries/src/openmedialib/ml/input.hpp
trunk/lib/openlibraries/src/openmedialib/plugins/avformat/Makefile.am
trunk/lib/openlibraries/src/openmedialib/plugins/gensys/Makefile.am
trunk/lib/openlibraries/src/openmedialib/plugins/glew/Makefile.am
trunk/lib/openlibraries/src/openmedialib/plugins/ofx/Makefile.am
trunk/lib/openlibraries/src/openmedialib/plugins/oil/Makefile.am
trunk/lib/openlibraries/src/openmedialib/plugins/openal/Makefile.am
trunk/lib/openlibraries/src/openmedialib/plugins/template/Makefile.am
trunk/lib/openlibraries/src/openpluginlib/pl/Makefile.am
trunk/lib/openlibraries/src/openpluginlib/pl/config.hpp
Removed Paths:
-------------
trunk/lib/openlibraries/src/openmedialib/plugins/caca/
Modified: trunk/lib/openlibraries/configure.ac
===================================================================
--- trunk/lib/openlibraries/configure.ac 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/configure.ac 2007-08-04 19:57:41 UTC (rev 227)
@@ -169,7 +169,7 @@
dnl OpenLibraries common flags
dnl NOTE: we could use $(var) instead of @var@ if we want late-expansion in the generated makefiles.
-OLIB_CXXFLAGS=''
+OLIB_CXXFLAGS='-fvisibility=hidden -fvisibility-inlines-hidden'
AC_SUBST(OLIB_CXXFLAGS)
OLIB_LDFLAGS=''
@@ -199,20 +199,6 @@
fi
AM_CONDITIONAL(HAVE_LIBAVFORMAT, [test x"$libavformat" = "xyes"])
-dnl caca support
-AC_PATH_PROG(CACA_CONFIG, caca-config, no)
-if test "x$CACA_CONFIG" = "xno" ; then
- AC_MSG_RESULT([*** caca support is not available ***])
-else
- AC_DEFINE(HAVE_LIBCACA,1,[Define this for caca support])
- CACA_CXXFLAGS=`$CACA_CONFIG --cflags`
- CACA_LIBS=`$CACA_CONFIG --plugin-libs`
- AC_SUBST(CACA_CXXFLAGS)
- AC_SUBST(CACA_LIBS)
- have_libcaca="yes"
-fi
-AM_CONDITIONAL(HAVE_LIBCACA, [test x"$have_libcaca" = "xyes"])
-
dnl mlt support
AC_PATH_PROG(MLT_CONFIG, mlt-config, no)
if test "x$MLT_CONFIG" = "xno" ; then
@@ -370,7 +356,6 @@
src/openmedialib/plugins/template/Makefile
src/openmedialib/plugins/avformat/Makefile
src/openmedialib/plugins/oil/Makefile
-src/openmedialib/plugins/caca/Makefile
src/openmedialib/plugins/glew/Makefile
src/openmedialib/plugins/openal/Makefile
src/openmedialib/plugins/gensys/Makefile
Modified: trunk/lib/openlibraries/src/openassetlib/al/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openassetlib/al/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openassetlib/al/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -25,7 +25,8 @@
libopenassetlib_al_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
$(BOOST_INCLUDE_PATH) \
- $(XML2_CXXFLAGS)
+ $(XML2_CXXFLAGS) \
+ -DAL_EXPORTS
libopenassetlib_al_la_LIBADD =
Modified: trunk/lib/openlibraries/src/openassetlib/al/config.hpp
===================================================================
--- trunk/lib/openlibraries/src/openassetlib/al/config.hpp 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openassetlib/al/config.hpp 2007-08-04 19:57:41 UTC (rev 227)
@@ -7,7 +7,6 @@
#ifndef AL_CONFIG_INC_
#define AL_CONFIG_INC_
-//======================================================
#ifdef WIN32
# ifdef AL_EXPORTS
# define AL_DECLSPEC __declspec( dllexport )
@@ -15,15 +14,17 @@
# define AL_DECLSPEC __declspec( dllimport )
# endif
#else
-# define AL_DECLSPEC
+# ifdef AL_EXPORTS
+# define AL_DECLSPEC __attribute__( ( visibility( "default" ) ) )
+# else
+# define AL_DECLSPEC __attribute__( ( visibility( "default" ) ) )
+# endif
#endif
-//======================================================
#ifndef OPENASSETLIB_LIBNAME
# define OPENASSETLIB_LIBNAME "openassetlib_al"
#endif
-//======================================================
#ifndef OPENASSETLIB_TOOLSET
# if defined( _MSC_VER ) && ( _MSC_VER == 1310 ) && !defined( __ICL )
# define OPENASSETLIB_TOOLSET "vc71"
@@ -34,7 +35,6 @@
# endif
#endif
-//======================================================
#ifndef OPENASSETLIB_DEBUG_SUFFIX
# ifndef NDEBUG
# define OPENASSETLIB_DEBUG_SUFFIX "d"
@@ -43,12 +43,10 @@
# endif
#endif
-//======================================================
#ifndef OPENASSETLIB_VERSION
# define OPENASSETLIB_VERSION "0_4_0"
#endif
-//======================================================
// library search record (auto link).
#if defined( WIN32 ) && !defined( OPENASSETLIB_BUILD )
# if defined( OPENASSETLIB_LIBNAME ) && defined( OPENASSETLIB_TOOLSET ) && defined( OPENASSETLIB_DEBUG_SUFFIX ) && defined( OPENASSETLIB_VERSION )
@@ -56,6 +54,5 @@
# endif
#endif
-//======================================================
-
#endif
+
Modified: trunk/lib/openlibraries/src/openimagelib/il/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/il/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -23,7 +23,8 @@
libopenimagelib_il_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH)
+ $(BOOST_INCLUDE_PATH) \
+ -DIL_EXPORTS
libopenimagelib_il_la_LDFLAGS = \
$(OLIB_LDFLAGS) \
Modified: trunk/lib/openlibraries/src/openimagelib/il/config.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/config.hpp 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/il/config.hpp 2007-08-04 19:57:41 UTC (rev 227)
@@ -9,14 +9,18 @@
#define IL_CONFIG_INC_
#ifdef WIN32
- #ifdef IL_EXPORTS
- #define IL_DECLSPEC __declspec( dllexport )
- #else
- #define IL_DECLSPEC __declspec( dllimport )
- #endif // IL_EXPORTS
+# ifdef IL_EXPORTS
+# define IL_DECLSPEC __declspec( dllexport )
+# else
+# define IL_DECLSPEC __declspec( dllimport )
+# endif
#else
- #define IL_DECLSPEC
-#endif // WIN32
+# ifdef IL_EXPORTS
+# define IL_DECLSPEC __attribute__( ( visibility( "default" ) ) )
+# else
+# define IL_DECLSPEC __attribute__( ( visibility( "default" ) ) )
+# endif
+#endif
#ifndef OPENIMAGELIB_LIBNAME
# define OPENIMAGELIB_LIBNAME "openimagelib_il"
Modified: trunk/lib/openlibraries/src/openimagelib/il/utility.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/utility.hpp 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/il/utility.hpp 2007-08-04 19:57:41 UTC (rev 227)
@@ -42,7 +42,7 @@
IL_DECLSPEC image_type_ptr deinterlace( const image_type_ptr &im );
IL_DECLSPEC image_type_ptr extract_alpha( const image_type_ptr &im );
-enum IL_DECLSPEC rescale_filter { POINT_SAMPLING, BILINEAR_SAMPLING, BICUBIC_SAMPLING, TRILINEAR_SAMPLING };
+enum rescale_filter { POINT_SAMPLING, BILINEAR_SAMPLING, BICUBIC_SAMPLING, TRILINEAR_SAMPLING };
IL_DECLSPEC image_type_ptr rescale( const image_type_ptr &im, int new_w, int new_h, int new_d = 1, rescale_filter filter = POINT_SAMPLING );
@@ -83,7 +83,7 @@
typedef std::vector<unsigned int> histogram_type;
-enum IL_DECLSPEC histogram_filter { LUMINANCE, RED, GREEN, BLUE, ALPHA }; // RED, GREEN, BLUE and ALPHA do relate to channels rather than actual pixel format being rgba.
+enum histogram_filter { LUMINANCE, RED, GREEN, BLUE, ALPHA }; // RED, GREEN, BLUE and ALPHA do relate to channels rather than actual pixel format being rgba.
IL_DECLSPEC void histogram( const image_type_ptr& im, int size, float mask[ ], histogram_type& hist );
IL_DECLSPEC void histogram( const image_type_ptr& im, int size, histogram_filter filter, histogram_type& hist );
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -12,7 +12,8 @@
libopenimagelib_3D_lightmap_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH)
+ $(BOOST_INCLUDE_PATH) \
+ -DIL_EXPORTS
libopenimagelib_3D_lightmap_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS)
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/bmp/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/bmp/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/bmp/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -12,7 +12,8 @@
libopenimagelib_bmp_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH)
+ $(BOOST_INCLUDE_PATH) \
+ -DIL_EXPORTS
libopenimagelib_bmp_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS)
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/dds/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dds/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dds/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -12,7 +12,8 @@
libopenimagelib_dds_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH)
+ $(BOOST_INCLUDE_PATH) \
+ -DIL_EXPORTS
libopenimagelib_dds_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS)
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/dpx/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dpx/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dpx/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -12,7 +12,8 @@
libopenimagelib_dpx_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH)
+ $(BOOST_INCLUDE_PATH) \
+ -DIL_EXPORTS
libopenimagelib_dpx_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS)
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/exr/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/exr/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/exr/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -14,7 +14,8 @@
libopenimagelib_exr_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
$(BOOST_INCLUDE_PATH) \
- $(OPENEXR_CFLAGS)
+ $(OPENEXR_CFLAGS) \
+ -DIL_EXPORTS
libopenimagelib_exr_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS) \
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/hdr/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/hdr/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/hdr/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -12,7 +12,8 @@
libopenimagelib_hdr_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH)
+ $(BOOST_INCLUDE_PATH) \
+ -DIL_EXPORTS
libopenimagelib_hdr_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS)
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/jpg/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/jpg/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/jpg/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -13,7 +13,8 @@
libopenimagelib_jpg_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH)s
+ $(BOOST_INCLUDE_PATH) \
+ -DIL_EXPORTS
libopenimagelib_jpg_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS) \
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/png/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/png/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/png/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -13,7 +13,8 @@
libopenimagelib_png_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH)
+ $(BOOST_INCLUDE_PATH) \
+ -DIL_EXPORTS
libopenimagelib_png_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS) \
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/psd/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/psd/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/psd/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -12,7 +12,8 @@
libopenimagelib_psd_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH)
+ $(BOOST_INCLUDE_PATH) \
+ -DIL_EXPORTS
libopenimagelib_psd_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS)
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -14,7 +14,8 @@
libopenimagelib_quicktime_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH)
+ $(BOOST_INCLUDE_PATH) \
+ -DIL_EXPORTS
libopenimagelib_quicktime_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS) \
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/sgi/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/sgi/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/sgi/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -12,7 +12,8 @@
libopenimagelib_sgi_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH)
+ $(BOOST_INCLUDE_PATH) \
+ -DIL_EXPORTS
libopenimagelib_sgi_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS)
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/tga/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tga/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tga/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -12,7 +12,8 @@
libopenimagelib_tga_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH)
+ $(BOOST_INCLUDE_PATH) \
+ -DIL_EXPORTS
libopenimagelib_tga_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS)
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/tiff/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tiff/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tiff/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -14,7 +14,8 @@
libopenimagelib_tiff_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH)
+ $(BOOST_INCLUDE_PATH) \
+ -DIL_EXPORTS
libopenimagelib_tiff_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS) \
Modified: trunk/lib/openlibraries/src/openmedialib/ml/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/ml/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openmedialib/ml/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -18,7 +18,8 @@
libopenmedialib_ml_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH)
+ $(BOOST_INCLUDE_PATH) \
+ -DML_EXPORTS
libopenmedialib_ml_la_LDFLAGS = \
$(OLIB_LDFLAGS) \
Modified: trunk/lib/openlibraries/src/openmedialib/ml/audio.hpp
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/ml/audio.hpp 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openmedialib/ml/audio.hpp 2007-08-04 19:57:41 UTC (rev 227)
@@ -166,8 +166,8 @@
size_type eom_;
};
-typedef ML_DECLSPEC audio<unsigned char, audio_format> audio_type;
-typedef ML_DECLSPEC boost::shared_ptr<audio_type> audio_type_ptr;
+typedef audio<unsigned char, audio_format> audio_type;
+typedef boost::shared_ptr<audio_type> audio_type_ptr;
template<typename T, class storage = olib::openimagelib::il::default_storage<T> >
class pcm16 : public audio_format<T, storage>
@@ -208,3 +208,4 @@
} } }
#endif
+
Modified: trunk/lib/openlibraries/src/openmedialib/ml/config.hpp
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/ml/config.hpp 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openmedialib/ml/config.hpp 2007-08-04 19:57:41 UTC (rev 227)
@@ -9,28 +9,32 @@
#define ML_CONFIG_INC_
#ifdef WIN32
- #ifdef ML_PLUGIN_EXPORTS
- #define ML_PLUGIN_DECLSPEC __declspec( dllexport )
- #else
- #define ML_PLUGIN_DECLSPEC __declspec( dllimport )
- #endif
+# ifdef ML_PLUGIN_EXPORTS
+# define ML_PLUGIN_DECLSPEC __declspec( dllexport )
+# else
+# define ML_PLUGIN_DECLSPEC __declspec( dllimport )
+# endif
#else
- #ifdef ML_PLUGIN_EXPORTS
- #define ML_PLUGIN_DECLSPEC extern
- #else
- #define ML_PLUGIN_DECLSPEC
- #endif
+# ifdef ML_PLUGIN_EXPORTS
+# define ML_PLUGIN_DECLSPEC __attribute__( ( visibility( "default" ) ) )
+# else
+# define ML_PLUGIN_DECLSPEC __attribute__( ( visibility( "default" ) ) )
+# endif
#endif
#ifdef WIN32
- #ifdef ML_EXPORTS
- #define ML_DECLSPEC __declspec( dllexport )
- #else
- #define ML_DECLSPEC __declspec( dllimport )
- #endif // ML_EXPORTS
+# ifdef ML_EXPORTS
+# define ML_DECLSPEC __declspec( dllexport )
+# else
+# define ML_DECLSPEC __declspec( dllimport )
+# endif
#else
- #define ML_DECLSPEC
-#endif // WIN32
+# ifdef ML_EXPORTS
+# define ML_DECLSPEC __attribute__( ( visibility( "default" ) ) )
+# else
+# define ML_DECLSPEC __attribute__( ( visibility( "default" ) ) )
+# endif
+#endif
#ifndef OPENMEDIALIB_LIBNAME
# define OPENMEDIALIB_LIBNAME "openmedialib_ml"
Modified: trunk/lib/openlibraries/src/openmedialib/ml/frame.hpp
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/ml/frame.hpp 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openmedialib/ml/frame.hpp 2007-08-04 19:57:41 UTC (rev 227)
@@ -22,11 +22,11 @@
namespace pcos = olib::openpluginlib::pcos;
-typedef ML_DECLSPEC olib::openimagelib::il::image_type image_type;
-typedef ML_DECLSPEC olib::openimagelib::il::image_type_ptr image_type_ptr;
+typedef olib::openimagelib::il::image_type image_type;
+typedef olib::openimagelib::il::image_type_ptr image_type_ptr;
-class ML_DECLSPEC frame_type;
-typedef ML_DECLSPEC boost::shared_ptr< frame_type > frame_type_ptr;
+class frame_type;
+typedef boost::shared_ptr< frame_type > frame_type_ptr;
class ML_DECLSPEC frame_type
{
Modified: trunk/lib/openlibraries/src/openmedialib/ml/input.hpp
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/ml/input.hpp 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openmedialib/ml/input.hpp 2007-08-04 19:57:41 UTC (rev 227)
@@ -47,7 +47,7 @@
process_flags;
// Forward declarations
-class ML_DECLSPEC input_type;
+class input_type;
typedef boost::shared_ptr< input_type > input_type_ptr;
// The input abstract class - implementations will extend this class and (minimally)
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/avformat/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/avformat/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/avformat/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -9,27 +9,24 @@
lib_LTLIBRARIES = libopenmedialib_avformat.la
libopenmedialib_avformat_la_SOURCES = \
- avformat_plugin.cpp \
- # end
+ avformat_plugin.cpp
libopenmedialib_avformat_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
$(BOOST_INCLUDE_PATH) \
$(LIBAVFORMAT_CFLAGS) \
- # end
+ -DML_PLUGIN_EXPORTS
libopenmedialib_avformat_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS) \
$(LIBAVFORMAT_LIBS) \
$(top_builddir)/src/openmedialib/ml/libopenmedialib_ml.la \
- $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la \
- # end
+ $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la
libopenmedialib_avformat_la_LDFLAGS = \
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
- -version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE) \
- #end
+ -version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE)
libopenmedialib_avformat_ladir = $(OPENMEDIALIB_PLUGINPATH)
libopenmedialib_avformat_la_DATA = avformat_plugin.opl
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/gensys/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/gensys/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/gensys/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -8,25 +8,22 @@
lib_LTLIBRARIES = libopenmedialib_gensys.la
libopenmedialib_gensys_la_SOURCES = \
- gensys_plugin.cpp \
- # end
+ gensys_plugin.cpp
libopenmedialib_gensys_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
$(BOOST_INCLUDE_PATH) \
- # end
+ -DML_PLUGIN_EXPORTS
libopenmedialib_gensys_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS) \
$(top_builddir)/src/openmedialib/ml/libopenmedialib_ml.la \
- $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la \
- # end
+ $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la
libopenmedialib_gensys_la_LDFLAGS = \
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
- -version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE) \
- #end
+ -version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE)
libopenmedialib_gensys_ladir = $(OPENMEDIALIB_PLUGINPATH)
libopenmedialib_gensys_la_DATA = gensys_plugin.opl
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/glew/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/glew/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/glew/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -9,14 +9,13 @@
lib_LTLIBRARIES = libopenmedialib_glew.la
libopenmedialib_glew_la_SOURCES = \
- glew_plugin.cpp \
- # end
+ glew_plugin.cpp
libopenmedialib_glew_la_CXXFLAGS = \
$(GLEW_INCLUDE_PATH) \
$(OLIB_CXXFLAGS) \
$(BOOST_INCLUDE_PATH) \
- # end
+ -DML_PLUGIN_EXPORTS
libopenmedialib_glew_la_LIBADD = \
$(OPENGL_LIBS) \
@@ -25,8 +24,7 @@
$(GLUT_LIBS) \
$(BOOST_FILESYSTEM_LIBS) \
$(top_builddir)/src/openmedialib/ml/libopenmedialib_ml.la \
- $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la \
- # end
+ $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la
libopenmedialib_glew_la_LDFLAGS = \
$(OLIB_LDFLAGS) \
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/ofx/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/ofx/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/ofx/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -15,7 +15,8 @@
libopenmedialib_ofx_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
$(BOOST_INCLUDE_PATH) \
- $(OFX_INCLUDE_PATH)
+ $(OFX_INCLUDE_PATH) \
+ -DML_PLUGIN_EXPORTS
libopenmedialib_ofx_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS) \
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/oil/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/oil/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/oil/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -8,25 +8,22 @@
lib_LTLIBRARIES = libopenmedialib_oil.la
libopenmedialib_oil_la_SOURCES = \
- oil_plugin.cpp \
- # end
+ oil_plugin.cpp
libopenmedialib_oil_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
$(BOOST_INCLUDE_PATH) \
- # end
+ -DML_PLUGIN_EXPORTS
libopenmedialib_oil_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS) \
$(top_builddir)/src/openmedialib/ml/libopenmedialib_ml.la \
- $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la \
- # end
+ $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la
libopenmedialib_oil_la_LDFLAGS = \
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
- -version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE) \
- #end
+ -version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE)
libopenmedialib_oil_ladir = $(OPENMEDIALIB_PLUGINPATH)
libopenmedialib_oil_la_DATA = oil_plugin.opl
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/openal/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/openal/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/openal/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -16,7 +16,8 @@
$(BOOST_INCLUDE_PATH) \
$(OPENAL_INCLUDE_PATH) \
$(GLEW_INCLUDE_PATH) \
- $(SWAB_AUDIO)
+ $(SWAB_AUDIO) \
+ -DML_PLUGIN_EXPORTS
libopenmedialib_openal_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS) \
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/template/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/template/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/template/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -14,19 +14,17 @@
libopenmedialib_template_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
$(BOOST_INCLUDE_PATH) \
- # end
+ -DML_PLUGIN_EXPORTS
libopenmedialib_template_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS) \
$(top_builddir)/src/openmedialib/ml/libopenmedialib_ml.la \
- $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la \
- # end
+ $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la
libopenmedialib_template_la_LDFLAGS = \
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
- -version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE) \
- #end
+ -version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE)
libopenmedialib_template_ladir = $(OPENMEDIALIB_PLUGINPATH)
libopenmedialib_template_la_DATA = template_plugin.opl
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -70,6 +70,7 @@
$(GLEW_INCLUDE_PATH) \
$(XML2_CXXFLAGS) \
$(OFX_INCLUDE_PATH) \
+ -DOPENPLUGINLIB_EXPORTS \
-DOPENEFFECTSLIB_SHADERS=\"$(OPENEFFECTSLIB_SHADERSPATH)/\" \
-DOPENIMAGELIB_PLUGINS=\"$(OPENIMAGELIB_PLUGINPATH)\" \
-DOPENMEDIALIB_PLUGINS=\"$(OPENMEDIALIB_PLUGINPATH)\" \
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/config.hpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/config.hpp 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/config.hpp 2007-08-04 19:57:41 UTC (rev 227)
@@ -15,7 +15,11 @@
# define OPENPLUGINLIB_DECLSPEC __declspec( dllimport )
# endif
#else
-# define OPENPLUGINLIB_DECLSPEC
+# ifdef OPENPLUGINLIB_EXPORTS
+# define OPENPLUGINLIB_DECLSPEC __attribute__( ( visibility( "default" ) ) )
+# else
+# define OPENPLUGINLIB_DECLSPEC __attribute__( ( visibility( "default" ) ) )
+# endif
#endif
#ifndef OPENPLUGINLIB_LIBNAME
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-09-01 21:50:39
|
Revision: 293
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=293&view=rev
Author: glslang
Date: 2007-09-01 14:50:34 -0700 (Sat, 01 Sep 2007)
Log Message:
-----------
+build fixes
Modified Paths:
--------------
trunk/lib/openlibraries/configure.ac
trunk/lib/openlibraries/m4/openimagelib.m4
trunk/lib/openlibraries/src/openimagelib/plugins/tiff/Makefile.am
Added Paths:
-----------
trunk/lib/openlibraries/m4/tiff.m4
Modified: trunk/lib/openlibraries/configure.ac
===================================================================
--- trunk/lib/openlibraries/configure.ac 2007-09-01 20:57:47 UTC (rev 292)
+++ trunk/lib/openlibraries/configure.ac 2007-09-01 21:50:34 UTC (rev 293)
@@ -155,6 +155,7 @@
AC_SUBST(XML2_LIBS)
AC_CHECK_OPENIMAGELIB( )
+AC_CHECK_TIFF( )
AC_CHECK_QUICKTIME( )
Modified: trunk/lib/openlibraries/m4/openimagelib.m4
===================================================================
--- trunk/lib/openlibraries/m4/openimagelib.m4 2007-09-01 20:57:47 UTC (rev 292)
+++ trunk/lib/openlibraries/m4/openimagelib.m4 2007-09-01 21:50:34 UTC (rev 293)
@@ -36,13 +36,6 @@
AC_MSG_RESULT([*** JPEG support is not available ***]))
AM_CONDITIONAL(HAVE_LIBJPEG, test x"$have_libjpeg" = "xyes")
AC_SUBST(JPEG_LIBS)
-
- dnl libtiff support
- AC_CHECK_LIB(tiff, TIFFOpen,
- have_libtiff=yes TIFF_LIBS="-ltiff",
- AC_MSG_RESULT([*** TIFF support is not available ***]))
- AM_CONDITIONAL(HAVE_LIBTIFF, test x"$have_libtiff" = "xyes")
- AC_SUBST(TIFF_LIBS)
fi
AM_CONDITIONAL(HAVE_OPENIMAGELIB, test x"$ac_use_openimagelib" = "xyes")
Added: trunk/lib/openlibraries/m4/tiff.m4
===================================================================
--- trunk/lib/openlibraries/m4/tiff.m4 (rev 0)
+++ trunk/lib/openlibraries/m4/tiff.m4 2007-09-01 21:50:34 UTC (rev 293)
@@ -0,0 +1,47 @@
+
+#
+#
+#
+
+AC_DEFUN([AC_CHECK_TIFF],[
+ AC_ARG_WITH(tiffprefix, AC_HELP_STRING([--with-tiffprefix], [TIFF installation prefix directory]),,
+ with_tiffprefix="")
+
+ TIFF_PREFIX="$with_tiffprefix"
+ TIFF_INCLUDE_PATH=""
+ TIFF_LIB_PATH=""
+ TIFF_LIBS=""
+
+ AS_IF([test "x$with_tiffprefix" != "x" ],
+ [ AC_MSG_WARN([*** TIFF prefix is user defined. Current value is $with_tiffprefix. ***])
+ TIFF_INCLUDE="$with_tiffprefix/include/"
+ TIFF_INCLUDE_PATH="-I$TIFF_INCLUDE"
+ TIFF_LIB_PATH="-L$with_tiffprefix/$OL_LIBNAME"],
+ AC_MSG_RESULT([*** TIFF prefix is not defined. Will use system defaults. ***]))
+
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$TIFF_LIB_PATH $save_LDFLAGS"
+
+ AC_CHECK_LIB(TIFF, TIFFOpen,
+ [AC_CHECK_HEADER(${TIFF_INCLUDE}/tiffio.h,
+ [ac_have_tiff="yes" TIFF_LIBS="-ltiff" AC_DEFINE(HAVE_TIFF_H, 1,[Define this if you have TIFF support])],
+ [AC_MSG_ERROR([*** TIFF support is not available. Please install libtiff to proceed. ***])])]
+
+ LDFLAGS="$save_LDFLAGS", [AC_MSG_ERROR([*** TIFF support is not available. Please install libtiff to proceed. ***])],[])
+
+ if test x$ac_have_tiff = "xyes"; then
+ ac_use_tiff=yes
+ fi
+
+ AC_SUBST(TIFF_PREFIX)
+ AC_SUBST(TIFF_INCLUDE_PATH)
+ AC_SUBST(TIFF_LIB_PATH)
+ AC_SUBST(TIFF_LIBS)
+ AM_CONDITIONAL(HAVE_LIBTIFF, test x"$ac_use_tiff" = "xyes")
+
+ if test x$ac_use_tiff = "xyes"; then
+ ifelse([$1], , :, [$1])
+ else
+ ifelse([$2], , :, [$2])
+ fi
+])
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/tiff/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tiff/Makefile.am 2007-09-01 20:57:47 UTC (rev 292)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tiff/Makefile.am 2007-09-01 21:50:34 UTC (rev 293)
@@ -15,6 +15,7 @@
libopenimagelib_tiff_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
$(BOOST_INCLUDE_PATH) \
+ $(TIFF_INCLUDE_PATH) \
-DIL_EXPORTS
libopenimagelib_tiff_la_LIBADD = \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-09-12 16:34:12
|
Revision: 298
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=298&view=rev
Author: glslang
Date: 2007-09-12 09:34:07 -0700 (Wed, 12 Sep 2007)
Log Message:
-----------
+ changes to allow cleaner client code. some gl state calculation was left to the client with the need to replicate the same tests
Modified Paths:
--------------
trunk/lib/openlibraries/src/openmedialib/plugins/oil/Makefile.am
trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.cpp
trunk/lib/openlibraries/src/openpluginlib/pl/GL_utility.cpp
trunk/lib/openlibraries/src/openpluginlib/pl/GL_utility.hpp
trunk/lib/openlibraries/src/umbrella_framework/openlibraries.hpp
trunk/lib/openlibraries/test/openimagelib/GL/_2D/_2D.cpp
trunk/lib/openlibraries/test/openimagelib/GL/_2D_crop/_2D_crop.cpp
trunk/lib/openlibraries/test/openimagelib/GL/_2D_exr/_2D_exr.cpp
trunk/lib/openlibraries/test/openimagelib/GL/_2D_scale/_2D_scale.cpp
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/oil/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/oil/Makefile.am 2007-09-06 22:34:31 UTC (rev 297)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/oil/Makefile.am 2007-09-12 16:34:07 UTC (rev 298)
@@ -11,12 +11,13 @@
oil_plugin.cpp
libopenmedialib_oil_la_CXXFLAGS = \
- $(OLIB_CXXFLAGS) \
+ $(OLIB_CXXFLAGS) \
$(BOOST_INCLUDE_PATH) \
-DML_PLUGIN_EXPORTS
libopenmedialib_oil_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS) \
+ $(top_builddir)/src/openpluginlib/pl/libopenpluginlib_pl.la \
$(top_builddir)/src/openmedialib/ml/libopenmedialib_ml.la \
$(top_builddir)/src/openimagelib/il/libopenimagelib_il.la
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.cpp 2007-09-06 22:34:31 UTC (rev 297)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_plugin.cpp 2007-09-12 16:34:07 UTC (rev 298)
@@ -202,7 +202,7 @@
pl::string full = path_ + "/" + files_[ 0 ];
il_query_traits query( pl::to_wstring( full ), L"input" );
discovery plugins( query );
- if ( plugins.size( ) != 0 )
+ if ( !plugins.empty( ) )
{
discovery::const_iterator it = plugins.begin( );
plug_ = boost::shared_dynamic_cast<il::openimagelib_plugin>( it->create_plugin( "" ) );
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/GL_utility.cpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/GL_utility.cpp 2007-09-06 22:34:31 UTC (rev 297)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/GL_utility.cpp 2007-09-12 16:34:07 UTC (rev 298)
@@ -9,85 +9,163 @@
namespace olib { namespace openpluginlib {
-std::pair<int, GLenum> pf_to_gl_format( const wstring& pf )
+bool pf_to_gl_format( const wstring& pf, GLint& internal_format, GLenum& format, GLenum& type )
{
if( pf == L"dxt1" )
{
- return std::make_pair( -1, GL_COMPRESSED_RGB_S3TC_DXT1_EXT );
+ internal_format = -1;
+ format = GL_COMPRESSED_RGB_S3TC_DXT1_EXT;
+ type = GL_UNSIGNED_BYTE;
+
+ return true;
}
else if( pf == L"dxt3" )
{
- return std::make_pair( -1, GL_COMPRESSED_RGBA_S3TC_DXT3_EXT );
+ internal_format = -1;
+ format = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;
+ type = GL_UNSIGNED_BYTE;
+
+ return true;
}
else if( pf == L"dxt5" )
{
- return std::make_pair( -1, GL_COMPRESSED_RGBA_S3TC_DXT5_EXT );
+ internal_format = -1;
+ format = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
+ type = GL_UNSIGNED_BYTE;
+
+ return true;
}
else if( pf == L"b8g8r8a8" )
{
- return std::make_pair( 4, GL_BGRA_EXT );
+ internal_format = GL_RGBA;
+ format = GL_BGRA_EXT;
+ type = GL_UNSIGNED_BYTE;
+
+ return true;
}
else if( pf == L"a8b8g8r8" )
{
- return std::make_pair( 4, GL_ABGR_EXT );
+ internal_format = GL_RGBA;
+ format = GL_ABGR_EXT;
+ type = GL_UNSIGNED_BYTE;
+
+ return true;
}
else if( pf == L"b8g8r8" )
{
- return std::make_pair( 3, GL_BGR_EXT );
+ internal_format = GL_RGB;
+ format = GL_BGR_EXT;
+ type = GL_UNSIGNED_BYTE;
+
+ return true;
}
else if( pf == L"r8g8b8" )
{
- return std::make_pair( 3, GL_RGB );
+ internal_format = GL_RGB;
+ format = GL_RGB;
+ type = GL_UNSIGNED_BYTE;
+
+ return true;
}
else if( pf == L"r8g8b8a8" )
{
- return std::make_pair( 4, GL_RGBA );
+ internal_format = GL_RGBA;
+ format = GL_RGBA;
+ type = GL_UNSIGNED_BYTE;
+
+ return true;
}
else if( pf == L"l8" )
{
- return std::make_pair( 1, GL_LUMINANCE );
+ internal_format = GL_LUMINANCE;
+ format = GL_LUMINANCE;
+ type = GL_UNSIGNED_BYTE;
+
+ return true;
}
else if( pf == L"l8a8" )
{
- return std::make_pair( 2, GL_LUMINANCE_ALPHA );
+ internal_format = GL_LUMINANCE_ALPHA;
+ format = GL_LUMINANCE_ALPHA;
+ type = GL_UNSIGNED_BYTE;
+
+ return true;
}
else if( pf == L"r10g10b10" )
{
- return std::make_pair( GL_RGB10, GL_RGB );
+ internal_format = GL_RGB10;
+ format = GL_RGB;
+ type = GL_UNSIGNED_SHORT;
+
+ return true;
}
else if( pf == L"r12g12b12" )
{
- return std::make_pair( GL_RGB12, GL_RGB );
+ internal_format = GL_RGB12;
+ format = GL_RGB;
+ type = GL_UNSIGNED_SHORT;
+
+ return true;
}
else if( pf == L"r12g12b12a12" )
{
- return std::make_pair( GL_RGBA12, GL_RGBA );
+ internal_format = GL_RGBA12;
+ format = GL_RGBA;
+ type = GL_UNSIGNED_SHORT;
+
+ return true;
}
else if( pf == L"r16g16b16" )
{
- return std::make_pair( GL_RGB16, GL_RGB );
+ internal_format = GL_RGB16;
+ format = GL_RGB;
+ type = GL_UNSIGNED_SHORT;
+
+ return true;
}
else if( pf == L"r16g16b16a16" )
{
- return std::make_pair( GL_RGBA16, GL_RGBA );
+ internal_format = GL_RGBA16;
+ format = GL_RGBA;
+ type = GL_UNSIGNED_SHORT;
+
+ return true;
}
else if( pf == L"yuv422" )
{
if( GLEW_APPLE_ycbcr_422 )
- return std::make_pair( 3, GL_YCBCR_422_APPLE );
+ {
+ internal_format = GL_RGB;
+ format = GL_YCBCR_422_APPLE;
+ type = GL_UNSIGNED_SHORT_8_8_APPLE;
+
+ return true;
+ }
}
else if( pf == L"r32g32b32f" )
{
if( GLEW_ARB_texture_float )
- return std::make_pair( GL_RGB32F_ARB, GL_RGB );
+ {
+ internal_format = GL_RGB32F_ARB;
+ format = GL_RGB;
+ type = GL_FLOAT;
+
+ return true;
+ }
}
else if( pf == L"r32g32b32a32f" )
{
if( GLEW_ARB_texture_float )
- return std::make_pair( GL_RGBA32F_ARB, GL_RGBA );
+ {
+ internal_format = GL_RGBA32F_ARB;
+ format = GL_RGBA;
+ type = GL_FLOAT;
+
+ return true;
+ }
}
- return std::make_pair( 0, 0 );
+ return false;
}
bool is_compressed_format( const wstring& pf )
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/GL_utility.hpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/GL_utility.hpp 2007-09-06 22:34:31 UTC (rev 297)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/GL_utility.hpp 2007-09-12 16:34:07 UTC (rev 298)
@@ -8,8 +8,6 @@
#ifndef GL_UTILITY_INC_
#define GL_UTILITY_INC_
-#include <utility>
-
#include <GL/glew.h>
#include <openpluginlib/pl/config.hpp>
@@ -17,10 +15,10 @@
namespace olib { namespace openpluginlib {
-OPENPLUGINLIB_DECLSPEC std::pair<int, GLenum> pf_to_gl_format( const wstring& pf );
-OPENPLUGINLIB_DECLSPEC bool is_compressed_format( const wstring& pf );
-OPENPLUGINLIB_DECLSPEC bool is_yuv_format( const wstring& pf );
-OPENPLUGINLIB_DECLSPEC bool texture_target( size_t width, size_t height, GLenum& target, float& tex_w, float& tex_h, bool force_2_0_targets = false );
+OPENPLUGINLIB_DECLSPEC bool pf_to_gl_format( const wstring& pf, GLint& internal_format, GLenum& external_format, GLenum& type );
+OPENPLUGINLIB_DECLSPEC bool is_compressed_format( const wstring& pf );
+OPENPLUGINLIB_DECLSPEC bool is_yuv_format( const wstring& pf );
+OPENPLUGINLIB_DECLSPEC bool texture_target( size_t width, size_t height, GLenum& target, float& tex_w, float& tex_h, bool force_2_0_targets = false );
} }
Modified: trunk/lib/openlibraries/src/umbrella_framework/openlibraries.hpp
===================================================================
--- trunk/lib/openlibraries/src/umbrella_framework/openlibraries.hpp 2007-09-06 22:34:31 UTC (rev 297)
+++ trunk/lib/openlibraries/src/umbrella_framework/openlibraries.hpp 2007-09-12 16:34:07 UTC (rev 298)
@@ -20,6 +20,7 @@
#include <openpluginlib/pl/openpluginlib.hpp>
#include <openpluginlib/pl/utf8_utils.hpp>
+#include <openpluginlib/pl/GL_utility.hpp>
#include <openimagelib/il/il.hpp>
#include <openimagelib/il/openimagelib_plugin.hpp>
#include <openmedialib/ml/ml.hpp>
Modified: trunk/lib/openlibraries/test/openimagelib/GL/_2D/_2D.cpp
===================================================================
--- trunk/lib/openlibraries/test/openimagelib/GL/_2D/_2D.cpp 2007-09-06 22:34:31 UTC (rev 297)
+++ trunk/lib/openlibraries/test/openimagelib/GL/_2D/_2D.cpp 2007-09-12 16:34:07 UTC (rev 298)
@@ -81,20 +81,21 @@
image = il::conform( image, il::cropped | il::flipped | il::flopped );
image = il::convert( image, L"r8g8b8" );
if( !image ) return 0;
+
+ GLint internal_format;
+ GLenum format, type;
+ pl::pf_to_gl_format( image->pf( ), internal_format, format, type );
- GLuint id;
+ glActiveTexture( GL_TEXTURE0 );
- std::pair<int, GLenum> pf = pl::pf_to_gl_format( image->pf( ) );
-
- glActiveTexture( GL_TEXTURE0 );
-
+ GLuint id;
glGenTextures( 1, &id );
glBindTexture( GL_TEXTURE_2D, id );
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST );
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST );
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE );
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE );
- glTexImage2D( GL_TEXTURE_2D, 0, pf.first, image->width( ), image->height( ), 0, pf.second, GL_UNSIGNED_BYTE, image->data( ) );
+ glTexImage2D( GL_TEXTURE_2D, 0, internal_format, image->width( ), image->height( ), 0, format, type, image->data( ) );
return id;
}
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-06 22:34:31 UTC (rev 297)
+++ trunk/lib/openlibraries/test/openimagelib/GL/_2D_crop/_2D_crop.cpp 2007-09-12 16:34:07 UTC (rev 298)
@@ -85,19 +85,20 @@
orig_w = image->width( );
orig_h = image->height( );
- GLuint id;
+ GLint internal_format;
+ GLenum format, type;
+ opl::pf_to_gl_format( image->pf( ), internal_format, format, type );
- std::pair<int, GLenum> pf = opl::pf_to_gl_format( image->pf( ).c_str( ) );
+ glActiveTexture( GL_TEXTURE0 );
- glActiveTexture( GL_TEXTURE0 );
-
+ GLuint id;
glGenTextures( 1, &id );
glBindTexture( GL_TEXTURE_2D, id );
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST );
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST );
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE );
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE );
- glTexImage2D( GL_TEXTURE_2D, 0, pf.first, image->width( ), image->height( ), 0, pf.second, GL_UNSIGNED_BYTE, image->data( ) );
+ glTexImage2D( GL_TEXTURE_2D, 0, internal_format, image->width( ), image->height( ), 0, format, type, image->data( ) );
glEnable( GL_TEXTURE_2D );
@@ -113,10 +114,12 @@
orig->crop( 0, 0, static_cast<int>( crop_w ), static_cast<int>( crop_h ), false );
il::image_type_ptr new_im = il::conform( orig, il::cropped | il::flipped | il::flopped );
- std::pair<int, GLenum> pf = opl::pf_to_gl_format( new_im->pf( ).c_str( ) );
+ GLint internal_format;
+ GLenum format, type;
+ opl::pf_to_gl_format( new_im->pf( ), internal_format, format, type );
glBindTexture( GL_TEXTURE_2D, texid_jpg );
- glTexImage2D( GL_TEXTURE_2D, 0, pf.first, new_im->width( ), new_im->height( ), 0, pf.second, GL_UNSIGNED_BYTE, new_im->data( ) );
+ glTexImage2D( GL_TEXTURE_2D, 0, internal_format, new_im->width( ), new_im->height( ), 0, format, type, new_im->data( ) );
glPushMatrix( );
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-06 22:34:31 UTC (rev 297)
+++ trunk/lib/openlibraries/test/openimagelib/GL/_2D_exr/_2D_exr.cpp 2007-09-12 16:34:07 UTC (rev 298)
@@ -79,21 +79,22 @@
image = il::tm_linear( image );
- GLuint id;
+ GLint internal_format;
+ GLenum format, type;
+ opl::pf_to_gl_format( image->pf( ), internal_format, format, type );
- std::pair<int, GLenum> pf = opl::pf_to_gl_format( image->pf( ) );
-
glActiveTexture( GL_TEXTURE0 );
glPixelStorei( GL_UNPACK_ALIGNMENT, 4 );
-
+
+ GLuint id;
glGenTextures( 1, &id );
glBindTexture( GL_TEXTURE_RECTANGLE_EXT, id );
glTexParameteri( GL_TEXTURE_RECTANGLE_EXT, GL_TEXTURE_MIN_FILTER, GL_NEAREST );
glTexParameteri( GL_TEXTURE_RECTANGLE_EXT, GL_TEXTURE_MAG_FILTER, GL_NEAREST );
glTexParameteri( GL_TEXTURE_RECTANGLE_EXT, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE );
glTexParameteri( GL_TEXTURE_RECTANGLE_EXT, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE );
- glTexImage2D( GL_TEXTURE_RECTANGLE_EXT, 0, pf.first, image->width( ), image->height( ), 0, pf.second, GL_UNSIGNED_BYTE, image->data( ) );
+ glTexImage2D( GL_TEXTURE_RECTANGLE_EXT, 0, internal_format, image->width( ), image->height( ), 0, format, type, image->data( ) );
tex_width = image->width( );
tex_height = image->height( );
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-06 22:34:31 UTC (rev 297)
+++ trunk/lib/openlibraries/test/openimagelib/GL/_2D_scale/_2D_scale.cpp 2007-09-12 16:34:07 UTC (rev 298)
@@ -81,21 +81,22 @@
il::image_type_ptr new_im = il::rescale( image, 134, 100, 1, il::BILINEAR_SAMPLING );
- GLuint id;
+ GLint internal_format;
+ GLenum format, type;
+ opl::pf_to_gl_format( new_im->pf( ), internal_format, format, type );
- std::pair<int, GLenum> gl_pf = opl::pf_to_gl_format( new_im->pf( ) );
-
opl::texture_target( new_im->width( ), new_im->height( ), target, tex_w, tex_h );
glActiveTexture( GL_TEXTURE0 );
-
+
+ GLuint id;
glGenTextures( 1, &id );
glBindTexture( target, id );
glTexParameteri( target, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
glTexParameteri( target, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
glTexParameteri( target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE );
glTexParameteri( target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE );
- glTexImage2D( target, 0, gl_pf.first, new_im->width( ), new_im->height( ), 0, gl_pf.second, GL_UNSIGNED_BYTE, new_im->data( ) );
+ glTexImage2D( target, 0, internal_format, new_im->width( ), new_im->height( ), 0, format, type, new_im->data( ) );
return id;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-09-22 11:28:06
|
Revision: 310
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=310&view=rev
Author: glslang
Date: 2007-09-22 04:27:54 -0700 (Sat, 22 Sep 2007)
Log Message:
-----------
+ build fixes
Modified Paths:
--------------
trunk/lib/openlibraries/installer/openlibraries_runtime.nsi
trunk/lib/openlibraries/installer/openlibraries_sdk.nsi
trunk/lib/openlibraries/src/openassetlib/py/py.cpp
trunk/lib/openlibraries/src/openassetlib/py/py_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/py/py_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/py/py_vc8.vcproj
trunk/lib/openlibraries/src/openpluginlib/py/py_vc8.vcproj
Modified: trunk/lib/openlibraries/installer/openlibraries_runtime.nsi
===================================================================
--- trunk/lib/openlibraries/installer/openlibraries_runtime.nsi 2007-09-22 08:30:17 UTC (rev 309)
+++ trunk/lib/openlibraries/installer/openlibraries_runtime.nsi 2007-09-22 11:27:54 UTC (rev 310)
@@ -101,10 +101,10 @@
; Python
SetOutPath $INSTDIR\python
- File "..\src\openpluginlib\py\Multi-threaded Release DLL\openpluginlib.pyd"
- File "..\src\openimagelib\py\Multi-threaded Release DLL\openimagelib.pyd"
- File "..\src\openmedialib\py\Multi-threaded Release DLL\openmedialib.pyd"
- File "..\src\openassetlib\py\Multi-threaded Release DLL\openassetlib.pyd"
+ File "..\src\openpluginlib\py\Multi-threaded Release DLL\HDRFlowPlugin.pyd"
+ File "..\src\openimagelib\py\Multi-threaded Release DLL\HDRFlowImage.pyd"
+ File "..\src\openmedialib\py\Multi-threaded Release DLL\HDRFlowMedia.pyd"
+ File "..\src\openassetlib\py\Multi-threaded Release DLL\HDRFlowAsset.pyd"
SetOutPath $INSTDIR\plugins\release
File "..\src\openimagelib\plugins\3D_lightmap\3D_lightmap_plugin.opl"
Modified: trunk/lib/openlibraries/installer/openlibraries_sdk.nsi
===================================================================
--- trunk/lib/openlibraries/installer/openlibraries_sdk.nsi 2007-09-22 08:30:17 UTC (rev 309)
+++ trunk/lib/openlibraries/installer/openlibraries_sdk.nsi 2007-09-22 11:27:54 UTC (rev 310)
@@ -202,10 +202,10 @@
; Python
SetOutPath $INSTDIR\python
- File "..\src\openpluginlib\py\Multi-threaded Debug DLL\openpluginlib.pyd"
- File "..\src\openimagelib\py\Multi-threaded Debug DLL\openimagelib.pyd"
- File "..\src\openmedialib\py\Multi-threaded Debug DLL\openmedialib.pyd"
- File "..\src\openassetlib\py\Multi-threaded Debug DLL\openassetlib.pyd"
+ File "..\src\openpluginlib\py\Multi-threaded Debug DLL\HDRFlowPlugin.pyd"
+ File "..\src\openimagelib\py\Multi-threaded Debug DLL\HDRFlowImage.pyd"
+ File "..\src\openmedialib\py\Multi-threaded Debug DLL\HDRFlowMedia.pyd"
+ 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"
Modified: trunk/lib/openlibraries/src/openassetlib/py/py.cpp
===================================================================
--- trunk/lib/openlibraries/src/openassetlib/py/py.cpp 2007-09-22 08:30:17 UTC (rev 309)
+++ trunk/lib/openlibraries/src/openassetlib/py/py.cpp 2007-09-22 11:27:54 UTC (rev 310)
@@ -9,7 +9,7 @@
namespace oal = olib::openassetlib;
-BOOST_PYTHON_MODULE( openassetlib )
+BOOST_PYTHON_MODULE( HDRFlowAsset )
{
oal::detail::py_plugin();
oal::detail::py_guid();
Modified: trunk/lib/openlibraries/src/openassetlib/py/py_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openassetlib/py/py_vc8.vcproj 2007-09-22 08:30:17 UTC (rev 309)
+++ trunk/lib/openlibraries/src/openassetlib/py/py_vc8.vcproj 2007-09-22 11:27:54 UTC (rev 310)
@@ -64,9 +64,10 @@
/>
<Tool
Name="VCLinkerTool"
+ IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="boost_python-vc80-mt-gd-1_34.lib"
- OutputFile="$(OutDir)\openassetlib.pyd"
+ 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)"
GenerateDebugInformation="true"
@@ -149,7 +150,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="boost_python-vc80-mt-1_34.lib"
- OutputFile="$(OutDir)\openassetlib.pyd"
+ 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)"
GenerateDebugInformation="true"
Modified: trunk/lib/openlibraries/src/openimagelib/py/py_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/py/py_vc8.vcproj 2007-09-22 08:30:17 UTC (rev 309)
+++ trunk/lib/openlibraries/src/openimagelib/py/py_vc8.vcproj 2007-09-22 11:27:54 UTC (rev 310)
@@ -66,7 +66,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="boost_python-vc80-mt-gd-1_34.lib"
- OutputFile="$(OutDir)\openimagelib.pyd"
+ OutputFile="$(OutDir)\HDRFlowImage.pyd"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)";C:\Python25\Libs"
GenerateDebugInformation="true"
@@ -149,7 +149,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="boost_python-vc80-mt-1_34.lib"
- OutputFile="$(OutDir)\openimagelib.pyd"
+ OutputFile="$(OutDir)\HDRFlowImage.pyd"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)";C:\Python25\Libs"
GenerateDebugInformation="true"
Modified: trunk/lib/openlibraries/src/openmedialib/py/py_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/py/py_vc8.vcproj 2007-09-22 08:30:17 UTC (rev 309)
+++ trunk/lib/openlibraries/src/openmedialib/py/py_vc8.vcproj 2007-09-22 11:27:54 UTC (rev 310)
@@ -68,7 +68,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="boost_python-vc80-mt-gd-1_34.lib"
- OutputFile="$(OutDir)\openmedialib.pyd"
+ OutputFile="$(OutDir)\HDRFlowMedia.pyd"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;C:\Python25\Libs;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
GenerateDebugInformation="true"
@@ -152,7 +152,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="boost_python-vc80-mt-1_34.lib"
- OutputFile="$(OutDir)\openmedialib.pyd"
+ OutputFile="$(OutDir)\HDRFlowMedia.pyd"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;C:\Python25\Libs;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
GenerateDebugInformation="true"
Modified: trunk/lib/openlibraries/src/openpluginlib/py/py_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/py/py_vc8.vcproj 2007-09-22 08:30:17 UTC (rev 309)
+++ trunk/lib/openlibraries/src/openpluginlib/py/py_vc8.vcproj 2007-09-22 11:27:54 UTC (rev 310)
@@ -69,7 +69,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="boost_python-vc80-mt-gd-1_34.lib"
- OutputFile="$(OutDir)\openpluginlib.pyd"
+ OutputFile="$(OutDir)\HDRFlowPlugin.pyd"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;"C:\Program Files\NVIDIA Corporation\Cg\lib";C:\Python25\Libs"
GenerateDebugInformation="true"
@@ -155,7 +155,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="boost_python-vc80-mt-1_34.lib"
- OutputFile="$(OutDir)\openpluginlib.pyd"
+ OutputFile="$(OutDir)\HDRFlowPlugin.pyd"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;"C:\Program Files\NVIDIA Corporation\Cg\lib";C:\Python25\Libs"
GenerateDebugInformation="true"
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-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-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 19:58:19
|
Revision: 338
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=338&view=rev
Author: glslang
Date: 2007-09-30 12:57:29 -0700 (Sun, 30 Sep 2007)
Log Message:
-----------
+ build fixes
Modified Paths:
--------------
trunk/lib/openlibraries/installer/openlibraries_runtime.nsi
trunk/lib/openlibraries/installer/openlibraries_sdk.nsi
trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj
Modified: trunk/lib/openlibraries/installer/openlibraries_runtime.nsi
===================================================================
--- trunk/lib/openlibraries/installer/openlibraries_runtime.nsi 2007-09-30 19:20:13 UTC (rev 337)
+++ trunk/lib/openlibraries/installer/openlibraries_runtime.nsi 2007-09-30 19:57:29 UTC (rev 338)
@@ -3,8 +3,8 @@
;--------------------------------
!ifndef VERSION
- !define VERSION 0.4.0
- !define VERSION_DOT 0.4.0
+ !define VERSION 0_5_0
+ !define VERSION_DOT 0.5.0
!endif
;--------------------------------
Modified: trunk/lib/openlibraries/installer/openlibraries_sdk.nsi
===================================================================
--- trunk/lib/openlibraries/installer/openlibraries_sdk.nsi 2007-09-30 19:20:13 UTC (rev 337)
+++ trunk/lib/openlibraries/installer/openlibraries_sdk.nsi 2007-09-30 19:57:29 UTC (rev 338)
@@ -3,8 +3,8 @@
;--------------------------------
!ifndef VERSION
- !define VERSION 0_4_0
- !define VERSION_DOT 0.4.0
+ !define VERSION 0_5_0
+ !define VERSION_DOT 0.5.0
!endif
;--------------------------------
Modified: trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj 2007-09-30 19:20:13 UTC (rev 337)
+++ trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj 2007-09-30 19:57:29 UTC (rev 338)
@@ -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;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_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;TONEMAP_EXPORTS;;ML_PLUGIN_EXPORTS;OPENMEDIALIB_BUILD;HAVE_FLEX_STRING;OPENEXR_DLL;HAVE_OPENEXR"
ExceptionHandling="2"
RuntimeLibrary="2"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-09-30 20:21:22
|
Revision: 339
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=339&view=rev
Author: glslang
Date: 2007-09-30 13:21:21 -0700 (Sun, 30 Sep 2007)
Log Message:
-----------
+ build fixes
Modified Paths:
--------------
trunk/lib/openlibraries/Makefile.am
trunk/lib/openlibraries/configure.ac
trunk/lib/openlibraries/test/openobjectlib/Makefile.am
Added Paths:
-----------
trunk/lib/openlibraries/m4/Makefile.am
Modified: trunk/lib/openlibraries/Makefile.am
===================================================================
--- trunk/lib/openlibraries/Makefile.am 2007-09-30 19:57:29 UTC (rev 338)
+++ trunk/lib/openlibraries/Makefile.am 2007-09-30 20:21:21 UTC (rev 339)
@@ -10,7 +10,8 @@
am__untar=$(AMTAR) -x --posix -f -
SUBDIRS = \
- src \
+ src \
+ m4 \
media \
effects \
test
Modified: trunk/lib/openlibraries/configure.ac
===================================================================
--- trunk/lib/openlibraries/configure.ac 2007-09-30 19:57:29 UTC (rev 338)
+++ trunk/lib/openlibraries/configure.ac 2007-09-30 20:21:21 UTC (rev 339)
@@ -357,12 +357,7 @@
src/openmedialib/Makefile
src/openmedialib/ml/Makefile
src/openmedialib/plugins/Makefile
-src/openmedialib/plugins/template/Makefile
-src/openmedialib/plugins/avformat/Makefile
src/openmedialib/plugins/oil/Makefile
-src/openmedialib/plugins/glew/Makefile
-src/openmedialib/plugins/openal/Makefile
-src/openmedialib/plugins/gensys/Makefile
src/openmedialib/plugins/ofx/Makefile
src/openmedialib/py/Makefile
src/openeffectslib/Makefile
@@ -380,6 +375,7 @@
src/openassetlib/plugins/Makefile
src/openassetlib/plugins/sqlite/Makefile
src/umbrella_framework/Makefile
+m4/Makefile
media/Makefile
effects/Makefile
test/Makefile
Added: trunk/lib/openlibraries/m4/Makefile.am
===================================================================
--- trunk/lib/openlibraries/m4/Makefile.am (rev 0)
+++ trunk/lib/openlibraries/m4/Makefile.am 2007-09-30 20:21:21 UTC (rev 339)
@@ -0,0 +1,27 @@
+
+#
+#
+#
+
+EXTRA_DIST = \
+ boost.m4 \
+ bzip2.m4 \
+ cg.m4 \
+ fast_math.m4 \
+ gelato.m4 \
+ glew.m4 \
+ gpl.m4 \
+ ofx.m4 \
+ openal.m4 \
+ opengl.m4 \
+ openimagelib.m4 \
+ pkg.m4 \
+ python.m4 \
+ qt.m4 \
+ quicktime.m4 \
+ sqlite.m4 \
+ tiff.m4 \
+ umbrella_framework.m4 \
+ universal_binary.m4 \
+ zlib.m4
+
Modified: trunk/lib/openlibraries/test/openobjectlib/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openobjectlib/Makefile.am 2007-09-30 19:57:29 UTC (rev 338)
+++ trunk/lib/openlibraries/test/openobjectlib/Makefile.am 2007-09-30 20:21:21 UTC (rev 339)
@@ -4,4 +4,4 @@
#
SUBDIRS = \
- GL \
+ GL
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-10-09 21:45:26
|
Revision: 352
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=352&view=rev
Author: glslang
Date: 2007-10-09 14:21:59 -0700 (Tue, 09 Oct 2007)
Log Message:
-----------
+ generalises flips and flops
Modified Paths:
--------------
trunk/lib/openlibraries/src/openimagelib/il/basic_image.hpp
trunk/lib/openlibraries/src/openimagelib/il/float_traits.hpp
trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_plugin.cpp
trunk/lib/openlibraries/test/openimagelib/GL/_2D_exr/_2D_exr.cpp
Modified: trunk/lib/openlibraries/src/openimagelib/il/basic_image.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/basic_image.hpp 2007-10-08 21:33:45 UTC (rev 351)
+++ trunk/lib/openlibraries/src/openimagelib/il/basic_image.hpp 2007-10-09 21:21:59 UTC (rev 352)
@@ -233,7 +233,8 @@
// Flop scan which assumes block_size_ is known and <= 4 - associated plane is
// the first argument, thus allowing a different block/sample size per plane
- virtual void flop_scan_line( size_t, pointer dst, const_pointer src, size_type w ) const
+ template<typename pointer_, typename const_pointer_>
+ void flop_scan_line_( size_t, pointer_ dst, const_pointer_ src, size_type w ) const
{
src += block_size_ * ( w - 1 );
while( w -- )
@@ -249,6 +250,11 @@
}
}
+ virtual void flop_scan_line( size_t p, pointer dst, const_pointer src, size_type w ) const
+ {
+ flop_scan_line_( p, dst, src, w );
+ }
+
// Convenience method to assist image class
virtual const planes &get_planes( )
{
@@ -343,13 +349,16 @@
bool need_flop = is_flopped( ) != other.is_flopped( );
// Obtain the number of planes and iterate through each
- size_t count = structure_->plane_count( );
+ size_type count = structure_->plane_count( );
+ size_type sfactor = structure_->bitdepth( ) / 8;
- for ( size_t i = 0; i < count; i ++ )
+ for ( size_type i = 0; i < count; i ++ )
{
// We need the src and pitch of the cropped source plane
const_pointer src = other.data( i );
size_type src_pitch = other.pitch( i );
+
+ src_pitch *= sfactor;
// The destination plane, pitch and height
pointer dst = data( i );
@@ -357,6 +366,9 @@
size_type dst_pitch = pitch( i );
size_type dst_scan = linesize( i );
size_type dst_height = height( i );
+
+ dst_scan *= sfactor;
+ dst_pitch *= sfactor;
// We need to orient the dest correctly
if ( need_flip )
Modified: trunk/lib/openlibraries/src/openimagelib/il/float_traits.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/float_traits.hpp 2007-10-08 21:33:45 UTC (rev 351)
+++ trunk/lib/openlibraries/src/openimagelib/il/float_traits.hpp 2007-10-09 21:21:59 UTC (rev 352)
@@ -211,6 +211,11 @@
virtual r32g32b32f* clone( size_type w, size_type h )
{ return new r32g32b32f( *this, w, h ); }
+
+ virtual void flop_scan_line( size_t p, pointer dst, const_pointer src, size_type w ) const
+ {
+ flop_scan_line_( p, ( float* ) dst, ( const float* ) src, w );
+ }
};
template<typename T = float, class storage = default_storage<T> >
@@ -251,6 +256,11 @@
virtual r32g32b32a32f* clone( size_type w, size_type h )
{ return new r32g32b32a32f( *this, w, h ); }
+
+ virtual void flop_scan_line( size_t p, pointer dst, const_pointer src, size_type w ) const
+ {
+ flop_scan_line_( p, ( float* ) dst, ( const float* ) src, w );
+ }
};
} } }
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_plugin.cpp 2007-10-08 21:33:45 UTC (rev 351)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_plugin.cpp 2007-10-09 21:21:59 UTC (rev 352)
@@ -15,6 +15,7 @@
#include <cstring>
#include <new>
#include <vector>
+#include <limits>
#include <ofxCore.h>
#include <ofxImageEffect.h>
Modified: trunk/lib/openlibraries/test/openimagelib/GL/_2D_exr/_2D_exr.cpp
===================================================================
--- trunk/lib/openlibraries/test/openimagelib/GL/_2D_exr/_2D_exr.cpp 2007-10-08 21:33:45 UTC (rev 351)
+++ trunk/lib/openlibraries/test/openimagelib/GL/_2D_exr/_2D_exr.cpp 2007-10-09 21:21:59 UTC (rev 352)
@@ -77,6 +77,7 @@
il::image_type_ptr image = plug->load( path );
if( !image ) return 0;
+ image = il::conform( image, il::flipped | il::flopped );
image = il::tm_linear( image );
GLint internal_format;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-10-30 23:21:50
|
Revision: 370
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=370&view=rev
Author: glslang
Date: 2007-10-30 16:21:00 -0700 (Tue, 30 Oct 2007)
Log Message:
-----------
+ initial intel compiler port
Modified Paths:
--------------
trunk/lib/openlibraries/src/openpluginlib/pl/geometry.hpp
trunk/lib/openlibraries/src/openpluginlib/pl/smallstringopt.h
Added Paths:
-----------
trunk/lib/openlibraries/src/openassetlib/al/al_vc8.icproj
trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite_vc8.icproj
trunk/lib/openlibraries/src/openassetlib/py/py_vc8.icproj
trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.icproj
trunk/lib/openlibraries/src/openimagelib/il/il_vc8.icproj
trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_vc8.icproj
trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_vc8.icproj
trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.icproj
trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_vc8.icproj
trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.icproj
trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_vc8.icproj
trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_vc8.icproj
trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_vc8.icproj
trunk/lib/openlibraries/src/openimagelib/plugins/png/png_vc8.icproj
trunk/lib/openlibraries/src/openimagelib/plugins/psd/psd_vc8.icproj
trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_vc8.icproj
trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_vc8.icproj
trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_vc8.icproj
trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_vc8.icproj
trunk/lib/openlibraries/src/openimagelib/py/py_vc8.icproj
trunk/lib/openlibraries/src/openmedialib/ml/ml_vc8.icproj
trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_vc8.icproj
trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_vc8.icproj
trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_vc8.icproj
trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_vc8.icproj
trunk/lib/openlibraries/src/openmedialib/py/py_vc8.icproj
trunk/lib/openlibraries/src/openobjectlib/plugins/X3D/X3D_vc8.icproj
trunk/lib/openlibraries/src/openobjectlib/plugins/obj/obj_vc8.icproj
trunk/lib/openlibraries/src/openobjectlib/sg/sg_vc8.icproj
trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.icproj
trunk/lib/openlibraries/src/openpluginlib/py/py_vc8.icproj
trunk/lib/openlibraries/test/openeffectslib/rescaler_bench/rescaler_bench_vc8.icproj
trunk/lib/openlibraries/test/openeffectslib/tm_bench/tm_bench_vc8.icproj
trunk/lib/openlibraries/test/openimagelib/GL/_2D/_2D_vc8.icproj
trunk/lib/openlibraries/test/openimagelib/GL/_2D_compressed/_2D_compressed_vc8.icproj
trunk/lib/openlibraries/test/openimagelib/GL/_2D_compressed_cubemap/_2D_compressed_cubemap_vc8.icproj
trunk/lib/openlibraries/test/openimagelib/GL/_2D_crop/_2D_crop_vc8.icproj
trunk/lib/openlibraries/test/openimagelib/GL/_2D_crop2/_2D_crop2_vc8.icproj
trunk/lib/openlibraries/test/openimagelib/GL/_2D_exr/_2D_exr_vc8.icproj
trunk/lib/openlibraries/test/openimagelib/GL/_2D_sgi/_2D_sgi_vc8.icproj
trunk/lib/openlibraries/test/openimagelib/GL/_3D_lightmap/_3D_lightmap_vc8.icproj
trunk/lib/openlibraries/test/openmedialib/player/player_vc8.icproj
trunk/lib/openlibraries/test/openmedialib/store/store_vc8.icproj
trunk/lib/openlibraries/test/openobjectlib/GL/multipass_draw/multipass_draw_vc8.icproj
trunk/lib/openlibraries/test/openobjectlib/GL/noise_volume/noise_volume_vc8.icproj
trunk/lib/openlibraries/test/openobjectlib/GL/obj_draw/obj_draw_vc8.icproj
trunk/lib/openlibraries/test/openobjectlib/GL/texture_draw/texture_draw_vc8.icproj
trunk/lib/openlibraries/test/openpluginlib/discovery/discovery_vc8.icproj
trunk/lib/openlibraries/test/openpluginlib/enumerate/enumerate_vc8.icproj
trunk/lib/openlibraries/test/openpluginlib/gpu_timer_query/gpu_timer_query_vc8.icproj
trunk/lib/openlibraries/test/openpluginlib/initialization/initialization_vc8.icproj
trunk/lib/openlibraries/test/openpluginlib/pcos/key/key_vc8.icproj
trunk/lib/openlibraries/test/openpluginlib/pcos/property/property_vc8.icproj
trunk/lib/openlibraries/test/openpluginlib/pcos/property_container/property_container_vc8.icproj
trunk/lib/openlibraries/test/openpluginlib/pcos/subject-observer/subject-observer_vc8.icproj
trunk/lib/openlibraries/test/openpluginlib/rdtsc/rdtsc_vc8.icproj
trunk/lib/openlibraries/test/openpluginlib/sleep/sleep_vc8.icproj
Added: trunk/lib/openlibraries/src/openassetlib/al/al_vc8.icproj
===================================================================
--- trunk/lib/openlibraries/src/openassetlib/al/al_vc8.icproj (rev 0)
+++ trunk/lib/openlibraries/src/openassetlib/al/al_vc8.icproj 2007-10-30 23:21:00 UTC (rev 370)
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Intel C++ Project"
+ Version="10.0"
+ Name="al"
+ OwnerKey="{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}"
+ ProjectGUID="{80261E5B-CC18-4844-B0C2-7D8B04671BAE}"
+ RootNamespace="al"
+ Keyword="Win32Proj"
+ VCNestedProjectGUID="{BD346E41-BEBD-43E7-9801-8EC1158355C4}"
+ VCNestedProjectCRC32="2160126908"
+ VCNestedProjectFileName="al_vc8.vcproj">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Multi-threaded Debug DLL|Win32">
+ <Tool
+ Name="GeneralTool"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="2"
+ CharacterSet="1"/>
+ <Tool
+ Name="PreBuildEventTool"/>
+ <Tool
+ Name="CustomTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="MidlCmplrTool"/>
+ <Tool
+ Name="CppCmplrTool"
+ Optimization="0"
+ 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"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ EnableEnhancedInstructionSet="0"
+ FloatingPointModel="0"
+ OpenMP="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="4"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"/>
+ <Tool
+ Name="VCManagedResourceCompilerTool"/>
+ <Tool
+ Name="ResCmplrTool"/>
+ <Tool
+ Name="PreLinkEventTool"/>
+ <Tool
+ Name="LinkerTool"
+ AdditionalOptions="/LARGEADDRESSAWARE"
+ 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"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCALinkTool"/>
+ <Tool
+ Name="VCManifestTool"/>
+ <Tool
+ Name="VCXDCMakeTool"/>
+ <Tool
+ Name="BscMakeTool"/>
+ <Tool
+ Name="VCFxCopTool"/>
+ <Tool
+ Name="VCAppVerifierTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="PostBuildEventTool"/>
+ </Configuration>
+ <Configuration
+ Name="Multi-threaded Release DLL|Win32">
+ <Tool
+ Name="GeneralTool"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="2"
+ CharacterSet="1"
+ WholeProgramOptimization="1"/>
+ <Tool
+ Name="PreBuildEventTool"/>
+ <Tool
+ Name="CustomTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="MidlCmplrTool"/>
+ <Tool
+ Name="CppCmplrTool"
+ 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"
+ BufferSecurityCheck="false"
+ EnableEnhancedInstructionSet="0"
+ FloatingPointModel="2"
+ OpenMP="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="4"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"/>
+ <Tool
+ Name="VCManagedResourceCompilerTool"/>
+ <Tool
+ Name="ResCmplrTool"/>
+ <Tool
+ Name="PreLinkEventTool"/>
+ <Tool
+ Name="LinkerTool"
+ AdditionalOptions="/LARGEADDRESSAWARE"
+ 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"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCALinkTool"/>
+ <Tool
+ Name="VCManifestTool"/>
+ <Tool
+ Name="VCXDCMakeTool"/>
+ <Tool
+ Name="BscMakeTool"/>
+ <Tool
+ Name="VCFxCopTool"/>
+ <Tool
+ Name="VCAppVerifierTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="PostBuildEventTool"/>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+ <File
+ RelativePath=".\al.cpp">
+ </File>
+ <File
+ RelativePath=".\al_plugin.cpp">
+ </File>
+ <File
+ RelativePath=".\asset.cpp">
+ </File>
+ <File
+ RelativePath=".\base64_codec.cpp">
+ </File>
+ <File
+ RelativePath=".\guid.cpp">
+ </File>
+ <File
+ RelativePath=".\set.cpp">
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+ <File
+ RelativePath=".\al.hpp">
+ </File>
+ <File
+ RelativePath=".\al_plugin.hpp">
+ </File>
+ <File
+ RelativePath=".\asset.hpp">
+ </File>
+ <File
+ RelativePath=".\base64_codec.hpp">
+ </File>
+ <File
+ RelativePath=".\config.hpp">
+ </File>
+ <File
+ RelativePath=".\guid.hpp">
+ </File>
+ <File
+ RelativePath=".\set.hpp">
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
+
Property changes on: trunk/lib/openlibraries/src/openassetlib/al/al_vc8.icproj
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite_vc8.icproj
===================================================================
--- trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite_vc8.icproj (rev 0)
+++ trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite_vc8.icproj 2007-10-30 23:21:00 UTC (rev 370)
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Intel C++ Project"
+ Version="10.0"
+ Name="sqlite"
+ OwnerKey="{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}"
+ ProjectGUID="{E18DF63F-8CDB-4377-8C5C-79FCC969E113}"
+ RootNamespace="sqlite"
+ Keyword="Win32Proj"
+ VCNestedProjectGUID="{4B89FC29-D7E8-4E1A-99D7-17561B89DBEA}"
+ VCNestedProjectCRC32="500498510"
+ VCNestedProjectFileName="sqlite_vc8.vcproj">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Multi-threaded Debug DLL|Win32">
+ <Tool
+ Name="GeneralTool"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="2"
+ CharacterSet="1"/>
+ <Tool
+ Name="PreBuildEventTool"/>
+ <Tool
+ Name="CustomTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="MidlCmplrTool"/>
+ <Tool
+ Name="CppCmplrTool"
+ Optimization="0"
+ 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"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ OpenMP="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="4"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"/>
+ <Tool
+ Name="VCManagedResourceCompilerTool"/>
+ <Tool
+ Name="ResCmplrTool"/>
+ <Tool
+ Name="PreLinkEventTool"/>
+ <Tool
+ Name="LinkerTool"
+ IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
+ AdditionalDependencies="sqlite-vc71-d-3_2_7.lib"
+ OutputFile="$(OutDir)\openassetlib_sqlite-vc80-d-0_5_0.dll"
+ LinkIncremental="2"
+ AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)src\openpluginlib\pl\$(ConfigurationName)""
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCALinkTool"/>
+ <Tool
+ Name="VCManifestTool"/>
+ <Tool
+ Name="VCXDCMakeTool"/>
+ <Tool
+ Name="BscMakeTool"/>
+ <Tool
+ Name="VCFxCopTool"/>
+ <Tool
+ Name="VCAppVerifierTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="PostBuildEventTool"/>
+ </Configuration>
+ <Configuration
+ Name="Multi-threaded Release DLL|Win32">
+ <Tool
+ Name="GeneralTool"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="2"
+ CharacterSet="1"
+ WholeProgramOptimization="1"/>
+ <Tool
+ Name="PreBuildEventTool"/>
+ <Tool
+ Name="CustomTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="MidlCmplrTool"/>
+ <Tool
+ Name="CppCmplrTool"
+ 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"
+ BufferSecurityCheck="false"
+ FloatingPointModel="2"
+ OpenMP="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="4"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"/>
+ <Tool
+ Name="VCManagedResourceCompilerTool"/>
+ <Tool
+ Name="ResCmplrTool"/>
+ <Tool
+ Name="PreLinkEventTool"/>
+ <Tool
+ Name="LinkerTool"
+ IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
+ AdditionalDependencies="sqlite-vc71-r-3_2_7.lib"
+ OutputFile="$(OutDir)\openassetlib_sqlite-vc80-r-0_5_0.dll"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)src\openpluginlib\pl\$(ConfigurationName)""
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCALinkTool"/>
+ <Tool
+ Name="VCManifestTool"/>
+ <Tool
+ Name="VCXDCMakeTool"/>
+ <Tool
+ Name="BscMakeTool"/>
+ <Tool
+ Name="VCFxCopTool"/>
+ <Tool
+ Name="VCAppVerifierTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="PostBuildEventTool"/>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+ <File
+ RelativePath=".\database.cpp">
+ </File>
+ <File
+ RelativePath=".\sqlite3_metadata.cpp">
+ </File>
+ <File
+ RelativePath=".\sqlite3_metadata_plugin.cpp">
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+ <File
+ RelativePath=".\config.hpp">
+ </File>
+ <File
+ RelativePath=".\database.hpp">
+ </File>
+ <File
+ RelativePath=".\sqlite3.h">
+ </File>
+ <File
+ RelativePath=".\sqlite3_metadata_plugin.hpp">
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
+
Property changes on: trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/sqlite_vc8.icproj
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/lib/openlibraries/src/openassetlib/py/py_vc8.icproj
===================================================================
--- trunk/lib/openlibraries/src/openassetlib/py/py_vc8.icproj (rev 0)
+++ trunk/lib/openlibraries/src/openassetlib/py/py_vc8.icproj 2007-10-30 23:21:00 UTC (rev 370)
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Intel C++ Project"
+ Version="10.0"
+ Name="py"
+ OwnerKey="{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}"
+ ProjectGUID="{DCDE03E7-5170-4CB4-ACF5-E788CF12E283}"
+ RootNamespace="py"
+ Keyword="Win32Proj"
+ VCNestedProjectGUID="{ECEDB34E-A863-420F-BFC6-F294AC078892}"
+ VCNestedProjectCRC32="4229794795"
+ VCNestedProjectFileName="py_vc8.vcproj">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Multi-threaded Debug DLL|Win32">
+ <Tool
+ Name="GeneralTool"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="2"
+ CharacterSet="1"/>
+ <Tool
+ Name="PreBuildEventTool"/>
+ <Tool
+ Name="CustomTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="MidlCmplrTool"/>
+ <Tool
+ Name="CppCmplrTool"
+ Optimization="0"
+ 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"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ OpenMP="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="4"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"/>
+ <Tool
+ Name="VCManagedResourceCompilerTool"/>
+ <Tool
+ Name="ResCmplrTool"/>
+ <Tool
+ Name="PreLinkEventTool"/>
+ <Tool
+ Name="LinkerTool"
+ IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
+ 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)"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCALinkTool"/>
+ <Tool
+ Name="VCManifestTool"/>
+ <Tool
+ Name="VCXDCMakeTool"/>
+ <Tool
+ Name="BscMakeTool"/>
+ <Tool
+ Name="VCFxCopTool"/>
+ <Tool
+ Name="VCAppVerifierTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="PostBuildEventTool"/>
+ </Configuration>
+ <Configuration
+ Name="Multi-threaded Release DLL|Win32">
+ <Tool
+ Name="GeneralTool"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="2"
+ CharacterSet="1"
+ WholeProgramOptimization="1"/>
+ <Tool
+ Name="PreBuildEventTool"/>
+ <Tool
+ Name="CustomTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="MidlCmplrTool"/>
+ <Tool
+ Name="CppCmplrTool"
+ 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"
+ BufferSecurityCheck="false"
+ FloatingPointModel="2"
+ OpenMP="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="4"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"/>
+ <Tool
+ Name="VCManagedResourceCompilerTool"/>
+ <Tool
+ Name="ResCmplrTool"/>
+ <Tool
+ Name="PreLinkEventTool"/>
+ <Tool
+ Name="LinkerTool"
+ IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
+ 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)"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCALinkTool"/>
+ <Tool
+ Name="VCManifestTool"/>
+ <Tool
+ Name="VCXDCMakeTool"/>
+ <Tool
+ Name="BscMakeTool"/>
+ <Tool
+ Name="VCFxCopTool"/>
+ <Tool
+ Name="VCAppVerifierTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="PostBuildEventTool"/>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+ <File
+ RelativePath=".\asset.cpp">
+ </File>
+ <File
+ RelativePath=".\guid.cpp">
+ </File>
+ <File
+ RelativePath=".\openassetlib.cpp">
+ </File>
+ <File
+ RelativePath=".\plugin.cpp">
+ </File>
+ <File
+ RelativePath=".\py.cpp">
+ </File>
+ <File
+ RelativePath=".\set.cpp">
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+ <File
+ RelativePath=".\py.hpp">
+ </File>
+ <File
+ RelativePath=".\python.hpp">
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
+
Property changes on: trunk/lib/openlibraries/src/openassetlib/py/py_vc8.icproj
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.icproj
===================================================================
--- trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.icproj (rev 0)
+++ trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.icproj 2007-10-30 23:21:00 UTC (rev 370)
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Intel C++ Project"
+ Version="10.0"
+ Name="tonemap"
+ ProjectGUID="{68A41D6B-F6DB-4A26-9202-22950CC80697}"
+ RootNamespace="tonemap"
+ Keyword="Win32Proj"
+ VCNestedProjectGUID="{6D618CAE-230F-4ADD-936B-6C1D3D723236}"
+ VCNestedProjectCRC32="4110884607"
+ VCNestedProjectFileName="tonemap_vc8.vcproj">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Multi-threaded Debug DLL|Win32">
+ <Tool
+ Name="GeneralTool"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="2"
+ CharacterSet="1"/>
+ <Tool
+ Name="PreBuildEventTool"/>
+ <Tool
+ Name="CustomTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="MidlCmplrTool"/>
+ <Tool
+ Name="CppCmplrTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";"C:\OpenEXR\include""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TONEMAP_EXPORTS;ML_PLUGIN_EXPORTS;OPENMEDIALIB_BUILD;HAVE_FLEX_STRING;OPENEXR_DLL;HAVE_OPENEXR"
+ MinimalRebuild="true"
+ ExceptionHandling="2"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ OpenMP="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="4"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4503"/>
+ <Tool
+ Name="VCManagedResourceCompilerTool"/>
+ <Tool
+ Name="ResCmplrTool"/>
+ <Tool
+ Name="PreLinkEventTool"/>
+ <Tool
+ Name="LinkerTool"
+ IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
+ AdditionalDependencies="Half.lib IlmImf.lib Iex.lib"
+ 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"
+ SubSystem="2"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCALinkTool"/>
+ <Tool
+ Name="VCManifestTool"/>
+ <Tool
+ Name="VCXDCMakeTool"/>
+ <Tool
+ Name="BscMakeTool"/>
+ <Tool
+ Name="VCFxCopTool"/>
+ <Tool
+ Name="VCAppVerifierTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="PostBuildEventTool"/>
+ </Configuration>
+ <Configuration
+ Name="Multi-threaded Release DLL|Win32">
+ <Tool
+ Name="GeneralTool"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="2"
+ CharacterSet="1"
+ WholeProgramOptimization="1"/>
+ <Tool
+ Name="PreBuildEventTool"/>
+ <Tool
+ Name="CustomTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="MidlCmplrTool"/>
+ <Tool
+ Name="CppCmplrTool"
+ AdditionalIncludeDirectories=""$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";"C:\OpenEXR\include""
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TONEMAP_EXPORTS;;ML_PLUGIN_EXPORTS;OPENMEDIALIB_BUILD;HAVE_FLEX_STRING;OPENEXR_DLL;HAVE_OPENEXR"
+ ExceptionHandling="2"
+ RuntimeLibrary="2"
+ BufferSecurityCheck="false"
+ FloatingPointModel="2"
+ OpenMP="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="4"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4503"/>
+ <Tool
+ Name="VCManagedResourceCompilerTool"/>
+ <Tool
+ Name="ResCmplrTool"/>
+ <Tool
+ Name="PreLinkEventTool"/>
+ <Tool
+ Name="LinkerTool"
+ IgnoreImportLibrary="true"
+ AdditionalOptions="/LARGEADDRESSAWARE"
+ AdditionalDependencies="Half.lib IlmImf.lib Iex.lib"
+ 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"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCALinkTool"/>
+ <Tool
+ Name="VCManifestTool"/>
+ <Tool
+ Name="VCXDCMakeTool"/>
+ <Tool
+ Name="BscMakeTool"/>
+ <Tool
+ Name="VCFxCopTool"/>
+ <Tool
+ Name="VCAppVerifierTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="PostBuildEventTool"/>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+ <File
+ RelativePath=".\tonemap_plugin.cpp">
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
+
Property changes on: trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.icproj
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/lib/openlibraries/src/openi...
[truncated message content] |
|
From: <gl...@us...> - 2007-11-06 22:00:48
|
Revision: 376
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=376&view=rev
Author: glslang
Date: 2007-11-06 13:59:54 -0800 (Tue, 06 Nov 2007)
Log Message:
-----------
+ portability fixes
Modified Paths:
--------------
trunk/lib/openlibraries/configure.ac
trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_vc8.vcproj
trunk/lib/openlibraries/src/openobjectlib/plugins/Makefile.am
Added Paths:
-----------
trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/
trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/Makefile.am
trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/config.hpp
trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/obj.cpp
trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/obj_plugin.cpp
trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/obj_plugin.hpp
trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/obj_plugin.opl
trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/obj_vc8.icproj
trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/obj_vc8.vcproj
trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/spirit.hpp
Removed Paths:
-------------
trunk/lib/openlibraries/src/openobjectlib/plugins/obj/
trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/Makefile.am
trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/config.hpp
trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/obj.cpp
trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/obj_plugin.cpp
trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/obj_plugin.hpp
trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/obj_plugin.opl
trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/obj_vc8.vcproj
trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/spirit.hpp
Modified: trunk/lib/openlibraries/configure.ac
===================================================================
--- trunk/lib/openlibraries/configure.ac 2007-11-06 21:20:38 UTC (rev 375)
+++ trunk/lib/openlibraries/configure.ac 2007-11-06 21:59:54 UTC (rev 376)
@@ -367,8 +367,8 @@
src/openobjectlib/sg/Makefile
src/openobjectlib/plugins/Makefile
src/openobjectlib/plugins/3ds/Makefile
-src/openobjectlib/plugins/obj/Makefile
src/openobjectlib/plugins/X3D/Makefile
+src/openobjectlib/plugins/wavefront/Makefile
src/openassetlib/Makefile
src/openassetlib/al/Makefile
src/openassetlib/py/Makefile
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_vc8.vcproj 2007-11-06 21:20:38 UTC (rev 375)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_vc8.vcproj 2007-11-06 21:59:54 UTC (rev 376)
@@ -41,11 +41,11 @@
Name="VCCLCompilerTool"
Optimization="0"
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"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
MinimalRebuild="true"
ExceptionHandling="2"
BasicRuntimeChecks="3"
- RuntimeLibrary="1"
+ RuntimeLibrary="3"
BufferSecurityCheck="true"
EnableEnhancedInstructionSet="0"
TreatWChar_tAsBuiltInType="true"
Modified: trunk/lib/openlibraries/src/openobjectlib/plugins/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openobjectlib/plugins/Makefile.am 2007-11-06 21:20:38 UTC (rev 375)
+++ trunk/lib/openlibraries/src/openobjectlib/plugins/Makefile.am 2007-11-06 21:59:54 UTC (rev 376)
@@ -3,4 +3,4 @@
#
#
-SUBDIRS = 3ds obj X3D
+SUBDIRS = 3ds X3D wavefront
Copied: trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront (from rev 351, trunk/lib/openlibraries/src/openobjectlib/plugins/obj)
Deleted: trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openobjectlib/plugins/obj/Makefile.am 2007-10-08 21:33:45 UTC (rev 351)
+++ trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/Makefile.am 2007-11-06 21:59:54 UTC (rev 376)
@@ -1,32 +0,0 @@
-
-#
-#
-#
-
-libdir = $(OPENOBJECTLIB_PLUGINPATH)
-
-lib_LTLIBRARIES = libopenobjectlib_obj.la
-
-libopenobjectlib_obj_la_SOURCES = \
- config.hpp \
- obj.cpp \
- obj_plugin.hpp \
- obj_plugin.cpp \
- spirit.hpp
-
-libopenobjectlib_obj_la_CXXFLAGS = \
- $(BOOST_INCLUDE_PATH) \
- -DOBJ_EXPORTS
-
-libopenobjectlib_obj_la_LIBADD = \
- $(BOOST_FILESYSTEM_LIBS)
-
-libopenobjectlib_obj_la_LDFLAGS = \
- $(OLIB_LDFLAGS) \
- $(BOOST_LIB_PATH) \
- -version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE)
-
-libopenobjectlib_obj_ladir = $(OPENOBJECTLIB_PLUGINPATH)
-libopenobjectlib_obj_la_DATA = obj_plugin.opl
-
-nobase_dist_libopenobjectlib_obj_la_DATA = obj_plugin.opl
Copied: trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/Makefile.am (from rev 375, trunk/lib/openlibraries/src/openobjectlib/plugins/obj/Makefile.am)
===================================================================
--- trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/Makefile.am (rev 0)
+++ trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/Makefile.am 2007-11-06 21:59:54 UTC (rev 376)
@@ -0,0 +1,32 @@
+
+#
+#
+#
+
+libdir = $(OPENOBJECTLIB_PLUGINPATH)
+
+lib_LTLIBRARIES = libopenobjectlib_obj.la
+
+libopenobjectlib_obj_la_SOURCES = \
+ config.hpp \
+ obj.cpp \
+ obj_plugin.hpp \
+ obj_plugin.cpp \
+ spirit.hpp
+
+libopenobjectlib_obj_la_CXXFLAGS = \
+ $(BOOST_INCLUDE_PATH) \
+ -DOBJ_EXPORTS
+
+libopenobjectlib_obj_la_LIBADD = \
+ $(BOOST_FILESYSTEM_LIBS)
+
+libopenobjectlib_obj_la_LDFLAGS = \
+ $(OLIB_LDFLAGS) \
+ $(BOOST_LIB_PATH) \
+ -version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE)
+
+libopenobjectlib_obj_ladir = $(OPENOBJECTLIB_PLUGINPATH)
+libopenobjectlib_obj_la_DATA = obj_plugin.opl
+
+nobase_dist_libopenobjectlib_obj_la_DATA = obj_plugin.opl
Deleted: trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/config.hpp
===================================================================
--- trunk/lib/openlibraries/src/openobjectlib/plugins/obj/config.hpp 2007-10-08 21:33:45 UTC (rev 351)
+++ trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/config.hpp 2007-11-06 21:59:54 UTC (rev 376)
@@ -1,25 +0,0 @@
-
-// OBJ - An OBJ plugin to sg.
-
-// Copyright (C) 2005-2006 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#ifndef OBJ_CONFIG_INC_
-#define OBJ_CONFIG_INC_
-
-#ifdef WIN32
-# ifdef OBJ_EXPORTS
-# define OBJ_DECLSPEC __declspec( dllexport )
-# else
-# define OBJ_DECLSPEC __declspec( dllimport )
-# endif
-#else
-# ifdef OBJ_EXPORTS
-# define OBJ_DECLSPEC __attribute__( ( visibility( "default" ) ) )
-# else
-# define OBJ_DECLSPEC __attribute__( ( visibility( "default" ) ) )
-# endif
-#endif
-
-#endif
Copied: trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/config.hpp (from rev 375, trunk/lib/openlibraries/src/openobjectlib/plugins/obj/config.hpp)
===================================================================
--- trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/config.hpp (rev 0)
+++ trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/config.hpp 2007-11-06 21:59:54 UTC (rev 376)
@@ -0,0 +1,25 @@
+
+// OBJ - An OBJ plugin to sg.
+
+// Copyright (C) 2005-2006 VM Inc.
+// Released under the LGPL.
+// For more information, see http://www.openlibraries.org.
+
+#ifndef OBJ_CONFIG_INC_
+#define OBJ_CONFIG_INC_
+
+#ifdef WIN32
+# ifdef OBJ_EXPORTS
+# define OBJ_DECLSPEC __declspec( dllexport )
+# else
+# define OBJ_DECLSPEC __declspec( dllimport )
+# endif
+#else
+# ifdef OBJ_EXPORTS
+# define OBJ_DECLSPEC __attribute__( ( visibility( "default" ) ) )
+# else
+# define OBJ_DECLSPEC __attribute__( ( visibility( "default" ) ) )
+# endif
+#endif
+
+#endif
Deleted: trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/obj.cpp
===================================================================
--- trunk/lib/openlibraries/src/openobjectlib/plugins/obj/obj.cpp 2007-10-08 21:33:45 UTC (rev 351)
+++ trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/obj.cpp 2007-11-06 21:59:54 UTC (rev 376)
@@ -1,33 +0,0 @@
-
-// OBJ - An OBJ plugin to sg.
-
-// Copyright (C) 2005-2006 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#include <openobjectlib/plugins/obj/obj_plugin.hpp>
-
-namespace opl = olib::openpluginlib;
-namespace OBJ = olib::openobjectlib::plugins::OBJ;
-
-extern "C"
-{
- OBJ_DECLSPEC bool openplugin_init( void )
- {
- return true;
- }
-
- OBJ_DECLSPEC bool openplugin_uninit( void )
- {
- return true;
- }
-
- OBJ_DECLSPEC bool openplugin_create_plugin( const char*, opl::openplugin** plug )
- {
- *plug = new OBJ::OBJ_plugin;
- return true;
- }
-
- OBJ_DECLSPEC void openplugin_destroy_plugin( opl::openplugin* plug )
- { delete static_cast<OBJ::OBJ_plugin*>( plug ); }
-}
Copied: trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/obj.cpp (from rev 375, trunk/lib/openlibraries/src/openobjectlib/plugins/obj/obj.cpp)
===================================================================
--- trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/obj.cpp (rev 0)
+++ trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/obj.cpp 2007-11-06 21:59:54 UTC (rev 376)
@@ -0,0 +1,33 @@
+
+// OBJ - An OBJ plugin to sg.
+
+// Copyright (C) 2005-2006 VM Inc.
+// Released under the LGPL.
+// For more information, see http://www.openlibraries.org.
+
+#include <openobjectlib/plugins/obj/obj_plugin.hpp>
+
+namespace opl = olib::openpluginlib;
+namespace OBJ = olib::openobjectlib::plugins::OBJ;
+
+extern "C"
+{
+ OBJ_DECLSPEC bool openplugin_init( void )
+ {
+ return true;
+ }
+
+ OBJ_DECLSPEC bool openplugin_uninit( void )
+ {
+ return true;
+ }
+
+ OBJ_DECLSPEC bool openplugin_create_plugin( const char*, opl::openplugin** plug )
+ {
+ *plug = new OBJ::OBJ_plugin;
+ return true;
+ }
+
+ OBJ_DECLSPEC void openplugin_destroy_plugin( opl::openplugin* plug )
+ { delete static_cast<OBJ::OBJ_plugin*>( plug ); }
+}
Deleted: trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/obj_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openobjectlib/plugins/obj/obj_plugin.cpp 2007-10-08 21:33:45 UTC (rev 351)
+++ trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/obj_plugin.cpp 2007-11-06 21:59:54 UTC (rev 376)
@@ -1,1172 +0,0 @@
-
-// OBJ - An OBJ plugin to sg.
-
-// Copyright (C) 2005-2006 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#include <algorithm>
-#include <map>
-#include <string>
-#include <vector>
-
-#include <boost/filesystem/fstream.hpp>
-#include <boost/tokenizer.hpp>
-
-#include <openpluginlib/pl/geometry.hpp>
-#include <openpluginlib/pl/property.hpp>
-#include <openpluginlib/pl/utf8_utils.hpp>
-
-#include <openobjectlib/sg/appearance.hpp>
-#include <openobjectlib/sg/spatial.hpp>
-#include <openobjectlib/sg/meshes.hpp>
-
-#include <openobjectlib/plugins/obj/obj_plugin.hpp>
-#include <openobjectlib/plugins/obj/spirit.hpp>
-
-namespace fs = boost::filesystem;
-namespace spirit = boost::spirit;
-namespace opl = olib::openpluginlib;
-namespace sg = olib::openobjectlib::sg;
-
-namespace olib { namespace openobjectlib { namespace plugins { namespace OBJ {
-
-namespace
-{
- opl::string get_base_url( const opl::string& url )
- {
-#ifdef WIN32
- size_t pos = url.find_last_of( '\\' );
- if( pos != opl::string::npos )
- return opl::string( url.begin( ), url.begin( ) + pos + 1 );
-#else
- return opl::string( url.begin( ), url.begin( ) + url.find_last_of( '/' ) + 1 );
-#endif
- return opl::string( );
- }
-
- ///////////////////////////////////////////////////////////////
- // grammar state
- struct material_state
- {
- explicit material_state( const opl::string& name_ )
- : ka( 0.2f, 0.2f, 0.2f )
- , kd( 0.8f, 0.8f, 0.8f )
- , ks( 0.2f, 0.2f, 0.2f )
- , tf( 1.0f, 1.0f, 1.0f )
- , ns( 65.0f )
- , name( name_ )
- { }
-
- opl::vec3f ka, kd, ks, tf;
- float ns;
- float sharpness;
- opl::string name;
- opl::string map_kd;
- };
-
- struct group_state
- {
- typedef std::vector<int> vec_ints;
-
- explicit group_state( const opl::string& mtl_ )
- : mtl( mtl_ )
- { }
-
- vec_ints vi, vni, vti;
- opl::string mtl;
- };
-
- struct grammar_state
- {
- typedef std::vector<float> vec_floats;
- typedef std::vector<int> vec_ints;
- typedef std::map<opl::string, group_state> groups;
- typedef std::map<opl::string, material_state> materials;
-
- explicit grammar_state( )
- : grp( 0 )
- , mtl( 0 )
- { set_group( "default" ); }
-
-
- // XXX merge these two members by means of templates.
- // XXX this totally sucks. needs a revamp ASAP.
- void set_group( const opl::string& name )
- {
- typedef groups::iterator iterator;
-
- iterator I = group.find( name );
- if( I != group.end( ) )
- {
- grp = &( I->second );
- }
- else
- {
- opl::string mtl_name( "default" );
-
- if( mtl ) mtl_name = mtl->name;
-
- grp = &( group.insert( groups::value_type( name, group_state( mtl_name ) ) ).first->second );
- }
- }
-
- void set_material( const opl::string& name )
- {
- typedef materials::iterator iterator;
-
- iterator I = material.find( name );
- if( I != material.end( ) )
- {
- mtl = &( I->second );
- }
- else
- {
- mtl = &( material.insert( materials::value_type( name, material_state( name ) ) ).first->second );
- }
-
- grp->mtl = name;
- }
-
- groups group;
- materials material;
- vec_floats v, vn, vt;
-
- group_state* grp;
- material_state* mtl;
- };
-
- ///////////////////////////////////
- /// functors
- class geometry_action
- {
- public:
- explicit geometry_action( grammar_state::vec_floats& v )
- : v_( v )
- { }
-
- void operator( )( const char* first, const char* last ) const
- { v_.push_back( static_cast<float>( atof( opl::string( first, last ).c_str( ) ) ) ); }
-
- private:
- grammar_state::vec_floats& v_;
- };
-
- //
- class topology_action
- {
- public:
- explicit topology_action( grammar_state& gs )
- : gs_( gs )
- { }
-
- void operator( )( const char* first, const char* last ) const
- {
- const char* iter = first;
-
- for( ; iter != last && *iter != '/'; ++iter )
- ;
-
- gs_.grp->vi.push_back( atoi( opl::string( first, iter ).c_str( ) ) - 1 );
-
- // texture
- if( iter != last && *++iter != '/' )
- {
- for( ; iter != last && *iter != '/'; ++iter )
- ;
-
- gs_.grp->vti.push_back( atoi( opl::string( first, iter ).c_str( ) ) - 1 );
- }
-
- // normal
- if( iter != last )
- {
- first = ++iter;
-
- gs_.grp->vni.push_back( atoi( opl::string( first, last ).c_str( ) ) - 1 );
- }
- }
-
- private:
- grammar_state& gs_;
- };
-
- //
- class topology_wrap_up_action
- {
- public:
- explicit topology_wrap_up_action( grammar_state& gs )
- : gs_( gs )
- { }
-
- void operator( )( const char* /*first*/, const char* /*last*/ ) const
- {
- gs_.grp->vi.push_back( -1 );
- gs_.grp->vni.push_back( -1 );
- gs_.grp->vti.push_back( -1 );
- }
-
- private:
- grammar_state& gs_;
- };
-
- //
- struct group_action
- {
- explicit group_action( grammar_state& gs )
- : gs_( gs )
- { }
-
- void operator( )( const char* first, const char* last ) const
- {
- opl::string s;
-
- if( ++first == last )
- s.assign( "default" );
- else
- s.assign( ++first, last ); // XXX needs a proper trim left and trim right.
-
- gs_.set_group( s );
- }
-
- grammar_state& gs_;
- };
-
- //
- struct use_material_action
- {
- explicit use_material_action( grammar_state& gs )
- : gs_( gs )
- { }
-
- void operator( )( const char* first, const char* last ) const
- { gs_.set_material( opl::string( first, last ) ); }
-
- grammar_state& gs_;
- };
-
- //
- struct material_action
- {
- explicit material_action( grammar_state& gs )
- : gs_( gs )
- { }
-
- void operator( )( const char* first, const char* last ) const
- { gs_.set_material( opl::string( first, last ) ); }
-
- grammar_state& gs_;
- };
-
- //
- opl::vec3f extract_vec3f_info( const opl::string& str )
- {
- typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
-
- opl::vec3f vec;
-
- std::string st( str.c_str( ) );
-
- boost::char_separator<char> sep( " \t" );
- tokenizer tok( st.begin( ), st.end( ), sep );
-
- tokenizer::const_iterator I = tok.begin( );
- if( I != tok.end( ) )
- vec[ 0 ] = static_cast<float>( strtod( I->c_str( ), 0 ) );
- ++I;
-
- if( I != tok.end( ) )
- vec[ 1 ] = static_cast<float>( strtod( I->c_str( ), 0 ) );
- ++I;
-
- if( I != tok.end( ) )
- vec[ 2 ] = static_cast<float>( strtod( I->c_str( ), 0 ) );
- ++I;
-
- return vec;
- }
-
- struct ka_action
- {
- explicit ka_action( grammar_state& gs )
- : gs_( gs )
- { }
-
- void operator( )( const char* first, const char* last ) const
- {
- opl::string tmp( first, last );
- opl::vec3f ka = extract_vec3f_info( tmp );
-
- gs_.mtl->ka = ka;
- }
-
- grammar_state& gs_;
- };
-
- struct kd_action
- {
- explicit kd_action( grammar_state& gs )
- : gs_( gs )
- { }
-
- void operator( )( const char* first, const char* last ) const
- {
- opl::string tmp( first, last );
- opl::vec3f kd = extract_vec3f_info( tmp );
-
- gs_.mtl->kd = kd;
- }
-
- grammar_state& gs_;
- };
-
- struct ks_action
- {
- explicit ks_action( grammar_state& gs )
- : gs_( gs )
- { }
-
- void operator( )( const char* first, const char* last ) const
- {
- opl::string tmp( first, last );
- opl::vec3f ks = extract_vec3f_info( tmp );
-
- gs_.mtl->ks = ks;
- }
-
- grammar_state& gs_;
- };
-
- struct map_kd_action
- {
- explicit map_kd_action( grammar_state& gs )
- : gs_( gs )
- { }
-
- void operator( )( const char* first, const char* last ) const
- {
- opl::string tmp( first, last );
-
- gs_.mtl->map_kd = tmp;
- }
-
- grammar_state& gs_;
- };
-
- ///////////////////////////////////////////////////////////////
- // skip grammar (whitespace and comments)
- struct skip_grammar : public spirit::grammar<skip_grammar>
- {
- template<class ScannerT>
- struct definition
- {
- definition( const skip_grammar& /*self*/)
- {
- skip
- = spirit::space_p
- | spirit::comment_p( "#" )
- ;
-
-# ifndef NDEBUG
- BOOST_SPIRIT_DEBUG_NODE( skip );
-# endif
- }
-
- spirit::rule<ScannerT> skip;
-
- const spirit::rule<ScannerT>& start( ) const
- { return skip; }
- };
- };
-
- //////////////////////////////////////////////////////////////
- // obj material grammar.
- struct mtl_grammar : public spirit::grammar<mtl_grammar>
- {
- mtl_grammar( grammar_state& eval_ )
- : eval( eval_ )
- { }
-
- template<class ScannerT>
- struct definition
- {
- definition( const mtl_grammar& self )
- {
- using namespace boost::spirit;
-
- keywords
- = "newmtl", "Ka", "Kd", "Ks", "illum", "Ns", "d", "map_Kd", "Tf"
- ;
-
- NEWMTL = strlit<>( "newmtl" );
- KA = strlit<>( "Ka" );
- KD = strlit<>( "Kd" );
- KS = strlit<>( "Ks" );
- ILLUM = strlit<>( "illum" );
- NS = strlit<>( "Ns" );
- NI = strlit<>( "Ni" );
- D = strlit<>( "d" );
- MAP_KD = strlit<>( "map_Kd" );
- TF = strlit<>( "Tf" );
- REFL = strlit<>( "refl" );
- REFLTYPE = strlit<>( "-type" );
- REFLMM = strlit<>( "-mm" );
- REFLCLAMP = strlit<>( "-clamp" );
- SHARPNESS = strlit<>( "sharpness" );
- ON = strlit<>( "on" );
- OFF = strlit<>( "off" );
-
- INTEGER_DECIMAL_CONSTANT
- = lexeme_d[ +digit_p ]
- ;
-
- INTEGER_CONSTANT
- = INTEGER_DECIMAL_CONSTANT
- ;
-
- FLOAT_CONSTANT_1 // 12345[eE][+-]123[lLfF]?
- = lexeme_d
- [
- +digit_p
- >> ( chlit<>( 'e' ) | chlit<>( 'E' ) )
- >> !sign_p
- >> +digit_p
- >> !as_lower_d[ chlit<>( 'l' ) | chlit<>( 'f' ) ]
- ]
- ;
-
- FLOAT_CONSTANT_2 // .123([[eE][+-]123)?[lLfF]?
- = lexeme_d
- [
-
- *digit_p
- >> chlit<>('.')
- >> +digit_p
- >> !( ( chlit<>( 'e' ) | chlit<>( 'E' ) )
- >> !sign_p
- >> +digit_p
- )
- >> !as_lower_d[ chlit<>( 'l' ) | chlit<>( 'f' ) ]
- ]
- ;
-
- FLOAT_CONSTANT_3 // 12345.([[eE][+-]123)?[lLfF]?
- = lexeme_d
- [
- +digit_p
- >> chlit<>( '.' )
- >> *digit_p
- >> !( ( chlit<>( 'e' ) | chlit<>( 'E' ) )
- >> !sign_p
- >> +digit_p
- )
- >> !as_lower_d[ chlit<>( 'l' ) | chlit<>( 'f' ) ]
- ]
- ;
-
- FLOAT_CONSTANT
- = FLOAT_CONSTANT_1
- | FLOAT_CONSTANT_2
- | FLOAT_CONSTANT_3
- ;
-
- CONSTANT
- = !sign_p >> longest_d[ FLOAT_CONSTANT | INTEGER_CONSTANT ]
- ;
-
-
- IDENTIFIER
- = lexeme_d
- [
- ( ( alpha_p | '_' | '$' ) >> *( alnum_p | '_' | '$' | '-' | '.' ) ) - ( keywords >> anychar_p - ( alnum_p | '_' | '$' ) )
- ]
- ;
-
- newmtl
- = NEWMTL >> IDENTIFIER[ material_action( ( const_cast<mtl_grammar&>( self ) ).eval ) ]
- >> *( ka | kd | ks | ns | ni | illum | d | sharpness | tf | refl | map_Kd )
- ;
-
- ka
- = KA >> ( CONSTANT >> CONSTANT >> CONSTANT )[ ka_action( ( const_cast<mtl_grammar&>( self ) ).eval ) ]
- ;
-
- kd = KD >> ( CONSTANT >> CONSTANT >> CONSTANT )[ kd_action( ( const_cast<mtl_grammar&>( self ) ).eval ) ]
- ;
-
- ks = KS >> ( CONSTANT >> CONSTANT >> CONSTANT )[ ks_action( ( const_cast<mtl_grammar&>( self ) ).eval ) ]
- ;
-
- ns = NS >> CONSTANT
- ;
-
- ni = NI >> CONSTANT
- ;
-
- sharpness
- = SHARPNESS >> CONSTANT
- ;
-
- illum
- = ILLUM >> CONSTANT
- ;
-
- d
- = D >> CONSTANT
- ;
-
- map_Kd
- = MAP_KD >> IDENTIFIER[ map_kd_action( ( const_cast<mtl_grammar&>( self ) ).eval ) ]
- ;
-
- tf
- = TF >> ( CONSTANT >> CONSTANT >> CONSTANT )
- ;
-
- reflmm
- = REFLMM >> CONSTANT >> CONSTANT
- ;
-
- reflclamp
- = REFLCLAMP >> ( ON | OFF )
- ;
-
- refl
- = REFL >> REFLTYPE >> IDENTIFIER >> !( reflmm | reflclamp ) >> IDENTIFIER
- ;
-
- unit
- = *newmtl
- ;
-
-# ifndef NDEBUG
- BOOST_SPIRIT_DEBUG_NODE( INTEGER_DECIMAL_CONSTANT );
- BOOST_SPIRIT_DEBUG_NODE( INTEGER_CONSTANT );
- BOOST_SPIRIT_DEBUG_NODE( FLOAT_CONSTANT );
- BOOST_SPIRIT_DEBUG_NODE( FLOAT_CONSTANT_1 );
- BOOST_SPIRIT_DEBUG_NODE( FLOAT_CONSTANT_2 );
- BOOST_SPIRIT_DEBUG_NODE( FLOAT_CONSTANT_3 );
- BOOST_SPIRIT_DEBUG_NODE( CONSTANT );
- BOOST_SPIRIT_DEBUG_NODE( ILLUM );
- BOOST_SPIRIT_DEBUG_NODE( NS );
- BOOST_SPIRIT_DEBUG_NODE( NI );
- BOOST_SPIRIT_DEBUG_NODE( KS );
- BOOST_SPIRIT_DEBUG_NODE( KD );
- BOOST_SPIRIT_DEBUG_NODE( KA );
- BOOST_SPIRIT_DEBUG_NODE( D );
- BOOST_SPIRIT_DEBUG_NODE( NEWMTL );
- BOOST_SPIRIT_DEBUG_NODE( IDENTIFIER );
- BOOST_SPIRIT_DEBUG_NODE( MAP_KD );
- BOOST_SPIRIT_DEBUG_NODE( TF );
- BOOST_SPIRIT_DEBUG_NODE( SHARPNESS );
- BOOST_SPIRIT_DEBUG_NODE( REFL );
- BOOST_SPIRIT_DEBUG_NODE( REFLTYPE );
- BOOST_SPIRIT_DEBUG_NODE( REFLMM );
- BOOST_SPIRIT_DEBUG_NODE( REFLCLAMP );
- BOOST_SPIRIT_DEBUG_NODE( ON );
- BOOST_SPIRIT_DEBUG_NODE( OFF );
- BOOST_SPIRIT_DEBUG_NODE( unit );
- BOOST_SPIRIT_DEBUG_NODE( newmtl );
- BOOST_SPIRIT_DEBUG_NODE( ka );
- BOOST_SPIRIT_DEBUG_NODE( kd );
- BOOST_SPIRIT_DEBUG_NODE( ks );
- BOOST_SPIRIT_DEBUG_NODE( ns );
- BOOST_SPIRIT_DEBUG_NODE( ni );
- BOOST_SPIRIT_DEBUG_NODE( illum );
- BOOST_SPIRIT_DEBUG_NODE( d );
- BOOST_SPIRIT_DEBUG_NODE( map_Kd );
- BOOST_SPIRIT_DEBUG_NODE( tf );
- BOOST_SPIRIT_DEBUG_NODE( sharpness );
- BOOST_SPIRIT_DEBUG_NODE( refl );
- BOOST_SPIRIT_DEBUG_NODE( reflmm );
- BOOST_SPIRIT_DEBUG_NODE( reflclamp );
-# endif
- }
-
- spirit::symbols<> keywords;
-
- spirit::rule<ScannerT> unit, newmtl, ka, kd, ks, ns, ni, illum, d, map_Kd, tf, sharpness, refl, reflmm, reflclamp;
- spirit::rule<ScannerT> IDENTIFIER, NEWMTL, KA, KD, KS, NS, NI, ILLUM, SHARPNESS;
- spirit::rule<ScannerT> INTEGER_DECIMAL_CONSTANT, INTEGER_CONSTANT;
- spirit::rule<ScannerT> FLOAT_CONSTANT, FLOAT_CONSTANT_1, FLOAT_CONSTANT_2;
- spirit::rule<ScannerT> FLOAT_CONSTANT_3, CONSTANT, D, MAP_KD, TF;
- spirit::rule<ScannerT> REFL, REFLTYPE, REFLMM, REFLCLAMP, ON, OFF;
-
- const spirit::rule<ScannerT>& start( ) const
- { return unit; }
- };
-
- grammar_state& eval;
- };
-
- //////////////////////////////////////////////////////////////
- // obj grammar. some may think is a bit overkill to use a
- // spirit grammar for the obj format. however, using spirit
- // here gives us good insight on how spirit may be used for
- // more interesting grammars like the sg fx one.
- struct OBJ_grammar : public spirit::grammar<OBJ_grammar>
- {
- OBJ_grammar( grammar_state& eval_ )
- : eval( eval_ )
- { }
-
- template<class ScannerT>
- struct definition
- {
- struct load_material_action
- {
- explicit load_material_action( const fs::path& base_url, grammar_state& gs )
- : gs_( gs )
- , base_url_( base_url )
- { }
-
- void operator( )( const char* first, const char* last ) const
- {
- fs::path orig_path( std::string( first, last ), fs::native );
-
- fs::ifstream file;
- file.open( orig_path, std::ios::in );
- if( !file.is_open( ) )
- {
- file.open( base_url_ / orig_path, std::ios::in );
- if( !file.is_open( ) )
- return;
- }
-
- file.unsetf( std::ios::skipws );
-
- std::string mtl( ( std::istreambuf_iterator<char>( file ) ), std::istreambuf_iterator<char>( ) );
-
- mtl_grammar mtl_g( gs_ );
- skip_grammar skip_g;
-
-# ifndef NDEBUG
- BOOST_SPIRIT_DEBUG_NODE( mtl_g );
- BOOST_SPIRIT_DEBUG_NODE( skip_g );
-# endif
-
- spirit::parse_info<> result = spirit::parse( mtl.c_str( ), mtl_g, skip_g );
- }
-
- grammar_state& gs_;
- fs::path base_url_;
- };
-
- static const int RESERVE_SIZE = 1000;
-
- //////////////////////////////////////////////////
- // grammar definition
- definition( const OBJ_grammar& self )
- : V( 'v' )
- , N( 'n' )
- , T( 't' )
- , F( 'f' )
- , U( 'u' )
- , G( 'g' )
- , S( 's' )
- , O( 'o' )
- , SLASH( '/' )
- {
- using namespace boost::spirit;
-
- keywords
- = "v", "vn", "vt", "f", "g", "s", "u", "mtllib", "usemtl", "on", "off"
- ;
-
- MTLLIB = strlit<>( "mtllib" );
- USEMTL = strlit<>( "usemtl" );
- ON = strlit<>( "on" );
- OFF = strlit<>( "off" );
-
- IDENTIFIER
- = lexeme_d
- [
- ( ( alpha_p | '_' | '$' ) >> *( alnum_p | '_' | '$' | '-' | '.' ) ) - ( keywords >> anychar_p - ( alnum_p | '_' | '$' ) )
- ]
- ;
-
- INTEGER_DECIMAL_CONSTANT
- = lexeme_d[ +digit_p ]
- ;
-
- INTEGER_CONSTANT
- = INTEGER_DECIMAL_CONSTANT
- ;
-
- FLOAT_CONSTANT_1 // 12345[eE][+-]123[lLfF]?
- = lexeme_d
- [
- +digit_p
- >> ( chlit<>( 'e' ) | chlit<>( 'E' ) )
- >> !sign_p
- >> +digit_p
- >> !as_lower_d[ chlit<>( 'l' ) | chlit<>( 'f' ) ]
- ]
- ;
-
- FLOAT_CONSTANT_2 // .123([[eE][+-]123)?[lLfF]?
- = lexeme_d
- [
-
- *digit_p
- >> chlit<>('.')
- >> +digit_p
- >> !( ( chlit<>( 'e' ) | chlit<>( 'E' ) )
- >> !sign_p
- >> +digit_p
- )
- >> !as_lower_d[ chlit<>( 'l' ) | chlit<>( 'f' ) ]
- ]
- ;
-
- FLOAT_CONSTANT_3 // 12345.([[eE][+-]123)?[lLfF]?
- = lexeme_d
- [
- +digit_p
- >> chlit<>( '.' )
- >> *digit_p
- >> !( ( chlit<>( 'e' ) | chlit<>( 'E' ) )
- >> !sign_p
- >> +digit_p
- )
- >> !as_lower_d[ chlit<>( 'l' ) | chlit<>( 'f' ) ]
- ]
- ;
-
- FLOAT_CONSTANT
- = FLOAT_CONSTANT_1
- | FLOAT_CONSTANT_2
- | FLOAT_CONSTANT_3
- ;
-
- CONSTANT
- = !sign_p >> longest_d[ FLOAT_CONSTANT | INTEGER_CONSTANT ]
- ;
-
- vertex_element
- = V
- >> CONSTANT[ geometry_action( ( const_cast<OBJ_grammar&>( self ) ).eval.v ) ]
- >> CONSTANT[ geometry_action( ( const_cast<OBJ_grammar&>( self ) ).eval.v ) ]
- >> CONSTANT[ geometry_action( ( const_cast<OBJ_grammar&>( self ) ).eval.v ) ]
- ;
-
- normal_element
- = V >> N
- >> CONSTANT[ geometry_action( ( const_cast<OBJ_grammar&>( self ) ).eval.vn ) ]
- >> CONSTANT[ geometry_action( ( const_cast<OBJ_grammar&>( self ) ).eval.vn ) ]
- >> CONSTANT[ geometry_action( ( const_cast<OBJ_grammar&>( self ) ).eval.vn ) ]
- ;
-
- texcoord_element
- = V >> T
- >> CONSTANT[ geometry_action( ( const_cast<OBJ_grammar&>( self ) ).eval.vt ) ]
- >> CONSTANT[ geometry_action( ( const_cast<OBJ_grammar&>( self ) ).eval.vt ) ]
- >> ( *CONSTANT )
- ;
-
- face // can be one of %d, %d//%d, %d/%d, %d/%d/%d
- = longest_d
- [
- INTEGER_CONSTANT
- | INTEGER_CONSTANT >> SLASH >> SLASH >> INTEGER_CONSTANT
- | INTEGER_CONSTANT >> SLASH >> INTEGER_CONSTANT
- | INTEGER_CONSTANT >> SLASH >> INTEGER_CONSTANT >> SLASH >> INTEGER_CONSTANT
- ]
- [ topology_action( ( const_cast<OBJ_grammar&>( self ) ).eval ) ]
- ;
-
- face_element
- = ( F >> face >> face >> face >> *face )
- [ topology_wrap_up_action( ( const_cast<OBJ_grammar&>( self ) ).eval ) ]
- ;
-
- material_element
- = MTLLIB >> IDENTIFIER[ load_material_action( self.base_url_, ( const_c...
[truncated message content] |
|
From: <gl...@us...> - 2007-11-06 22:08:08
|
Revision: 377
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=377&view=rev
Author: glslang
Date: 2007-11-06 14:08:07 -0800 (Tue, 06 Nov 2007)
Log Message:
-----------
+ portability fixes
Modified Paths:
--------------
trunk/lib/openlibraries/openlibraries_iw_vc8.sln
trunk/lib/openlibraries/openlibraries_vc8.sln
Modified: trunk/lib/openlibraries/openlibraries_iw_vc8.sln
===================================================================
--- trunk/lib/openlibraries/openlibraries_iw_vc8.sln 2007-11-06 21:59:54 UTC (rev 376)
+++ trunk/lib/openlibraries/openlibraries_iw_vc8.sln 2007-11-06 22:08:07 UTC (rev 377)
@@ -226,12 +226,6 @@
{67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
EndProjectSection
EndProject
-Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "obj", "src\openobjectlib\plugins\obj\obj_vc8.icproj", "{DDF3D73D-8E68-403E-A5D8-0F3D3231E590}"
- ProjectSection(ProjectDependencies) = postProject
- {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
- {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA} = {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA}
- EndProjectSection
-EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "X3D", "src\openobjectlib\plugins\X3D\X3D_vc8.icproj", "{CF7C26D5-4EB0-41C9-BB84-9E655A0227F6}"
ProjectSection(ProjectDependencies) = postProject
{B3A51819-E9B9-445A-9347-BC8D1D3BC1DA} = {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA}
@@ -382,6 +376,8 @@
{CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
EndProjectSection
EndProject
+Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "obj", "src\openobjectlib\plugins\wavefront\obj_vc8.icproj", "{DDF3D73D-8E68-403E-A5D8-0F3D3231E590}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Multi-threaded Debug DLL|Win32 = Multi-threaded Debug DLL|Win32
@@ -520,10 +516,6 @@
{B3A51819-E9B9-445A-9347-BC8D1D3BC1DA}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{B3A51819-E9B9-445A-9347-BC8D1D3BC1DA}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{B3A51819-E9B9-445A-9347-BC8D1D3BC1DA}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {DDF3D73D-8E68-403E-A5D8-0F3D3231E590}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {DDF3D73D-8E68-403E-A5D8-0F3D3231E590}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {DDF3D73D-8E68-403E-A5D8-0F3D3231E590}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {DDF3D73D-8E68-403E-A5D8-0F3D3231E590}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
{CF7C26D5-4EB0-41C9-BB84-9E655A0227F6}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
{CF7C26D5-4EB0-41C9-BB84-9E655A0227F6}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{CF7C26D5-4EB0-41C9-BB84-9E655A0227F6}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
@@ -748,10 +740,6 @@
{DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {AE1793B8-18EA-4277-BFDD-8C9F2AFA0096}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {AE1793B8-18EA-4277-BFDD-8C9F2AFA0096}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {AE1793B8-18EA-4277-BFDD-8C9F2AFA0096}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {AE1793B8-18EA-4277-BFDD-8C9F2AFA0096}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
{7A98C731-F651-4427-BD02-25133DEA7171}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
{7A98C731-F651-4427-BD02-25133DEA7171}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{7A98C731-F651-4427-BD02-25133DEA7171}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
@@ -844,6 +832,12 @@
{DB59A3DD-CC08-4FFD-ADFA-F659B2FC78B1}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{DB59A3DD-CC08-4FFD-ADFA-F659B2FC78B1}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{DB59A3DD-CC08-4FFD-ADFA-F659B2FC78B1}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
+ {DDF3D73D-8E68-403E-A5D8-0F3D3231E590}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
+ {DDF3D73D-8E68-403E-A5D8-0F3D3231E590}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
+ {DDF3D73D-8E68-403E-A5D8-0F3D3231E590}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
+ {DDF3D73D-8E68-403E-A5D8-0F3D3231E590}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
+ {AE1793B8-18EA-4277-BFDD-8C9F2AFA0096}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
+ {AE1793B8-18EA-4277-BFDD-8C9F2AFA0096}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -912,8 +906,8 @@
{1BECC806-7A92-409B-A6F2-1FA6AB42E0A5} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
{9F7A5B52-4A77-4C5F-B664-7C7F0D74AEA4} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
{B3A51819-E9B9-445A-9347-BC8D1D3BC1DA} = {BD86F550-C573-4A68-955B-6CEDCC8F595D}
- {DDF3D73D-8E68-403E-A5D8-0F3D3231E590} = {9483FC7B-E396-43E6-84ED-EB021AC54252}
{CF7C26D5-4EB0-41C9-BB84-9E655A0227F6} = {9483FC7B-E396-43E6-84ED-EB021AC54252}
+ {DDF3D73D-8E68-403E-A5D8-0F3D3231E590} = {9483FC7B-E396-43E6-84ED-EB021AC54252}
{80261E5B-CC18-4844-B0C2-7D8B04671BAE} = {D3688A41-2908-41C0-8BF1-4AB6E3DFDBC4}
{DCDE03E7-5170-4CB4-ACF5-E788CF12E283} = {D3688A41-2908-41C0-8BF1-4AB6E3DFDBC4}
{E18DF63F-8CDB-4377-8C5C-79FCC969E113} = {56A6ABC4-51B3-45A3-ADDD-D22A50AA55F9}
Modified: trunk/lib/openlibraries/openlibraries_vc8.sln
===================================================================
--- trunk/lib/openlibraries/openlibraries_vc8.sln 2007-11-06 21:59:54 UTC (rev 376)
+++ trunk/lib/openlibraries/openlibraries_vc8.sln 2007-11-06 22:08:07 UTC (rev 377)
@@ -226,12 +226,6 @@
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "obj", "src\openobjectlib\plugins\obj\obj_vc8.vcproj", "{AE1793B8-18EA-4277-BFDD-8C9F2AFA0096}"
- ProjectSection(ProjectDependencies) = postProject
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}
- EndProjectSection
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "X3D", "src\openobjectlib\plugins\X3D\X3D_vc8.vcproj", "{7A98C731-F651-4427-BD02-25133DEA7171}"
ProjectSection(ProjectDependencies) = postProject
{DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}
@@ -382,6 +376,8 @@
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "obj", "..\..\..\..\openlibraries\trunk\src\openobjectlib\plugins\obj\obj_vc8.vcproj", "{AE1793B8-18EA-4277-BFDD-8C9F2AFA0096}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Multi-threaded Debug DLL|Win32 = Multi-threaded Debug DLL|Win32
@@ -520,10 +516,6 @@
{DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {AE1793B8-18EA-4277-BFDD-8C9F2AFA0096}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {AE1793B8-18EA-4277-BFDD-8C9F2AFA0096}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {AE1793B8-18EA-4277-BFDD-8C9F2AFA0096}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {AE1793B8-18EA-4277-BFDD-8C9F2AFA0096}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
{7A98C731-F651-4427-BD02-25133DEA7171}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
{7A98C731-F651-4427-BD02-25133DEA7171}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{7A98C731-F651-4427-BD02-25133DEA7171}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
@@ -616,6 +608,10 @@
{DB59A3DD-CC08-4FFD-ADFA-F659B2FC78B1}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{DB59A3DD-CC08-4FFD-ADFA-F659B2FC78B1}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{DB59A3DD-CC08-4FFD-ADFA-F659B2FC78B1}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
+ {AE1793B8-18EA-4277-BFDD-8C9F2AFA0096}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
+ {AE1793B8-18EA-4277-BFDD-8C9F2AFA0096}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
+ {AE1793B8-18EA-4277-BFDD-8C9F2AFA0096}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
+ {AE1793B8-18EA-4277-BFDD-8C9F2AFA0096}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -684,8 +680,8 @@
{C29BD9EC-EC1B-4D7F-8985-F85698CE66ED} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
{1AC3D22B-175B-4169-B74A-276F9D5BA7AB} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
{DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {BD86F550-C573-4A68-955B-6CEDCC8F595D}
- {AE1793B8-18EA-4277-BFDD-8C9F2AFA0096} = {9483FC7B-E396-43E6-84ED-EB021AC54252}
{7A98C731-F651-4427-BD02-25133DEA7171} = {9483FC7B-E396-43E6-84ED-EB021AC54252}
+ {AE1793B8-18EA-4277-BFDD-8C9F2AFA0096} = {9483FC7B-E396-43E6-84ED-EB021AC54252}
{BD346E41-BEBD-43E7-9801-8EC1158355C4} = {D3688A41-2908-41C0-8BF1-4AB6E3DFDBC4}
{ECEDB34E-A863-420F-BFC6-F294AC078892} = {D3688A41-2908-41C0-8BF1-4AB6E3DFDBC4}
{4B89FC29-D7E8-4E1A-99D7-17561B89DBEA} = {56A6ABC4-51B3-45A3-ADDD-D22A50AA55F9}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-11-06 22:52:20
|
Revision: 378
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=378&view=rev
Author: glslang
Date: 2007-11-06 14:52:16 -0800 (Tue, 06 Nov 2007)
Log Message:
-----------
+ build fixes
Modified Paths:
--------------
trunk/lib/openlibraries/openlibraries_vc8.sln
trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_vc8.icproj
trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/obj.cpp
trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/obj_plugin.cpp
trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/obj_plugin.hpp
Modified: trunk/lib/openlibraries/openlibraries_vc8.sln
===================================================================
--- trunk/lib/openlibraries/openlibraries_vc8.sln 2007-11-06 22:08:07 UTC (rev 377)
+++ trunk/lib/openlibraries/openlibraries_vc8.sln 2007-11-06 22:52:16 UTC (rev 378)
@@ -376,7 +376,7 @@
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "obj", "..\..\..\..\openlibraries\trunk\src\openobjectlib\plugins\obj\obj_vc8.vcproj", "{AE1793B8-18EA-4277-BFDD-8C9F2AFA0096}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "obj", "src\openobjectlib\plugins\wavefront\obj_vc8.vcproj", "{AE1793B8-18EA-4277-BFDD-8C9F2AFA0096}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_vc8.icproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_vc8.icproj 2007-11-06 22:08:07 UTC (rev 377)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_vc8.icproj 2007-11-06 22:52:16 UTC (rev 378)
@@ -7,7 +7,7 @@
RootNamespace="jpg"
Keyword="Win32Proj"
VCNestedProjectGUID="{DB59A3DD-CC08-4FFD-ADFA-F659B2FC78B1}"
- VCNestedProjectCRC32="1340418931"
+ VCNestedProjectCRC32="162289014"
VCNestedProjectFileName="jpg_vc8.vcproj">
<Platforms>
<Platform
@@ -38,11 +38,11 @@
Name="CppCmplrTool"
Optimization="0"
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"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;IL_EXPORTS;OPENIMAGELIB_BUILD;HAVE_FLEX_STRING"
MinimalRebuild="true"
ExceptionHandling="2"
BasicRuntimeChecks="3"
- RuntimeLibrary="1"
+ RuntimeLibrary="3"
BufferSecurityCheck="true"
EnableEnhancedInstructionSet="0"
TreatWChar_tAsBuiltInType="true"
Modified: trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/obj.cpp
===================================================================
--- trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/obj.cpp 2007-11-06 22:08:07 UTC (rev 377)
+++ trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/obj.cpp 2007-11-06 22:52:16 UTC (rev 378)
@@ -5,7 +5,7 @@
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
-#include <openobjectlib/plugins/obj/obj_plugin.hpp>
+#include <openobjectlib/plugins/wavefront/obj_plugin.hpp>
namespace opl = olib::openpluginlib;
namespace OBJ = olib::openobjectlib::plugins::OBJ;
Modified: trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/obj_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/obj_plugin.cpp 2007-11-06 22:08:07 UTC (rev 377)
+++ trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/obj_plugin.cpp 2007-11-06 22:52:16 UTC (rev 378)
@@ -21,8 +21,8 @@
#include <openobjectlib/sg/spatial.hpp>
#include <openobjectlib/sg/meshes.hpp>
-#include <openobjectlib/plugins/obj/obj_plugin.hpp>
-#include <openobjectlib/plugins/obj/spirit.hpp>
+#include <openobjectlib/plugins/wavefront/obj_plugin.hpp>
+#include <openobjectlib/plugins/wavefront/spirit.hpp>
namespace fs = boost::filesystem;
namespace spirit = boost::spirit;
Modified: trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/obj_plugin.hpp
===================================================================
--- trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/obj_plugin.hpp 2007-11-06 22:08:07 UTC (rev 377)
+++ trunk/lib/openlibraries/src/openobjectlib/plugins/wavefront/obj_plugin.hpp 2007-11-06 22:52:16 UTC (rev 378)
@@ -10,7 +10,7 @@
#include <boost/filesystem/path.hpp>
-#include <openobjectlib/plugins/obj/config.hpp>
+#include <openobjectlib/plugins/wavefront/config.hpp>
#include <openobjectlib/sg/openobjectlib_plugin.hpp>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-11-06 23:24:47
|
Revision: 379
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=379&view=rev
Author: glslang
Date: 2007-11-06 15:24:46 -0800 (Tue, 06 Nov 2007)
Log Message:
-----------
+ build fixes
Modified Paths:
--------------
trunk/lib/openlibraries/openlibraries_iw_vc8.sln
trunk/lib/openlibraries/openlibraries_vc8.sln
trunk/lib/openlibraries/src/openimagelib/plugins/jpg/jpg_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/plugins/quicktime/quicktime_vc8.vcproj
Modified: trunk/lib/openlibraries/openlibraries_iw_vc8.sln
===================================================================
--- trunk/lib/openlibraries/openlibraries_iw_vc8.sln 2007-11-06 22:52:16 UTC (rev 378)
+++ trunk/lib/openlibraries/openlibraries_iw_vc8.sln 2007-11-06 23:24:46 UTC (rev 379)
@@ -103,74 +103,74 @@
EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "3D_lightmap", "src\openimagelib\plugins\3D_lightmap\3D_lightmap_vc8.icproj", "{54828EE2-BA89-4700-9E52-24A8A8301880}"
ProjectSection(ProjectDependencies) = postProject
+ {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
{67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
- {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
EndProjectSection
EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "bmp", "src\openimagelib\plugins\bmp\bmp_vc8.icproj", "{847EA448-ED49-4A63-822E-6DBC2F760298}"
ProjectSection(ProjectDependencies) = postProject
+ {67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
{CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
- {67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
EndProjectSection
EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "dds", "src\openimagelib\plugins\dds\dds_vc8.icproj", "{05C95FA3-7755-4F6E-8D87-79CA433A481C}"
ProjectSection(ProjectDependencies) = postProject
+ {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
{67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
- {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
EndProjectSection
EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "dpx", "src\openimagelib\plugins\dpx\dpx_vc8.icproj", "{70559110-3095-4653-B905-3332F81FB48C}"
ProjectSection(ProjectDependencies) = postProject
+ {67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
{CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
- {67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
EndProjectSection
EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "exr", "src\openimagelib\plugins\exr\exr_vc8.icproj", "{168C99C5-7434-43DB-BC01-1545486FD320}"
ProjectSection(ProjectDependencies) = postProject
+ {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
{67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
- {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
EndProjectSection
EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "gdi+", "src\openimagelib\plugins\gdi+\gdi+_vc8.icproj", "{D2A54593-9912-4A94-950C-4204994E5AD0}"
ProjectSection(ProjectDependencies) = postProject
+ {67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
{CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
- {67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
EndProjectSection
EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "hdr", "src\openimagelib\plugins\hdr\hdr_vc8.icproj", "{82F69659-47F1-44E2-A6AF-7E125BFE333B}"
ProjectSection(ProjectDependencies) = postProject
+ {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
{67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
- {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
EndProjectSection
EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "png", "src\openimagelib\plugins\png\png_vc8.icproj", "{6C5F9915-54DD-4C1F-9CD1-6112D80BBE8C}"
ProjectSection(ProjectDependencies) = postProject
+ {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
{67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
- {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
EndProjectSection
EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "psd", "src\openimagelib\plugins\psd\psd_vc8.icproj", "{A6B1C8AA-F6EB-4EE4-BD11-758BF9C2E6EE}"
ProjectSection(ProjectDependencies) = postProject
+ {67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
{CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
- {67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
EndProjectSection
EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "quicktime", "src\openimagelib\plugins\quicktime\quicktime_vc8.icproj", "{123BEE85-5545-49D6-BC1A-B9D07187312A}"
ProjectSection(ProjectDependencies) = postProject
+ {67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
{CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
- {67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
EndProjectSection
EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "sgi", "src\openimagelib\plugins\sgi\sgi_vc8.icproj", "{F29DD922-4E1C-4A7D-B388-FB4FCA97F369}"
ProjectSection(ProjectDependencies) = postProject
+ {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
{67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
- {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
EndProjectSection
EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "tga", "src\openimagelib\plugins\tga\tga_vc8.icproj", "{FA6FE539-D58B-4963-BC62-F0F5AE9D07A2}"
ProjectSection(ProjectDependencies) = postProject
+ {67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
{CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
- {67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ML", "ML", "{F76943CD-19F1-469A-B725-38C44C2DD27F}"
@@ -179,8 +179,8 @@
EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "ml", "src\openmedialib\ml\ml_vc8.icproj", "{C84EAE1C-7E87-4E3D-BCF9-003383139800}"
ProjectSection(ProjectDependencies) = postProject
+ {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
{67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
- {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
EndProjectSection
EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "py", "src\openmedialib\py\py_vc8.icproj", "{7A534984-2C4F-43EB-9ED1-F47E0E1C07F5}"
@@ -190,30 +190,30 @@
EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "gensys", "src\openmedialib\plugins\gensys\gensys_vc8.icproj", "{B7855283-738F-4ADF-9C7C-5BFFDD5B537F}"
ProjectSection(ProjectDependencies) = postProject
+ {C84EAE1C-7E87-4E3D-BCF9-003383139800} = {C84EAE1C-7E87-4E3D-BCF9-003383139800}
+ {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
{67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
- {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
- {C84EAE1C-7E87-4E3D-BCF9-003383139800} = {C84EAE1C-7E87-4E3D-BCF9-003383139800}
EndProjectSection
EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "ofx", "src\openmedialib\plugins\ofx\ofx_vc8.icproj", "{FC5B483A-2782-4DB8-88FC-CDF767A067D5}"
ProjectSection(ProjectDependencies) = postProject
+ {C84EAE1C-7E87-4E3D-BCF9-003383139800} = {C84EAE1C-7E87-4E3D-BCF9-003383139800}
+ {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
{67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
- {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
- {C84EAE1C-7E87-4E3D-BCF9-003383139800} = {C84EAE1C-7E87-4E3D-BCF9-003383139800}
EndProjectSection
EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "oil", "src\openmedialib\plugins\oil\oil_vc8.icproj", "{1BECC806-7A92-409B-A6F2-1FA6AB42E0A5}"
ProjectSection(ProjectDependencies) = postProject
+ {67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
+ {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
{C84EAE1C-7E87-4E3D-BCF9-003383139800} = {C84EAE1C-7E87-4E3D-BCF9-003383139800}
- {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
- {67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
EndProjectSection
EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "quicktime", "src\openmedialib\plugins\quicktime\quicktime_vc8.icproj", "{9F7A5B52-4A77-4C5F-B664-7C7F0D74AEA4}"
ProjectSection(ProjectDependencies) = postProject
+ {67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
+ {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
{C84EAE1C-7E87-4E3D-BCF9-003383139800} = {C84EAE1C-7E87-4E3D-BCF9-003383139800}
- {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
- {67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SG", "SG", "{BD86F550-C573-4A68-955B-6CEDCC8F595D}"
@@ -222,14 +222,14 @@
EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "sg", "src\openobjectlib\sg\sg_vc8.icproj", "{B3A51819-E9B9-445A-9347-BC8D1D3BC1DA}"
ProjectSection(ProjectDependencies) = postProject
+ {67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
{CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
- {67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
EndProjectSection
EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "X3D", "src\openobjectlib\plugins\X3D\X3D_vc8.icproj", "{CF7C26D5-4EB0-41C9-BB84-9E655A0227F6}"
ProjectSection(ProjectDependencies) = postProject
+ {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
{B3A51819-E9B9-445A-9347-BC8D1D3BC1DA} = {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA}
- {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AL", "AL", "{D3688A41-2908-41C0-8BF1-4AB6E3DFDBC4}"
@@ -238,10 +238,10 @@
EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "al", "src\openassetlib\al\al_vc8.icproj", "{80261E5B-CC18-4844-B0C2-7D8B04671BAE}"
ProjectSection(ProjectDependencies) = postProject
+ {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA} = {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA}
+ {C84EAE1C-7E87-4E3D-BCF9-003383139800} = {C84EAE1C-7E87-4E3D-BCF9-003383139800}
+ {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
{67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
- {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
- {C84EAE1C-7E87-4E3D-BCF9-003383139800} = {C84EAE1C-7E87-4E3D-BCF9-003383139800}
- {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA} = {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA}
EndProjectSection
EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "py", "src\openassetlib\py\py_vc8.icproj", "{DCDE03E7-5170-4CB4-ACF5-E788CF12E283}"
@@ -251,94 +251,94 @@
EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "sqlite", "src\openassetlib\plugins\sqlite\sqlite_vc8.icproj", "{E18DF63F-8CDB-4377-8C5C-79FCC969E113}"
ProjectSection(ProjectDependencies) = postProject
+ {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
{80261E5B-CC18-4844-B0C2-7D8B04671BAE} = {80261E5B-CC18-4844-B0C2-7D8B04671BAE}
- {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GL", "GL", "{C2EBF114-BFF6-4520-BC11-EB54565B92D6}"
EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "_2D", "test\openimagelib\GL\_2D\_2D_vc8.icproj", "{EC14269B-467D-4AE7-94B1-F6F4B6280543}"
ProjectSection(ProjectDependencies) = postProject
+ {67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
{CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
- {67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
EndProjectSection
EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "_2D_compressed", "test\openimagelib\GL\_2D_compressed\_2D_compressed_vc8.icproj", "{5CBC56F0-7DF5-437C-A59D-5ECD4CAF21DC}"
ProjectSection(ProjectDependencies) = postProject
+ {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
{67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
- {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
EndProjectSection
EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "_2D_compressed_cubemap", "test\openimagelib\GL\_2D_compressed_cubemap\_2D_compressed_cubemap_vc8.icproj", "{30E45B23-A206-4803-833F-23445A872619}"
ProjectSection(ProjectDependencies) = postProject
+ {67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
{CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
- {67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
EndProjectSection
EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "_2D_crop", "test\openimagelib\GL\_2D_crop\_2D_crop_vc8.icproj", "{F6C427E3-5A7E-4515-B353-4BABD59B4280}"
ProjectSection(ProjectDependencies) = postProject
+ {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
{67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
- {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
EndProjectSection
EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "_2D_crop2", "test\openimagelib\GL\_2D_crop2\_2D_crop2_vc8.icproj", "{B37C93F8-C0E4-4ABB-90B5-56DA6AF8068B}"
ProjectSection(ProjectDependencies) = postProject
+ {67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
{CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
- {67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
EndProjectSection
EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "_2D_exr", "test\openimagelib\GL\_2D_exr\_2D_exr_vc8.icproj", "{1B8C0271-A3E1-4B9F-A3D2-8AD59994AD8A}"
ProjectSection(ProjectDependencies) = postProject
+ {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
{67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
- {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
EndProjectSection
EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "_2D_sgi", "test\openimagelib\GL\_2D_sgi\_2D_sgi_vc8.icproj", "{009731D9-D224-48AB-A8F4-B5C584A0FAEF}"
ProjectSection(ProjectDependencies) = postProject
+ {67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
{CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
- {67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
EndProjectSection
EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "_3D_lightmap", "test\openimagelib\GL\_3D_lightmap\_3D_lightmap_vc8.icproj", "{83613041-D1A9-40E0-92C7-AB9B5B1CF30B}"
ProjectSection(ProjectDependencies) = postProject
+ {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
{67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
- {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
EndProjectSection
EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "player", "test\openmedialib\player\player_vc8.icproj", "{28420E73-D1B5-4191-B0AF-6C3A59E33F57}"
ProjectSection(ProjectDependencies) = postProject
+ {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
{C84EAE1C-7E87-4E3D-BCF9-003383139800} = {C84EAE1C-7E87-4E3D-BCF9-003383139800}
- {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
EndProjectSection
EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "store", "test\openmedialib\store\store_vc8.icproj", "{105D3AE5-6D9E-40FC-A0AD-89DC3C795121}"
ProjectSection(ProjectDependencies) = postProject
+ {C84EAE1C-7E87-4E3D-BCF9-003383139800} = {C84EAE1C-7E87-4E3D-BCF9-003383139800}
{CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
- {C84EAE1C-7E87-4E3D-BCF9-003383139800} = {C84EAE1C-7E87-4E3D-BCF9-003383139800}
EndProjectSection
EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "multipass_draw", "test\openobjectlib\GL\multipass_draw\multipass_draw_vc8.icproj", "{40ABEE3D-14F3-490A-8919-CEAE879BCF28}"
ProjectSection(ProjectDependencies) = postProject
+ {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
{B3A51819-E9B9-445A-9347-BC8D1D3BC1DA} = {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA}
- {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
EndProjectSection
EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "noise_volume", "test\openobjectlib\GL\noise_volume\noise_volume_vc8.icproj", "{BFA2FC4C-3A12-4D2D-B981-B3ABC1DEEB40}"
ProjectSection(ProjectDependencies) = postProject
+ {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA} = {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA}
{CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
- {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA} = {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA}
EndProjectSection
EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "obj_draw", "test\openobjectlib\GL\obj_draw\obj_draw_vc8.icproj", "{68B88FAE-568D-4CED-90F4-3FDA1BCC481D}"
ProjectSection(ProjectDependencies) = postProject
+ {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
{B3A51819-E9B9-445A-9347-BC8D1D3BC1DA} = {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA}
- {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
EndProjectSection
EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "texture_draw", "test\openobjectlib\GL\texture_draw\texture_draw_vc8.icproj", "{840428EF-8268-4F4D-878C-DAB32E8D5AC8}"
ProjectSection(ProjectDependencies) = postProject
+ {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA} = {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA}
{CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
- {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA} = {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GL", "GL", "{B972DCEB-386E-42D2-8C5E-DD2942EC7F63}"
@@ -347,15 +347,15 @@
EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "tonemap", "src\openeffectslib\plugins\tonemap\tonemap_vc8.icproj", "{68A41D6B-F6DB-4A26-9202-22950CC80697}"
ProjectSection(ProjectDependencies) = postProject
+ {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
{C84EAE1C-7E87-4E3D-BCF9-003383139800} = {C84EAE1C-7E87-4E3D-BCF9-003383139800}
- {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
EndProjectSection
EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "tm_bench", "test\openeffectslib\tm_bench\tm_bench_vc8.icproj", "{6217C9BE-C025-48E5-BBB6-258BDF3ED5F3}"
ProjectSection(ProjectDependencies) = postProject
+ {67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
+ {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
{C84EAE1C-7E87-4E3D-BCF9-003383139800} = {C84EAE1C-7E87-4E3D-BCF9-003383139800}
- {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
- {67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
EndProjectSection
EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "tiff", "src\openimagelib\plugins\tiff\tiff_vc8.icproj", "{FF86DCCC-8D8F-4016-B4BC-6699963EEEE1}"
@@ -365,18 +365,21 @@
EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "rescaler_bench", "test\openeffectslib\rescaler_bench\rescaler_bench_vc8.icproj", "{52CD991C-C495-4EB9-80D2-D9E1F809AA9B}"
ProjectSection(ProjectDependencies) = postProject
+ {67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
+ {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
{C84EAE1C-7E87-4E3D-BCF9-003383139800} = {C84EAE1C-7E87-4E3D-BCF9-003383139800}
- {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
- {67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
EndProjectSection
EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "jpg", "src\openimagelib\plugins\jpg\jpg_vc8.icproj", "{BB6CABC4-A340-4BD6-BAEE-33A0B80B94DA}"
ProjectSection(ProjectDependencies) = postProject
+ {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
{67EA57CD-3ACE-4BA9-BD0D-440FFC547382} = {67EA57CD-3ACE-4BA9-BD0D-440FFC547382}
- {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92} = {CAE0E5BD-F948-4A10-9C1C-0D55CD4BDF92}
EndProjectSection
EndProject
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "obj", "src\openobjectlib\plugins\wavefront\obj_vc8.icproj", "{DDF3D73D-8E68-403E-A5D8-0F3D3231E590}"
+ ProjectSection(ProjectDependencies) = postProject
+ {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA} = {B3A51819-E9B9-445A-9347-BC8D1D3BC1DA}
+ EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -608,6 +611,10 @@
{BB6CABC4-A340-4BD6-BAEE-33A0B80B94DA}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{BB6CABC4-A340-4BD6-BAEE-33A0B80B94DA}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{BB6CABC4-A340-4BD6-BAEE-33A0B80B94DA}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
+ {DDF3D73D-8E68-403E-A5D8-0F3D3231E590}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
+ {DDF3D73D-8E68-403E-A5D8-0F3D3231E590}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
+ {DDF3D73D-8E68-403E-A5D8-0F3D3231E590}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
+ {DDF3D73D-8E68-403E-A5D8-0F3D3231E590}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
{2B35E24C-CFD8-4658-ADC5-9C831B6181D5}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
{2B35E24C-CFD8-4658-ADC5-9C831B6181D5}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{2B35E24C-CFD8-4658-ADC5-9C831B6181D5}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
@@ -832,10 +839,6 @@
{DB59A3DD-CC08-4FFD-ADFA-F659B2FC78B1}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{DB59A3DD-CC08-4FFD-ADFA-F659B2FC78B1}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{DB59A3DD-CC08-4FFD-ADFA-F659B2FC78B1}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {DDF3D73D-8E68-403E-A5D8-0F3D3231E590}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {DDF3D73D-8E68-403E-A5D8-0F3D3231E590}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {DDF3D73D-8E68-403E-A5D8-0F3D3231E590}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {DDF3D73D-8E68-403E-A5D8-0F3D3231E590}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
{AE1793B8-18EA-4277-BFDD-8C9F2AFA0096}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
{AE1793B8-18EA-4277-BFDD-8C9F2AFA0096}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
EndGlobalSection
Modified: trunk/lib/openlibraries/openlibraries_vc8.sln
===================================================================
--- trunk/lib/openlibraries/openlibraries_vc8.sln 2007-11-06 22:52:16 UTC (rev 378)
+++ trunk/lib/openlibraries/openlibraries_vc8.sln 2007-11-06 23:24:46 UTC (rev 379)
@@ -103,74 +103,74 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "3D_lightmap", "src\openimagelib\plugins\3D_lightmap\3D_lightmap_vc8.vcproj", "{B1F25233-BC0C-4AB7-A1F2-ACFB520E34D1}"
ProjectSection(ProjectDependencies) = postProject
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bmp", "src\openimagelib\plugins\bmp\bmp_vc8.vcproj", "{261595DD-FB76-4D37-A3C8-0D9625C20D46}"
ProjectSection(ProjectDependencies) = postProject
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dds", "src\openimagelib\plugins\dds\dds_vc8.vcproj", "{B8498FDE-2F2F-4CAF-AA28-A6EBA5AECADE}"
ProjectSection(ProjectDependencies) = postProject
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dpx", "src\openimagelib\plugins\dpx\dpx_vc8.vcproj", "{875CE227-A98F-4711-9496-61BC21DA88B8}"
ProjectSection(ProjectDependencies) = postProject
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "exr", "src\openimagelib\plugins\exr\exr_vc8.vcproj", "{17CBC457-3279-40F9-A614-A69046132424}"
ProjectSection(ProjectDependencies) = postProject
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdi+", "src\openimagelib\plugins\gdi+\gdi+_vc8.vcproj", "{08D0F0FA-947B-4AAF-90A8-7FBFC5EBD51B}"
ProjectSection(ProjectDependencies) = postProject
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdr", "src\openimagelib\plugins\hdr\hdr_vc8.vcproj", "{972FF7FA-BDBE-400E-BDF6-59C13A6AE74D}"
ProjectSection(ProjectDependencies) = postProject
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "png", "src\openimagelib\plugins\png\png_vc8.vcproj", "{4A6B0F4F-676E-4A96-A990-62464D923ED2}"
ProjectSection(ProjectDependencies) = postProject
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
{3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "psd", "src\openimagelib\plugins\psd\psd_vc8.vcproj", "{FF23E252-5FD9-4642-9563-1111B12D8EE7}"
ProjectSection(ProjectDependencies) = postProject
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quicktime", "src\openimagelib\plugins\quicktime\quicktime_vc8.vcproj", "{AB23E1B4-55D4-4846-99BE-6EF3848ABCF3}"
ProjectSection(ProjectDependencies) = postProject
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}"...
[truncated message content] |
|
From: <gl...@us...> - 2007-11-10 21:14:26
|
Revision: 382
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=382&view=rev
Author: glslang
Date: 2007-11-10 13:14:24 -0800 (Sat, 10 Nov 2007)
Log Message:
-----------
+ removes all RPATH references
Modified Paths:
--------------
trunk/lib/openlibraries/configure.ac
trunk/lib/openlibraries/m4/boost.m4
trunk/lib/openlibraries/m4/glew.m4
trunk/lib/openlibraries/m4/openal.m4
trunk/lib/openlibraries/m4/openimagelib.m4
trunk/lib/openlibraries/m4/qt.m4
trunk/lib/openlibraries/m4/universal_binary.m4
trunk/lib/openlibraries/openlibraries.pc.in
trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/Makefile.am
trunk/lib/openlibraries/src/openassetlib/py/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/png/Makefile.am
trunk/lib/openlibraries/src/openimagelib/py/Makefile.am
trunk/lib/openlibraries/src/openmedialib/plugins/openal/Makefile.am
trunk/lib/openlibraries/src/openmedialib/py/Makefile.am
trunk/lib/openlibraries/src/openobjectlib/sg/Makefile.am
trunk/lib/openlibraries/src/openpluginlib/pl/Makefile.am
trunk/lib/openlibraries/src/openpluginlib/py/Makefile.am
trunk/lib/openlibraries/test/openeffectslib/tm_bench/Makefile.am
trunk/lib/openlibraries/test/openimagelib/GL/_2D/Makefile.am
trunk/lib/openlibraries/test/openimagelib/GL/_2D_compressed/Makefile.am
trunk/lib/openlibraries/test/openimagelib/GL/_2D_compressed_cubemap/Makefile.am
trunk/lib/openlibraries/test/openimagelib/GL/_2D_crop/Makefile.am
trunk/lib/openlibraries/test/openimagelib/GL/_2D_crop2/Makefile.am
trunk/lib/openlibraries/test/openimagelib/GL/_2D_exr/Makefile.am
trunk/lib/openlibraries/test/openimagelib/GL/_2D_scale/Makefile.am
trunk/lib/openlibraries/test/openimagelib/GL/_2D_sgi/Makefile.am
trunk/lib/openlibraries/test/openmedialib/player/Makefile.am
trunk/lib/openlibraries/test/openmedialib/store/Makefile.am
trunk/lib/openlibraries/test/openobjectlib/GL/multipass_draw/Makefile.am
trunk/lib/openlibraries/test/openobjectlib/GL/noise_volume/Makefile.am
trunk/lib/openlibraries/test/openobjectlib/GL/obj_draw/Makefile.am
trunk/lib/openlibraries/test/openobjectlib/GL/texture_draw/Makefile.am
trunk/lib/openlibraries/test/openpluginlib/discovery/Makefile.am
trunk/lib/openlibraries/test/openpluginlib/enumerate/Makefile.am
trunk/lib/openlibraries/test/openpluginlib/gettimeofday/Makefile.am
trunk/lib/openlibraries/test/openpluginlib/gpu_timer_query/Makefile.am
trunk/lib/openlibraries/test/openpluginlib/initialization/Makefile.am
trunk/lib/openlibraries/test/openpluginlib/pcos/key/Makefile.am
trunk/lib/openlibraries/test/openpluginlib/pcos/property/Makefile.am
trunk/lib/openlibraries/test/openpluginlib/pcos/property_container/Makefile.am
trunk/lib/openlibraries/test/openpluginlib/pcos/subject-observer/Makefile.am
trunk/lib/openlibraries/test/openpluginlib/rdtsc/Makefile.am
Modified: trunk/lib/openlibraries/configure.ac
===================================================================
--- trunk/lib/openlibraries/configure.ac 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/configure.ac 2007-11-10 21:14:24 UTC (rev 382)
@@ -303,33 +303,6 @@
AC_SUBST(OPENASSETLIB_PLUGINPATH)
AC_SUBST(OPENPLUGINLIB_LIBPATH)
-#
-# RPATHS
-#
-
-case $host in
- *-*-linux*)
- OPENPLUGINLIB_RPATH="-Wl,-rpath=${OPENLIBRARIES_LIBPATH}/openpluginlib/$OL_LIBNAME"
- OPENIMAGELIB_RPATH="-Wl,-rpath=${OPENLIBRARIES_LIBPATH}/openimagelib/$OL_LIBNAME"
- OPENMEDIALIB_RPATH="-Wl,-rpath=${OPENLIBRARIES_LIBPATH}/openmedialib/$OL_LIBNAME"
- OPENOBJECTLIB_RPATH="-Wl,-rpath=${OPENLIBRARIES_LIBPATH}/openobjectlib/$OL_LIBNAME"
- OPENASSETLIB_RPATH="-Wl,-rpath=${OPENLIBRARIES_LIBPATH}/openassetlib/$OL_LIBNAME"
- ;;
- *)
- OPENPLUGINLIB_RPATH=""
- OPENIMAGELIB_RPATH=""
- OPENMEDIALIB_RPATH=""
- OPENOBJECTLIB_RPATH=""
- OPENASSETLIB_RPATH=""
- ;;
-esac
-
-AC_SUBST(OPENPLUGINLIB_RPATH)
-AC_SUBST(OPENIMAGELIB_RPATH)
-AC_SUBST(OPENMEDIALIB_RPATH)
-AC_SUBST(OPENOBJECTLIB_RPATH)
-AC_SUBST(OPENASSETLIB_RPATH)
-
dnl
dnl Output configuration files
dnl
Modified: trunk/lib/openlibraries/m4/boost.m4
===================================================================
--- trunk/lib/openlibraries/m4/boost.m4 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/m4/boost.m4 2007-11-10 21:14:24 UTC (rev 382)
@@ -14,7 +14,6 @@
BOOST_INCLUDE_PATH=""
BOOST_LIB_PATH=""
- BOOST_LIB_RPATH=""
AS_IF([test "x$with_boostversion" == "x"],
AC_MSG_WARN([*** Boost version is not defined. Will use system defaults. ***])
@@ -48,12 +47,6 @@
BOOST_LIB_PATH="-L$with_boostprefix/$OL_LIBNAME"
,,)
- case $host in
- *-*-linux*)
- BOOST_LIB_RPATH="-Wl,-rpath=$with_boostprefix/$OL_LIBNAME"
- ;;
- esac
-
BOOST_LIBNAMESUFFIX="$BOOST_LIB_TOOLSET$BOOST_LIB_RUNTIME$BOOST_LIB_VERSION"
BOOST_FILESYSTEM_LIBS="-lboost_filesystem$BOOST_LIB_TOOLSET$BOOST_LIB_RUNTIME$BOOST_LIB_VERSION"
@@ -91,7 +84,6 @@
AC_SUBST(BOOST_LIB_TOOLSET)
AC_SUBST(BOOST_INCLUDE_PATH)
AC_SUBST(BOOST_LIB_PATH)
- AC_SUBST(BOOST_LIB_RPATH)
AC_SUBST(BOOST_FILESYSTEM_LIBS)
AM_CONDITIONAL(HAVE_BOOST_FILESYSTEM, [test x$ac_use_boost_filesystem = "xyes"])
Modified: trunk/lib/openlibraries/m4/glew.m4
===================================================================
--- trunk/lib/openlibraries/m4/glew.m4 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/m4/glew.m4 2007-11-10 21:14:24 UTC (rev 382)
@@ -14,7 +14,6 @@
GLEW_PREFIX="$with_glewprefix"
GLEW_INCLUDE_PATH=""
GLEW_LIB_PATH=""
- GLEW_LIB_RPATH=""
GLEW_LIBS=""
if test x$enableglew = "xyes" ; then
@@ -33,21 +32,12 @@
[ac_have_glew="yes" GLEW_LIBS="-lGLEW" AC_DEFINE(HAVE_GL_GLEW_H, 1,[Define this if you have GLEW support])],
[AC_MSG_ERROR([*** GLEW support is not available. Please install GLEW to proceed. ***])])]
- LDFLAGS="$save_LDFLAGS", [AC_MSG_ERROR([*** GLEW support is not available. Please install GLEW to proceed. ***])],[])
-
- if test x$ac_have_glew = "xyes"; then
- ac_use_glew=yes
- case $host in
- *-*-linux*)
- GLEW_LIB_RPATH="-Wl,-rpath=$with_glewprefix/$OL_LIBNAME"
- esac
- fi
+ LDFLAGS="$save_LDFLAGS", [AC_MSG_ERROR([*** GLEW support is not available. Please install GLEW to proceed. ***])],[])
fi
AC_SUBST(GLEW_PREFIX)
AC_SUBST(GLEW_INCLUDE_PATH)
AC_SUBST(GLEW_LIB_PATH)
- AC_SUBST(GLEW_LIB_RPATH)
AC_SUBST(GLEW_LIBS)
if test x$ac_use_glew = "xyes"; then
Modified: trunk/lib/openlibraries/m4/openal.m4
===================================================================
--- trunk/lib/openlibraries/m4/openal.m4 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/m4/openal.m4 2007-11-10 21:14:24 UTC (rev 382)
@@ -18,7 +18,6 @@
OPENAL_PREFIX="$with_openalprefix"
OPENAL_INCLUDE_PATH=""
OPENAL_LIB_PATH=""
- OPENAL_LIB_RPATH=""
OPENAL_LIBS=""
if test x$enableopenal = "xyes" ; then
@@ -66,7 +65,6 @@
AC_SUBST(OPENAL_INCLUDE_PATH)
AC_SUBST(OPENAL_LIB_PATH)
- AC_SUBST(OPENAL_LIB_RPATH)
AC_SUBST(OPENAL_LIBS)
AM_CONDITIONAL(HAVE_OPENAL, [test x$ac_use_openal = "xyes"])
Modified: trunk/lib/openlibraries/m4/openimagelib.m4
===================================================================
--- trunk/lib/openlibraries/m4/openimagelib.m4 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/m4/openimagelib.m4 2007-11-10 21:14:24 UTC (rev 382)
@@ -21,6 +21,7 @@
AC_MSG_RESULT([*** PNG support is not available ***]))
else
PNG_CFLAGS=`$LIBPNG_CONFIG --cflags`
+ PNG_LDFLAGS=`$LIBPNG_CONFIG --ldflags`
PNG_LIBS=`$LIBPNG_CONFIG --libs`
have_libpng="yes"
AC_DEFINE(HAVE_LIBPNG,1,[Define this for PNG support])
@@ -28,6 +29,7 @@
AM_CONDITIONAL(HAVE_LIBPNG, test x"$have_libpng" = "xyes")
AC_SUBST(PNG_CFLAGS)
+ AC_SUBST(PNG_LDFLAGS)
AC_SUBST(PNG_LIBS)
dnl libjpeg support
Modified: trunk/lib/openlibraries/m4/qt.m4
===================================================================
--- trunk/lib/openlibraries/m4/qt.m4 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/m4/qt.m4 2007-11-10 21:14:24 UTC (rev 382)
@@ -9,15 +9,8 @@
QT_INCLUDE_PATH="-I${with_qtinclude}"
QT_LIB_PATH="-L${with_qtlib}"
- QT_LIB_RPATH=""
QT_LIBS=""
- case $host in
- *-*-linux*)
- QT_LIB_RPATH="-Wl,-rpath=${with_qtlib}"
- ;;
- esac
-
save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS ${QT_INCLUDE_PATH}"
@@ -52,7 +45,6 @@
AC_SUBST(QT_INCLUDE_PATH)
AC_SUBST(QT_LIB_PATH)
- AC_SUBST(QT_LIB_RPATH)
AC_SUBST(QT_LIBS)
AM_CONDITIONAL(HAVE_QT, [test x$ac_use_qt = "xyes"])
Modified: trunk/lib/openlibraries/m4/universal_binary.m4
===================================================================
--- trunk/lib/openlibraries/m4/universal_binary.m4 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/m4/universal_binary.m4 2007-11-10 21:14:24 UTC (rev 382)
@@ -16,7 +16,7 @@
AC_MSG_ERROR([--enable-universalbinaries requires --disable-dependency-tracking])
fi
AC_MSG_RESULT(yes)
- CXXFLAGS="$CXXFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386"
+ CXXFLAGS="$CXXFLAGS -arch ppc -arch i386"
else
AC_MSG_RESULT(no)
fi
Modified: trunk/lib/openlibraries/openlibraries.pc.in
===================================================================
--- trunk/lib/openlibraries/openlibraries.pc.in 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/openlibraries.pc.in 2007-11-10 21:14:24 UTC (rev 382)
@@ -18,9 +18,7 @@
Description: OpenLibraries - a library suite for non-linear editing, visual effects and rich media applications.
Version: @OL_MAJOR@.@OL_MINOR@.@OL_SUB@
-Libs: @OPENPLUGINLIB_RPATH@ @OPENIMAGELIB_RPATH@ @OPENMEDIALIB_RPATH@ @OPENOBJECTLIB_RPATH@ \
- @OPENASSETLIB_RPATH@ @BOOST_LIB_RPATH@ @GLEW_LIB_RPATH@ \
- -L${libdir}/openlibraries-@OL_MAJOR@.@OL_MINOR@.@OL_SUB@/openobjectlib/@OL_LIBNAME@ -lopenobjectlib_sg \
+Libs:-L${libdir}/openlibraries-@OL_MAJOR@.@OL_MINOR@.@OL_SUB@/openobjectlib/@OL_LIBNAME@ -lopenobjectlib_sg \
-L${libdir}/openlibraries-@OL_MAJOR@.@OL_MINOR@.@OL_SUB@/openimagelib/@OL_LIBNAME@ -lopenimagelib_il \
-L${libdir}/openlibraries-@OL_MAJOR@.@OL_MINOR@.@OL_SUB@/openmedialib/@OL_LIBNAME@ -lopenmedialib_ml \
-L${libdir}/openlibraries-@OL_MAJOR@.@OL_MINOR@.@OL_SUB@/openpluginlib/@OL_LIBNAME@ -lopenpluginlib_pl \
Modified: trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/src/openassetlib/plugins/sqlite/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -32,7 +32,6 @@
libopenassetlib_sqlite3_plugin_la_LDFLAGS = \
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
- $(BOOST_LIB_RPATH) \
-version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE)
libopenassetlib_sqlite3_plugin_ladir = $(OPENASSETLIB_PLUGINPATH)
Modified: trunk/lib/openlibraries/src/openassetlib/py/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openassetlib/py/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/src/openassetlib/py/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -32,7 +32,6 @@
libopenassetlib_py_la_LDFLAGS = \
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
- $(BOOST_LIB_RPATH) \
-version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE)
endif
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/png/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/png/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/png/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -13,16 +13,17 @@
libopenimagelib_png_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
+ $(PNG_CFLAGS) \
$(BOOST_INCLUDE_PATH) \
-DIL_EXPORTS
libopenimagelib_png_la_LIBADD = \
$(top_builddir)/src/openpluginlib/pl/libopenpluginlib_pl.la \
- $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la \
- $(PNG_LIBS)
+ $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la
libopenimagelib_png_la_LDFLAGS = \
$(OLIB_LDFLAGS) \
+ $(PNG_LDFLAGS) \
$(BOOST_LIB_PATH) \
-version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE)
Modified: trunk/lib/openlibraries/src/openimagelib/py/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/py/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/src/openimagelib/py/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -26,7 +26,6 @@
libopenimagelib_py_la_LDFLAGS = \
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
- $(BOOST_LIB_RPATH) \
-version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE)
endif
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/openal/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/openal/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/openal/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -28,9 +28,7 @@
libopenmedialib_openal_la_LDFLAGS = \
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
- $(BOOST_LIB_RPATH) \
$(OPENAL_LIB_PATH) \
- $(OPENAL_LIB_RPATH) \
-version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE)
libopenmedialib_openal_ladir = $(OPENMEDIALIB_PLUGINPATH)
Modified: trunk/lib/openlibraries/src/openmedialib/py/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/py/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/src/openmedialib/py/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -26,7 +26,6 @@
libopenmedialib_py_la_LDFLAGS = \
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
- $(BOOST_LIB_RPATH) \
-version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE)
endif
Modified: trunk/lib/openlibraries/src/openobjectlib/sg/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openobjectlib/sg/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/src/openobjectlib/sg/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -57,8 +57,6 @@
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
$(GLEW_LIB_PATH) \
- $(BOOST_LIB_RPATH) \
- $(GLEW_LIB_RPATH) \
-version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE)
library_includedir = $(OPENLIBRARIES_INCLUDEPATH)/openobjectlib/sg
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -93,8 +93,6 @@
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
$(GLEW_LIB_PATH) \
- $(BOOST_LIB_RPATH) \
- $(GLEW_LIB_RPATH) \
-version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE)
library_includedir = $(OPENLIBRARIES_INCLUDEPATH)/openpluginlib/pl
Modified: trunk/lib/openlibraries/src/openpluginlib/py/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/py/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/src/openpluginlib/py/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -46,8 +46,6 @@
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
$(GLEW_LIB_PATH) \
- $(BOOST_LIB_RPATH) \
- $(GLEW_LIB_RPATH) \
-version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE)
endif
Modified: trunk/lib/openlibraries/test/openeffectslib/tm_bench/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openeffectslib/tm_bench/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openeffectslib/tm_bench/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -15,8 +15,7 @@
tm_bench_LDFLAGS = \
$(OLIB_LDFLAGS) \
- $(BOOST_LIB_PATH) \
- $(BOOST_LIB_RPATH)
+ $(BOOST_LIB_PATH)
tm_bench_LDADD = \
$(BOOST_FILESYSTEM_LIBS) \
Modified: trunk/lib/openlibraries/test/openimagelib/GL/_2D/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openimagelib/GL/_2D/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openimagelib/GL/_2D/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -17,9 +17,7 @@
_2D_LDFLAGS = \
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
- $(GLEW_LIB_PATH) \
- $(BOOST_LIB_RPATH) \
- $(GLEW_LIB_RPATH)
+ $(GLEW_LIB_PATH)
_2D_LDADD = \
$(OPENGL_LIBS) \
Modified: trunk/lib/openlibraries/test/openimagelib/GL/_2D_compressed/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openimagelib/GL/_2D_compressed/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openimagelib/GL/_2D_compressed/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -17,9 +17,7 @@
_2D_compressed_LDFLAGS = \
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
- $(GLEW_LIB_PATH) \
- $(BOOST_LIB_RPATH) \
- $(GLEW_LIB_RPATH)
+ $(GLEW_LIB_PATH)
_2D_compressed_LDADD = \
$(OPENGL_LIBS) \
Modified: trunk/lib/openlibraries/test/openimagelib/GL/_2D_compressed_cubemap/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openimagelib/GL/_2D_compressed_cubemap/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openimagelib/GL/_2D_compressed_cubemap/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -17,9 +17,7 @@
_2D_compressed_cubemap_LDFLAGS = \
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
- $(GLEW_LIB_PATH) \
- $(BOOST_LIB_RPATH) \
- $(GLEW_LIB_RPATH)
+ $(GLEW_LIB_PATH)
_2D_compressed_cubemap_LDADD = \
$(OPENGL_LIBS) \
Modified: trunk/lib/openlibraries/test/openimagelib/GL/_2D_crop/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openimagelib/GL/_2D_crop/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openimagelib/GL/_2D_crop/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -17,9 +17,7 @@
_2D_crop_LDFLAGS = \
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
- $(GLEW_LIB_PATH) \
- $(BOOST_LIB_RPATH) \
- $(GLEW_LIB_RPATH)
+ $(GLEW_LIB_PATH)
_2D_crop_LDADD = \
$(OPENGL_LIBS) \
Modified: trunk/lib/openlibraries/test/openimagelib/GL/_2D_crop2/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openimagelib/GL/_2D_crop2/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openimagelib/GL/_2D_crop2/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -17,9 +17,7 @@
_2D_crop2_LDFLAGS = \
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
- $(GLEW_LIB_PATH) \
- $(BOOST_LIB_RPATH) \
- $(GLEW_LIB_RPATH)
+ $(GLEW_LIB_PATH)
_2D_crop2_LDADD = \
$(OPENGL_LIBS) \
Modified: trunk/lib/openlibraries/test/openimagelib/GL/_2D_exr/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openimagelib/GL/_2D_exr/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openimagelib/GL/_2D_exr/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -17,9 +17,7 @@
_2D_exr_LDFLAGS = \
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
- $(GLEW_LIB_PATH) \
- $(BOOST_LIB_RPATH) \
- $(GLEW_LIB_RPATH)
+ $(GLEW_LIB_PATH)
_2D_exr_LDADD = \
$(OPENGL_LIBS) \
Modified: trunk/lib/openlibraries/test/openimagelib/GL/_2D_scale/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openimagelib/GL/_2D_scale/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openimagelib/GL/_2D_scale/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -16,9 +16,7 @@
_2D_scale_LDFLAGS = \
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
- $(GLEW_LIB_PATH) \
- $(BOOST_LIB_RPATH) \
- $(GLEW_LIB_RPATH)
+ $(GLEW_LIB_PATH)
_2D_scale_LDADD = \
$(OPENGL_LIBS) \
Modified: trunk/lib/openlibraries/test/openimagelib/GL/_2D_sgi/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openimagelib/GL/_2D_sgi/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openimagelib/GL/_2D_sgi/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -17,9 +17,7 @@
_2D_sgi_LDFLAGS = \
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
- $(GLEW_LIB_PATH) \
- $(BOOST_LIB_RPATH) \
- $(GLEW_LIB_RPATH)
+ $(GLEW_LIB_PATH)
_2D_sgi_LDADD = \
$(OPENGL_LIBS) \
Modified: trunk/lib/openlibraries/test/openmedialib/player/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openmedialib/player/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openmedialib/player/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -13,9 +13,7 @@
player_LDFLAGS = \
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
- $(GLEW_LIB_PATH) \
- $(BOOST_LIB_RPATH) \
- $(GLEW_LIB_RPATH)
+ $(GLEW_LIB_PATH)
player_LDADD = \
$(OPENGL_LIBS) \
Modified: trunk/lib/openlibraries/test/openmedialib/store/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openmedialib/store/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openmedialib/store/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -10,8 +10,7 @@
-DOPENMEDIALIB_PLUGINS=\"$(OPENMEDIALIB_PLUGINPATH)\"
store_LDFLAGS = \
- $(OLIB_LDFLAGS) \
- $(BOOST_LIB_RPATH)
+ $(OLIB_LDFLAGS)
store_LDADD = \
$(BOOST_FILESYSTEM_LIBS) \
Modified: trunk/lib/openlibraries/test/openobjectlib/GL/multipass_draw/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openobjectlib/GL/multipass_draw/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openobjectlib/GL/multipass_draw/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -16,9 +16,7 @@
-DOPENPLUGINS=\"$(OPENIMAGELIB_PLUGINPATH):$(OPENOBJECTLIB_PLUGINPATH)\"
multipass_draw_LDFLAGS = \
- $(OLIB_LDFLAGS) \
- $(BOOST_LIB_RPATH) \
- $(GLEW_LIB_RPATH)
+ $(OLIB_LDFLAGS)
multipass_draw_LDADD = \
$(OPENGL_LIBS) \
Modified: trunk/lib/openlibraries/test/openobjectlib/GL/noise_volume/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openobjectlib/GL/noise_volume/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openobjectlib/GL/noise_volume/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -16,9 +16,7 @@
-DOPENPLUGINS=\"$(OPENIMAGELIB_PLUGINPATH):$(OPENOBJECTLIB_PLUGINPATH)\"
noise_volume_LDFLAGS = \
- $(OLIB_LDFLAGS) \
- $(BOOST_LIB_RPATH) \
- $(GLEW_LIB_RPATH)
+ $(OLIB_LDFLAGS)
noise_volume_LDADD = \
$(OPENGL_LIBS) \
Modified: trunk/lib/openlibraries/test/openobjectlib/GL/obj_draw/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openobjectlib/GL/obj_draw/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openobjectlib/GL/obj_draw/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -16,9 +16,7 @@
-DOPENPLUGINS=\"$(OPENIMAGELIB_PLUGINPATH):$(OPENOBJECTLIB_PLUGINPATH)\"
obj_draw_LDFLAGS = \
- $(OLIB_LDFLAGS) \
- $(BOOST_LIB_RPATH) \
- $(GLEW_LIB_RPATH)
+ $(OLIB_LDFLAGS)
obj_draw_LDADD = \
$(OPENGL_LIBS) \
Modified: trunk/lib/openlibraries/test/openobjectlib/GL/texture_draw/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openobjectlib/GL/texture_draw/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openobjectlib/GL/texture_draw/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -15,9 +15,7 @@
$(OIL_CXXFLAGS)
texture_draw_LDFLAGS = \
- $(OLIB_LDFLAGS) \
- $(BOOST_LIB_RPATH) \
- $(GLEW_LIB_RPATH)
+ $(OLIB_LDFLAGS)
texture_draw_LDADD = \
$(OPENGL_LIBS) \
Modified: trunk/lib/openlibraries/test/openpluginlib/discovery/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openpluginlib/discovery/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openpluginlib/discovery/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -13,8 +13,7 @@
$(BOOST_INCLUDE_PATH)
discovery_LDFLAGS = \
- $(OLIB_LDFLAGS) \
- $(BOOST_LIB_RPATH)
+ $(OLIB_LDFLAGS)
discovery_LDADD = \
$(BOOST_FILESYSTEM_LIBS) \
Modified: trunk/lib/openlibraries/test/openpluginlib/enumerate/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openpluginlib/enumerate/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openpluginlib/enumerate/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -13,8 +13,7 @@
$(BOOST_INCLUDE_PATH)
enumerate_LDFLAGS = \
- $(OLIB_LDFLAGS) \
- $(BOOST_LIB_RPATH)
+ $(OLIB_LDFLAGS)
enumerate_LDADD = \
$(BOOST_FILESYSTEM_LIBS) \
Modified: trunk/lib/openlibraries/test/openpluginlib/gettimeofday/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openpluginlib/gettimeofday/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openpluginlib/gettimeofday/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -15,9 +15,7 @@
gettimeofday_LDFLAGS = \
$(OLIB_LDFLAGS) \
- $(GLEW_LIB_PATH) \
- $(BOOST_LIB_RPATH) \
- $(GLEW_LIB_RPATH)
+ $(GLEW_LIB_PATH)
gettimeofday_LDADD = \
$(BOOST_FILESYSTEM_LIBS) \
Modified: trunk/lib/openlibraries/test/openpluginlib/gpu_timer_query/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openpluginlib/gpu_timer_query/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openpluginlib/gpu_timer_query/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -16,9 +16,7 @@
gpu_timer_query_LDFLAGS = \
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
- $(GLEW_LIB_PATH) \
- $(BOOST_LIB_RPATH) \
- $(GLEW_LIB_RPATH)
+ $(GLEW_LIB_PATH)
gpu_timer_query_LDADD = \
$(OPENGL_LIBS) \
Modified: trunk/lib/openlibraries/test/openpluginlib/initialization/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openpluginlib/initialization/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openpluginlib/initialization/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -14,8 +14,7 @@
# end
initialization_LDFLAGS = \
- $(OLIB_LDFLAGS) \
- $(BOOST_LIB_RPATH)
+ $(OLIB_LDFLAGS)
initialization_LDADD = \
$(BOOST_FILESYSTEM_LIBS) \
Modified: trunk/lib/openlibraries/test/openpluginlib/pcos/key/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openpluginlib/pcos/key/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openpluginlib/pcos/key/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -13,8 +13,7 @@
$(BOOST_INCLUDE_PATH)
key_LDFLAGS = \
- $(OLIB_LDFLAGS) \
- $(BOOST_LIB_RPATH)
+ $(OLIB_LDFLAGS)
key_LDADD = \
$(top_builddir)/src/openpluginlib/pl/libopenpluginlib_pl.la \
Modified: trunk/lib/openlibraries/test/openpluginlib/pcos/property/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openpluginlib/pcos/property/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openpluginlib/pcos/property/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -13,8 +13,7 @@
$(BOOST_INCLUDE_PATH)
property_LDFLAGS = \
- $(OLIB_LDFLAGS) \
- $(BOOST_LIB_RPATH)
+ $(OLIB_LDFLAGS)
property_LDADD = \
$(top_builddir)/src/openpluginlib/pl/libopenpluginlib_pl.la \
Modified: trunk/lib/openlibraries/test/openpluginlib/pcos/property_container/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openpluginlib/pcos/property_container/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openpluginlib/pcos/property_container/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -13,8 +13,7 @@
$(BOOST_INCLUDE_PATH)
property_container_LDFLAGS = \
- $(OLIB_LDFLAGS) \
- $(BOOST_LIB_RPATH)
+ $(OLIB_LDFLAGS)
property_container_LDADD = \
$(top_builddir)/src/openpluginlib/pl/libopenpluginlib_pl.la \
Modified: trunk/lib/openlibraries/test/openpluginlib/pcos/subject-observer/Makefile.am
===================================================================
--- trunk/lib/openlibraries/test/openpluginlib/pcos/subject-observer/Makefile.am 2007-11-08 23:36:41 UTC (rev 381)
+++ trunk/lib/openlibraries/test/openpluginlib/pcos/subject-observer/Makefile.am 2007-11-10 21:14:24 UTC (rev 382)
@@ -13,8 +13,7 @@
$(BOOST_INCLUDE_PATH)
subjectobserver_LDFLAGS = \
- $(OLIB_LDFLAGS) \
- $(BOOST_LIB_RPATH)
+ $(OLIB_LDFLAGS)
subjectobserver_LDADD = \
$(top_builddir)/src/openpluginlib/pl/libopenpluginlib_pl.la \
Modified: trunk/lib/openlibraries/test/openpluginlib/rdtsc/Makefile.am
===================================================================
--- trunk/lib/openlibraries/t...
[truncated message content] |
|
From: <gl...@us...> - 2007-11-13 21:52:04
|
Revision: 383
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=383&view=rev
Author: glslang
Date: 2007-11-13 13:51:58 -0800 (Tue, 13 Nov 2007)
Log Message:
-----------
+ bug fixes
Modified Paths:
--------------
trunk/lib/openlibraries/installer/openlibraries_sdk.nsi
trunk/lib/openlibraries/openlibraries_vc8.sln
trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.cpp
Modified: trunk/lib/openlibraries/installer/openlibraries_sdk.nsi
===================================================================
--- trunk/lib/openlibraries/installer/openlibraries_sdk.nsi 2007-11-10 21:14:24 UTC (rev 382)
+++ trunk/lib/openlibraries/installer/openlibraries_sdk.nsi 2007-11-13 21:51:58 UTC (rev 383)
@@ -228,8 +228,8 @@
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-${VERSION}.dll"
- File "..\src\openimagelib\plugins\jpg\jpg_plugin.opl"
- File "..\src\openimagelib\plugins\jpg\Multi-threaded Debug DLL\openimagelib_jpg-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-${VERSION}.dll"
File "..\src\openimagelib\plugins\sgi\sgi_plugin.opl"
File "..\src\openimagelib\plugins\sgi\Multi-threaded Debug DLL\openimagelib_sgi-vc80-d-${VERSION}.dll"
File "..\src\openimagelib\plugins\tga\tga_plugin.opl"
@@ -244,8 +244,8 @@
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-${VERSION}.dll"
- File "..\src\openobjectlib\plugins\obj\obj_plugin.opl"
- File "..\src\openobjectlib\plugins\obj\Multi-threaded Debug DLL\openobjectlib_obj-vc80-d-${VERSION}.dll"
+ File "..\src\openobjectlib\plugins\wavefront\obj_plugin.opl"
+ File "..\src\openobjectlib\plugins\wavefront\Multi-threaded Debug DLL\openobjectlib_obj-vc80-d-${VERSION}.dll"
File "..\src\openobjectlib\plugins\X3D\x3d_plugin.opl"
File "..\src\openobjectlib\plugins\X3D\Multi-threaded Debug DLL\openobjectlib_x3d-vc80-d-${VERSION}.dll"
File "..\src\openassetlib\plugins\sqlite\sqlite3_metadata_plugin.opl"
@@ -266,8 +266,8 @@
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-${VERSION}.dll"
- File "..\src\openimagelib\plugins\jpg\jpg_plugin.opl"
- File "..\src\openimagelib\plugins\jpg\Multi-threaded Release DLL\openimagelib_jpg-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-${VERSION}.dll"
File "..\src\openimagelib\plugins\sgi\sgi_plugin.opl"
File "..\src\openimagelib\plugins\sgi\Multi-threaded Release DLL\openimagelib_sgi-vc80-r-${VERSION}.dll"
File "..\src\openimagelib\plugins\tga\tga_plugin.opl"
@@ -282,8 +282,8 @@
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-${VERSION}.dll"
- File "..\src\openobjectlib\plugins\obj\obj_plugin.opl"
- File "..\src\openobjectlib\plugins\obj\Multi-threaded Release DLL\openobjectlib_obj-vc80-r-${VERSION}.dll"
+ File "..\src\openobjectlib\plugins\wavefront\obj_plugin.opl"
+ File "..\src\openobjectlib\plugins\wavefront\Multi-threaded Release DLL\openobjectlib_obj-vc80-r-${VERSION}.dll"
File "..\src\openobjectlib\plugins\X3D\x3d_plugin.opl"
File "..\src\openobjectlib\plugins\X3D\Multi-threaded Release DLL\openobjectlib_x3d-vc80-r-${VERSION}.dll"
File "..\src\openeffectslib\plugins\tonemap\tonemap_plugin.opl"
Modified: trunk/lib/openlibraries/openlibraries_vc8.sln
===================================================================
--- trunk/lib/openlibraries/openlibraries_vc8.sln 2007-11-10 21:14:24 UTC (rev 382)
+++ trunk/lib/openlibraries/openlibraries_vc8.sln 2007-11-13 21:51:58 UTC (rev 383)
@@ -375,6 +375,18 @@
{DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "avformat", "src\openmedialib\plugins\avformat\avformat_vc8.vcproj", "{0C4F7499-83C6-4143-A392-56F299345E8A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
+ {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openal", "src\openmedialib\plugins\openal\openal_vc8.vcproj", "{68B4BE77-E59E-4A24-9AF5-D4CEFF132B51}"
+ ProjectSection(ProjectDependencies) = postProject
+ {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Multi-threaded Debug DLL|Win32 = Multi-threaded Debug DLL|Win32
@@ -605,6 +617,14 @@
{AE1793B8-18EA-4277-BFDD-8C9F2AFA0096}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{AE1793B8-18EA-4277-BFDD-8C9F2AFA0096}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{AE1793B8-18EA-4277-BFDD-8C9F2AFA0096}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
+ {0C4F7499-83C6-4143-A392-56F299345E8A}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
+ {0C4F7499-83C6-4143-A392-56F299345E8A}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
+ {0C4F7499-83C6-4143-A392-56F299345E8A}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
+ {0C4F7499-83C6-4143-A392-56F299345E8A}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
+ {68B4BE77-E59E-4A24-9AF5-D4CEFF132B51}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
+ {68B4BE77-E59E-4A24-9AF5-D4CEFF132B51}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
+ {68B4BE77-E59E-4A24-9AF5-D4CEFF132B51}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
+ {68B4BE77-E59E-4A24-9AF5-D4CEFF132B51}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -671,6 +691,8 @@
{A60E2710-2DA9-4641-AEF6-6488A6264723} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
{C29BD9EC-EC1B-4D7F-8985-F85698CE66ED} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
{1AC3D22B-175B-4169-B74A-276F9D5BA7AB} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
+ {0C4F7499-83C6-4143-A392-56F299345E8A} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
+ {68B4BE77-E59E-4A24-9AF5-D4CEFF132B51} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
{DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {BD86F550-C573-4A68-955B-6CEDCC8F595D}
{7A98C731-F651-4427-BD02-25133DEA7171} = {9483FC7B-E396-43E6-84ED-EB021AC54252}
{AE1793B8-18EA-4277-BFDD-8C9F2AFA0096} = {9483FC7B-E396-43E6-84ED-EB021AC54252}
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.cpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.cpp 2007-11-10 21:14:24 UTC (rev 382)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.cpp 2007-11-13 21:51:58 UTC (rev 383)
@@ -74,7 +74,7 @@
else
filter = str.second.out_filter;
- if( !str_.empty( ) && str_.find( filter ) == wstring::npos )
+ if( str_.find( filter ) == wstring::npos )
str_ += filter + wstring( L" " );
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-12-01 17:48:18
|
Revision: 385
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=385&view=rev
Author: glslang
Date: 2007-12-01 09:48:15 -0800 (Sat, 01 Dec 2007)
Log Message:
-----------
+ patch libtool to control generated install names on OS/X
Modified Paths:
--------------
trunk/lib/openlibraries/configure.ac
Added Paths:
-----------
trunk/lib/openlibraries/m4/install_name.m4
Modified: trunk/lib/openlibraries/configure.ac
===================================================================
--- trunk/lib/openlibraries/configure.ac 2007-11-18 13:37:44 UTC (rev 384)
+++ trunk/lib/openlibraries/configure.ac 2007-12-01 17:48:15 UTC (rev 385)
@@ -43,6 +43,8 @@
AC_PROG_LIBTOOL
AC_SUBST(LIBTOOL_DEPS)
+AC_CHECK_INSTALLNAME( )
+
dnl dl support
AC_CHECK_LIB(dl, dlopen,
have_dl=yes DL_LIBS="-ldl",
Added: trunk/lib/openlibraries/m4/install_name.m4
===================================================================
--- trunk/lib/openlibraries/m4/install_name.m4 (rev 0)
+++ trunk/lib/openlibraries/m4/install_name.m4 2007-12-01 17:48:15 UTC (rev 385)
@@ -0,0 +1,25 @@
+
+#
+# change libtool install_name defaults on OS/X
+#
+
+AC_DEFUN([AC_CHECK_INSTALLNAME],[
+ AC_ARG_ENABLE(installname, AC_HELP_STRING([--enable-installname], [enable install name]),
+ [enableinstallname=$enableval],
+ [enableinstallname=no])
+ AC_ARG_WITH(installnameprefix, AC_HELP_STRING([--with-installnameprefix], [install name prefix]),,with_installnameprefix="")
+
+ case $host in
+ *-apple-darwin*)
+ AC_MSG_CHECKING(libtool for install name)
+ if test x"$enableinstallname" = x"yes" ; then
+ test -f libtool || (mv libtool libtool.old && cp libtool.old libtool)
+ sed -e "s/install_name \\\\\$rpath\/\\\\\$soname/install_name $with_installnameprefix\/\\\\\$soname/g" libtool > libtool.new
+ mv libtool.new libtool
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+ fi
+ ;;
+ esac
+])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2008-01-26 21:24:25
|
Revision: 402
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=402&view=rev
Author: glslang
Date: 2008-01-26 13:24:22 -0800 (Sat, 26 Jan 2008)
Log Message:
-----------
+build fixes
Modified Paths:
--------------
trunk/lib/openlibraries/installer/openlibraries_sdk.nsi
trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_plugin.cpp
Modified: trunk/lib/openlibraries/installer/openlibraries_sdk.nsi
===================================================================
--- trunk/lib/openlibraries/installer/openlibraries_sdk.nsi 2008-01-14 21:17:51 UTC (rev 401)
+++ trunk/lib/openlibraries/installer/openlibraries_sdk.nsi 2008-01-26 21:24:22 UTC (rev 402)
@@ -130,6 +130,7 @@
File ..\src\openimagelib\il\traits.hpp
File ..\src\openimagelib\il\utility.hpp
File ..\src\openimagelib\il\yuv_traits.hpp
+ File ..\src\openimagelib\il\lut_functions.hpp
SetOutPath $INSTDIR\include\openlibraries-${VERSION_DOT}\openmedialib\ml
File ..\src\openmedialib\ml\audio.hpp
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_plugin.cpp 2008-01-14 21:17:51 UTC (rev 401)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_plugin.cpp 2008-01-26 21:24:22 UTC (rev 402)
@@ -312,7 +312,7 @@
// Close the output file
if ( !( fmt_->flags & AVFMT_NOFILE ) )
- url_fclose( &oc_->pb );
+ url_fclose( oc_->pb );
// Free the context
av_free( oc_ );
@@ -1160,7 +1160,7 @@
int error = av_open_input_file( &context_, opl::to_string( resource ).c_str( ), format_, 0, params_ ) < 0;
// Check for streaming
- if ( error == 0 && url_is_streamed( &context_->pb ) )
+ if ( error == 0 && url_is_streamed( context_->pb ) )
{
is_seekable_ = false;
key_search_ = true;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2008-02-09 13:31:56
|
Revision: 409
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=409&view=rev
Author: glslang
Date: 2008-02-09 05:31:51 -0800 (Sat, 09 Feb 2008)
Log Message:
-----------
+ build updates (removal of not-needed libs)
Modified Paths:
--------------
trunk/lib/openlibraries/installer/hdrflow_runtime.nsi
trunk/lib/openlibraries/installer/hdrflow_sdk.nsi
trunk/lib/openlibraries/openlibraries_vc8.sln
Modified: trunk/lib/openlibraries/installer/hdrflow_runtime.nsi
===================================================================
--- trunk/lib/openlibraries/installer/hdrflow_runtime.nsi 2008-02-06 22:59:49 UTC (rev 408)
+++ trunk/lib/openlibraries/installer/hdrflow_runtime.nsi 2008-02-09 13:31:51 UTC (rev 409)
@@ -1,5 +1,5 @@
;--------------------------------
-;NSIS OpenLibraries Installation Script
+;NSIS HDRFlow Installation Script
;--------------------------------
!ifndef VERSION
@@ -13,15 +13,15 @@
!ifdef OUTFILE
OutFile "${OUTFILE}"
!else
- OutFile openlibraries-${VERSION_DOT}-runtime.exe
+ OutFile hdrflow-${VERSION_DOT}-runtime.exe
!endif
SetCompressor /SOLID lzma
InstType "Full"
-InstallDir $PROGRAMFILES\OpenLibraries
-InstallDirRegKey HKLM Software\OpenLibraries ""
+InstallDir $PROGRAMFILES\HDRFlow
+InstallDirRegKey HKLM Software\HDRFlow ""
;--------------------------------
;Header Files
@@ -34,8 +34,8 @@
!include "write_env_str.nsh"
;Names
-Name "OpenLibraries"
-Caption "OpenLibraries (v.${VERSION_DOT}) Setup"
+Name "HDRFlow"
+Caption "HDRFlow (v.${VERSION_DOT}) Setup"
;Interface Settings
!define MUI_ABORTWARNING
@@ -47,8 +47,8 @@
!define MUI_COMPONENTSPAGE_SMALLDESC
;Pages
-!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"
+!define MUI_WELCOMEPAGE_TITLE "Welcome to the HDRFlow (v.${VERSION_DOT}) Setup Wizard"
+!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of HDRFlow.\r\n\r\n$_CLICK"
!insertmacro MUI_PAGE_WELCOME
!insertmacro MUI_PAGE_LICENSE "..\COPYING"
@@ -57,7 +57,7 @@
!insertmacro MUI_PAGE_INSTFILES
!define MUI_FINISHPAGE_LINK "Visit the web site for the latest news, FAQs and support"
-!define MUI_FINISHPAGE_LINK_LOCATION "http://www.openlibraries.org/"
+!define MUI_FINISHPAGE_LINK_LOCATION "http://www.hdrflow.com/"
!insertmacro MUI_PAGE_FINISH
@@ -69,10 +69,10 @@
!insertmacro MUI_LANGUAGE "English"
-Section "OpenLibraries" SecCore
+Section "HDRFlow" SecCore
SetDetailsPrint textonly
- DetailPrint "Installing OpenLibraries..."
+ DetailPrint "Installing HDRFlow..."
SetDetailsPrint listonly
SectionIn 1 2 3 RO
@@ -84,12 +84,10 @@
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"
- File "C:\Program Files\FFmpeg\lib\avformat-51.dll"
+ File "C:\Program Files\FFmpeg\lib\avformat-52.dll"
File "C:\Program Files\FFmpeg\lib\avutil-49.dll"
File "C:\OpenEXR\bin\Release\Half.dll"
File "C:\OpenEXR\bin\Release\Iex.dll"
@@ -106,7 +104,6 @@
File "..\src\openpluginlib\py\Multi-threaded Release DLL\HDRFlowPlugin.pyd"
File "..\src\openimagelib\py\Multi-threaded Release DLL\HDRFlowImage.pyd"
File "..\src\openmedialib\py\Multi-threaded Release DLL\HDRFlowMedia.pyd"
- File "..\src\openassetlib\py\Multi-threaded Release DLL\HDRFlowAsset.pyd"
SetOutPath $INSTDIR\plugins\release
File "..\src\openimagelib\plugins\3D_lightmap\3D_lightmap_plugin.opl"
@@ -121,28 +118,26 @@
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-${VERSION}.dll"
- File "..\src\openimagelib\plugins\jpg\jpg_plugin.opl"
- File "..\src\openimagelib\plugins\jpg\Multi-threaded Release DLL\openimagelib_jpg-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-${VERSION}.dll"
File "..\src\openimagelib\plugins\sgi\sgi_plugin.opl"
File "..\src\openimagelib\plugins\sgi\Multi-threaded Release DLL\openimagelib_sgi-vc80-r-${VERSION}.dll"
File "..\src\openimagelib\plugins\tga\tga_plugin.opl"
File "..\src\openimagelib\plugins\tga\Multi-threaded Release DLL\openimagelib_tga-vc80-r-${VERSION}.dll"
File "..\src\openmedialib\plugins\oil\oil_plugin.opl"
File "..\src\openmedialib\plugins\oil\Multi-threaded Release DLL\openmedialib_oil-vc80-r-${VERSION}.dll"
- File "..\src\openmedialib\plugins\gensys\gensys_plugin.opl"
- File "..\src\openmedialib\plugins\gensys\Multi-threaded Release DLL\openmedialib_gensys-vc80-r-${VERSION}.dll"
- File "..\src\openmedialib\plugins\quicktime\quicktime_plugin.opl"
- File "..\src\openmedialib\plugins\quicktime\Multi-threaded Release DLL\openmedialib_quicktime-vc80-r-${VERSION}.dll"
+; File "..\src\openmedialib\plugins\gensys\gensys_plugin.opl"
+; File "..\src\openmedialib\plugins\gensys\Multi-threaded Release DLL\openmedialib_gensys-vc80-r-${VERSION}.dll"
+; File "..\src\openmedialib\plugins\quicktime\quicktime_plugin.opl"
+; File "..\src\openmedialib\plugins\quicktime\Multi-threaded Release DLL\openmedialib_quicktime-vc80-r-${VERSION}.dll"
File "..\src\openmedialib\plugins\ofx\ofx_plugin.opl"
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-${VERSION}.dll"
- File "..\src\openobjectlib\plugins\obj\obj_plugin.opl"
- File "..\src\openobjectlib\plugins\obj\Multi-threaded Release DLL\openobjectlib_obj-vc80-r-${VERSION}.dll"
- File "..\src\openobjectlib\plugins\X3D\x3d_plugin.opl"
- File "..\src\openobjectlib\plugins\X3D\Multi-threaded Release DLL\openobjectlib_x3d-vc80-r-${VERSION}.dll"
- File "..\src\openassetlib\plugins\sqlite\sqlite3_metadata_plugin.opl"
- File "..\src\openassetlib\plugins\sqlite\Multi-threaded Release DLL\openassetlib_sqlite-vc80-r-${VERSION}.dll"
+; File "..\src\openobjectlib\plugins\3ds\3ds_plugin.opl"
+; File "..\src\openobjectlib\plugins\3ds\Multi-threaded Release DLL\openobjectlib_3ds-vc80-r-${VERSION}.dll"
+; File "..\src\openobjectlib\plugins\obj\obj_plugin.opl"
+; File "..\src\openobjectlib\plugins\obj\Multi-threaded Release DLL\openobjectlib_obj-vc80-r-${VERSION}.dll"
+; File "..\src\openobjectlib\plugins\X3D\x3d_plugin.opl"
+; File "..\src\openobjectlib\plugins\X3D\Multi-threaded Release DLL\openobjectlib_x3d-vc80-r-${VERSION}.dll"
File "..\src\openeffectslib\plugins\tonemap\tonemap_plugin.opl"
File "..\src\openeffectslib\plugins\tonemap\Multi-threaded Release DLL\openeffectslib_tonemap-vc80-r-${VERSION}.dll"
@@ -180,19 +175,19 @@
;--------------------------------
;Registry
-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"
+WriteRegStr HKLM "Software\HDRFlow" "CurrentVersion" "${VERSION_DOT}"
+WriteRegStr HKLM "Software\HDRFlow" "PluginsDirRelease" "$INSTDIR\plugins\release"
+WriteRegStr HKLM "Software\HDRFlow" "KernelsDir" "$INSTDIR\kernels"
+WriteRegStr HKLM "Software\HDRFlow" "ShadersDir" "$INSTDIR\shaders"
-WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenLibraries" "DisplayName" "OpenLibraries"
-WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenLibraries" "UninstallString" "$INSTDIR\uninst-openlibraries.exe"
+WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HDRFlow" "DisplayName" "HDRFlow"
+WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HDRFlow" "UninstallString" "$INSTDIR\uninst-hdrflow.exe"
SectionEnd
Section -post
- WriteUninstaller $INSTDIR\uninst-openlibraries.exe
+ WriteUninstaller $INSTDIR\uninst-hdrflow.exe
SectionEnd
@@ -200,7 +195,7 @@
;Descriptions
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
- !insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "OpenLibraries development and runtime files"
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "HDRFlow development and runtime files"
!insertmacro MUI_FUNCTION_DESCRIPTION_END
;--------------------------------
@@ -212,8 +207,8 @@
DetailPrint "Deleting Files..."
SetDetailsPrint listonly
- DeleteRegKey HKLM "Software\OpenLibraries"
- DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenLibraries"
+ DeleteRegKey HKLM "Software\HDRFlow"
+ DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HDRFlow"
Push "$INSTDIR\bin"
Call un.RemoveFromPath
@@ -238,11 +233,11 @@
Function .onInit
- ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenLibraries" "UninstallString"
+ ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HDRFlow" "UninstallString"
StrCmp $R0 "" done
MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
- "OpenLibraries is already installed. $\n$\nClick `OK` to remove the \
+ "HDRFlow is already installed. $\n$\nClick `OK` to remove the \
previous version or `Cancel` to cancel this upgrade." \
IDOK uninst
Abort
@@ -264,7 +259,7 @@
goto done
no_remove_uninstaller:
MessageBox MB_ICONEXCLAMATION \
- "Unable to remove previous version of OpenLibraries"
+ "Unable to remove previous version of HDRFlow"
Abort
done:
Modified: trunk/lib/openlibraries/installer/hdrflow_sdk.nsi
===================================================================
--- trunk/lib/openlibraries/installer/hdrflow_sdk.nsi 2008-02-06 22:59:49 UTC (rev 408)
+++ trunk/lib/openlibraries/installer/hdrflow_sdk.nsi 2008-02-09 13:31:51 UTC (rev 409)
@@ -1,5 +1,5 @@
;--------------------------------
-;NSIS OpenLibraries Installation Script
+;NSIS HDRFlow Installation Script
;--------------------------------
!ifndef VERSION
@@ -69,7 +69,7 @@
!insertmacro MUI_LANGUAGE "English"
-Section "OpenLibraries" SecCore
+Section "HDRFlow" SecCore
SetDetailsPrint textonly
DetailPrint "Installing HDRFlow SDK..."
@@ -142,15 +142,6 @@
File ..\src\openmedialib\ml\openmedialib_plugin.hpp
File ..\src\openmedialib\ml\store.hpp
File ..\src\openmedialib\ml\utilities.hpp
-
- SetOutPath $INSTDIR\include\hdrflow-${VERSION_DOT}\openassetlib\al
- File ..\src\openassetlib\al\al.hpp
- File ..\src\openassetlib\al\al_plugin.hpp
- File ..\src\openassetlib\al\asset.hpp
- File ..\src\openassetlib\al\base64_codec.hpp
- File ..\src\openassetlib\al\config.hpp
- File ..\src\openassetlib\al\guid.hpp
- File ..\src\openassetlib\al\set.hpp
SetOutPath $INSTDIR\bin
File "..\src\openpluginlib\pl\Multi-threaded Debug DLL\openpluginlib_pl-vc80-d-${VERSION}.dll"
@@ -159,10 +150,6 @@
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"
@@ -183,7 +170,6 @@
File "..\src\openpluginlib\py\Multi-threaded Debug DLL\HDRFlowPlugin.pyd"
File "..\src\openimagelib\py\Multi-threaded Debug DLL\HDRFlowImage.pyd"
File "..\src\openmedialib\py\Multi-threaded Debug DLL\HDRFlowMedia.pyd"
- 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-${VERSION}.lib"
@@ -192,10 +178,6 @@
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"
@@ -230,8 +212,6 @@
; File "..\src\openobjectlib\plugins\wavefront\Multi-threaded Debug DLL\openobjectlib_obj-vc80-d-${VERSION}.dll"
; File "..\src\openobjectlib\plugins\X3D\x3d_plugin.opl"
; File "..\src\openobjectlib\plugins\X3D\Multi-threaded Debug DLL\openobjectlib_x3d-vc80-d-${VERSION}.dll"
- File "..\src\openassetlib\plugins\sqlite\sqlite3_metadata_plugin.opl"
- 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-${VERSION}.dll"
@@ -382,7 +362,7 @@
StrCmp $R0 "" done
MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
- "OpenLibraries is already installed. $\n$\nClick `OK` to remove the \
+ "HDRFlow is already installed. $\n$\nClick `OK` to remove the \
previous version or `Cancel` to cancel this upgrade." \
IDOK uninst
Abort
Modified: trunk/lib/openlibraries/openlibraries_vc8.sln
===================================================================
--- trunk/lib/openlibraries/openlibraries_vc8.sln 2008-02-06 22:59:49 UTC (rev 408)
+++ trunk/lib/openlibraries/openlibraries_vc8.sln 2008-02-09 13:31:51 UTC (rev 409)
@@ -224,24 +224,6 @@
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "plugins", "plugins", "{56A6ABC4-51B3-45A3-ADDD-D22A50AA55F9}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "al", "src\openassetlib\al\al_vc8.vcproj", "{BD346E41-BEBD-43E7-9801-8EC1158355C4}"
- ProjectSection(ProjectDependencies) = postProject
- {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "py", "src\openassetlib\py\py_vc8.vcproj", "{ECEDB34E-A863-420F-BFC6-F294AC078892}"
- ProjectSection(ProjectDependencies) = postProject
- {BD346E41-BEBD-43E7-9801-8EC1158355C4} = {BD346E41-BEBD-43E7-9801-8EC1158355C4}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite", "src\openassetlib\plugins\sqlite\sqlite_vc8.vcproj", "{4B89FC29-D7E8-4E1A-99D7-17561B89DBEA}"
- ProjectSection(ProjectDependencies) = postProject
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {BD346E41-BEBD-43E7-9801-8EC1158355C4} = {BD346E41-BEBD-43E7-9801-8EC1158355C4}
- EndProjectSection
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GL", "GL", "{C2EBF114-BFF6-4520-BC11-EB54565B92D6}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_2D", "test\openimagelib\GL\_2D\_2D_vc8.vcproj", "{24D622CC-4577-49B0-9224-8BB191236A61}"
@@ -479,18 +461,6 @@
{1AC3D22B-175B-4169-B74A-276F9D5BA7AB}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{1AC3D22B-175B-4169-B74A-276F9D5BA7AB}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{1AC3D22B-175B-4169-B74A-276F9D5BA7AB}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {BD346E41-BEBD-43E7-9801-8EC1158355C4}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {BD346E41-BEBD-43E7-9801-8EC1158355C4}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {BD346E41-BEBD-43E7-9801-8EC1158355C4}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {BD346E41-BEBD-43E7-9801-8EC1158355C4}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {ECEDB34E-A863-420F-BFC6-F294AC078892}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {ECEDB34E-A863-420F-BFC6-F294AC078892}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {ECEDB34E-A863-420F-BFC6-F294AC078892}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {ECEDB34E-A863-420F-BFC6-F294AC078892}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {4B89FC29-D7E8-4E1A-99D7-17561B89DBEA}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {4B89FC29-D7E8-4E1A-99D7-17561B89DBEA}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {4B89FC29-D7E8-4E1A-99D7-17561B89DBEA}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {4B89FC29-D7E8-4E1A-99D7-17561B89DBEA}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
{24D622CC-4577-49B0-9224-8BB191236A61}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
{24D622CC-4577-49B0-9224-8BB191236A61}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{24D622CC-4577-49B0-9224-8BB191236A61}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
@@ -623,9 +593,6 @@
{1AC3D22B-175B-4169-B74A-276F9D5BA7AB} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
{0C4F7499-83C6-4143-A392-56F299345E8A} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
{68B4BE77-E59E-4A24-9AF5-D4CEFF132B51} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
- {BD346E41-BEBD-43E7-9801-8EC1158355C4} = {D3688A41-2908-41C0-8BF1-4AB6E3DFDBC4}
- {ECEDB34E-A863-420F-BFC6-F294AC078892} = {D3688A41-2908-41C0-8BF1-4AB6E3DFDBC4}
- {4B89FC29-D7E8-4E1A-99D7-17561B89DBEA} = {56A6ABC4-51B3-45A3-ADDD-D22A50AA55F9}
{24D622CC-4577-49B0-9224-8BB191236A61} = {C2EBF114-BFF6-4520-BC11-EB54565B92D6}
{F0557FAB-2BC7-4991-9AD8-560526321D80} = {C2EBF114-BFF6-4520-BC11-EB54565B92D6}
{23B3623B-4FED-49F3-8F16-4883E57588E6} = {C2EBF114-BFF6-4520-BC11-EB54565B92D6}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X