Thread: [Hdrflow-svn] SF.net SVN: hdrflow: [239] trunk/lib/extras/src
Status: Pre-Alpha
Brought to you by:
glslang
Menu
▾
▴
hdrflow-svn
|
From: <gl...@us...> - 2007-08-09 22:23:00
|
Revision: 239
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=239&view=rev
Author: glslang
Date: 2007-08-09 15:22:55 -0700 (Thu, 09 Aug 2007)
Log Message:
-----------
+ build fixes
Modified Paths:
--------------
trunk/lib/extras/src/panoramic/panoramic.cpp
trunk/lib/extras/src/raw/raw.cpp
Modified: trunk/lib/extras/src/panoramic/panoramic.cpp
===================================================================
--- trunk/lib/extras/src/panoramic/panoramic.cpp 2007-08-08 21:44:20 UTC (rev 238)
+++ trunk/lib/extras/src/panoramic/panoramic.cpp 2007-08-09 22:22:55 UTC (rev 239)
@@ -18,7 +18,6 @@
namespace pl = olib::openpluginlib;
namespace il = olib::openimagelib::il;
namespace ml = olib::openmedialib::ml;
-namespace fs = boost::filesystem;
namespace pcos = olib::openpluginlib::pcos;
namespace extras { namespace hdrflow { namespace pan {
@@ -137,14 +136,14 @@
int OfxGetNumberOfPlugins( )
{
return 1;
- }
-
+ }
+}
+
#ifdef WIN32
- BOOL WINAPI DllMain( HINSTANCE hInstDLL, DWORD fdwReason, LPVOID )
- {
- if( fdwReason == DLL_PROCESS_ATTACH )
- DisableThreadLibraryCalls( hInstDLL );
- return TRUE;
- }
-#endif
+extern "C" BOOL WINAPI DllMain( HINSTANCE hInstDLL, DWORD fdwReason, LPVOID )
+{
+ if( fdwReason == DLL_PROCESS_ATTACH )
+ DisableThreadLibraryCalls( hInstDLL );
+ return TRUE;
}
+#endif
Modified: trunk/lib/extras/src/raw/raw.cpp
===================================================================
--- trunk/lib/extras/src/raw/raw.cpp 2007-08-08 21:44:20 UTC (rev 238)
+++ trunk/lib/extras/src/raw/raw.cpp 2007-08-09 22:22:55 UTC (rev 239)
@@ -11,18 +11,18 @@
#include <windows.h>
#endif
-#include <openmedialib/il/openimagelib_plugin.hpp>
+#include <openpluginlib/pl/pcos/property_container.hpp>
+#include <openimagelib/il/openimagelib_plugin.hpp>
namespace pl = olib::openpluginlib;
namespace il = olib::openimagelib::il;
-namespace fs = boost::filesystem;
namespace pcos = olib::openpluginlib::pcos;
namespace extras { namespace hdrflow { namespace raw {
namespace
{
- bool dcraw( property_container properties )
+ bool dcraw( pcos::property_container properties )
{
return true;
}
@@ -54,10 +54,10 @@
, tiff_output_( pcos::key::from_string( "tiff_output" ) )
{ }
- virtual il::image_type_ptr load( const fs::path& path )
+ virtual il::image_type_ptr load( pl::stream_ptr )
{ return il::image_type_ptr( ); }
- virtual bool store( const fs::path&, const il::image_type_ptr& )
+ virtual bool store( pl::stream_ptr, il::image_type_ptr )
{ return false; }
private:
@@ -107,13 +107,14 @@
{
delete static_cast<extras::hdrflow::raw::raw_plugin*>( plug );
}
+}
+
+#ifdef WIN32
+extern "C" BOOL WINAPI DllMain( HINSTANCE hInstDLL, DWORD fdwReason, LPVOID )
+{
+ if( fdwReason == DLL_PROCESS_ATTACH )
+ DisableThreadLibraryCalls( hInstDLL );
-#ifdef WIN32
- BOOL WINAPI DllMain( HINSTANCE hInstDLL, DWORD fdwReason, LPVOID )
- {
- if( fdwReason == DLL_PROCESS_ATTACH )
- DisableThreadLibraryCalls( hInstDLL );
- return TRUE;
- }
+ return TRUE;
+}
#endif
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-20 21:11:41
|
Revision: 261
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=261&view=rev
Author: glslang
Date: 2007-08-20 14:11:39 -0700 (Mon, 20 Aug 2007)
Log Message:
-----------
+ corrects order of the namespaces
Modified Paths:
--------------
trunk/lib/extras/src/panoramic/panoramic.cpp
trunk/lib/extras/src/raw/raw.cpp
Modified: trunk/lib/extras/src/panoramic/panoramic.cpp
===================================================================
--- trunk/lib/extras/src/panoramic/panoramic.cpp 2007-08-20 21:05:08 UTC (rev 260)
+++ trunk/lib/extras/src/panoramic/panoramic.cpp 2007-08-20 21:11:39 UTC (rev 261)
@@ -20,7 +20,7 @@
namespace ml = olib::openmedialib::ml;
namespace pcos = olib::openpluginlib::pcos;
-namespace extras { namespace hdrflow { namespace pan {
+namespace hdrflow { namespace extras { namespace pan {
namespace
{
@@ -116,19 +116,19 @@
bool openplugin_create_plugin( const char*, pl::openplugin** plug )
{
- *plug = new extras::hdrflow::pan::panoramic_plugin;
+ *plug = new hdrflow::extras::pan::panoramic_plugin;
return true;
}
void openplugin_destroy_plugin( pl::openplugin* plug )
{
- delete static_cast<extras::hdrflow::pan::panoramic_plugin*>( plug );
+ delete static_cast<hdrflow::extras::pan::panoramic_plugin*>( plug );
}
OfxPlugin* OfxGetPlugin( int nth )
{
if( nth == 0 )
- return &extras::hdrflow::pan::panoramic_ofx_plugin;
+ return &hdrflow::extras::pan::panoramic_ofx_plugin;
return 0;
}
Modified: trunk/lib/extras/src/raw/raw.cpp
===================================================================
--- trunk/lib/extras/src/raw/raw.cpp 2007-08-20 21:05:08 UTC (rev 260)
+++ trunk/lib/extras/src/raw/raw.cpp 2007-08-20 21:11:39 UTC (rev 261)
@@ -18,7 +18,7 @@
namespace il = olib::openimagelib::il;
namespace pcos = olib::openpluginlib::pcos;
-namespace extras { namespace hdrflow { namespace raw {
+namespace hdrflow { namespace extras { namespace raw {
namespace
{
@@ -99,13 +99,13 @@
bool openplugin_create_plugin( const char*, pl::openplugin** plug )
{
- *plug = new extras::hdrflow::raw::raw_plugin;
+ *plug = new hdrflow::extras::raw::raw_plugin;
return true;
}
void openplugin_destroy_plugin( pl::openplugin* plug )
{
- delete static_cast<extras::hdrflow::raw::raw_plugin*>( plug );
+ delete static_cast<hdrflow::extras::raw::raw_plugin*>( plug );
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-09-30 11:16:31
|
Revision: 322
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=322&view=rev
Author: glslang
Date: 2007-09-30 04:16:29 -0700 (Sun, 30 Sep 2007)
Log Message:
-----------
+ build fixes
Modified Paths:
--------------
trunk/lib/extras/src/ppm/ppm_plugin.cpp
trunk/lib/extras/src/raw/raw.cpp
Modified: trunk/lib/extras/src/ppm/ppm_plugin.cpp
===================================================================
--- trunk/lib/extras/src/ppm/ppm_plugin.cpp 2007-09-29 20:54:22 UTC (rev 321)
+++ trunk/lib/extras/src/ppm/ppm_plugin.cpp 2007-09-30 11:16:29 UTC (rev 322)
@@ -68,10 +68,10 @@
struct PPM_DECLSPEC ppm_plugin : public il::openimagelib_plugin
{
- virtual il::image_type_ptr load( pl::stream_ptr stream )
- { return load_ppm( stream ); }
+ virtual il::image_type_ptr load( const pl::string& uri )
+ { return load_ppm( pl::make_stream( uri, std::ios::in ) ); }
- virtual bool store( pl::stream_ptr, il::image_type_ptr )
+ virtual bool store( const pl::string&, il::image_type_ptr )
{ return false; }
};
Modified: trunk/lib/extras/src/raw/raw.cpp
===================================================================
--- trunk/lib/extras/src/raw/raw.cpp 2007-09-29 20:54:22 UTC (rev 321)
+++ trunk/lib/extras/src/raw/raw.cpp 2007-09-30 11:16:29 UTC (rev 322)
@@ -79,7 +79,7 @@
{
il::openimagelib_plugin_ptr plug = boost::shared_dynamic_cast<il::openimagelib_plugin>( i->create_plugin( "" ) );
if( plug )
- return plug->load( pl::make_stream( output_path, std::ios::in ) );
+ return plug->load( output_path );
}
return il::image_type_ptr( );
@@ -116,13 +116,13 @@
set_raw_properties( );
}
- virtual il::image_type_ptr load( pl::stream_ptr stream )
+ virtual il::image_type_ptr load( const pl::string& uri )
{
- raw_props_.get_property_with_key( pcos::key::from_string( "path" ) ) = stream->path( );
+ raw_props_.get_property_with_key( pcos::key::from_string( "path" ) ) = uri;
return dcraw( raw_props_ );
}
- virtual bool store( pl::stream_ptr, il::image_type_ptr )
+ virtual bool store( const pl::string&, il::image_type_ptr )
{ return false; }
private:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-10-06 13:25:06
|
Revision: 346
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=346&view=rev
Author: glslang
Date: 2007-10-06 06:25:04 -0700 (Sat, 06 Oct 2007)
Log Message:
-----------
+build fixes
Modified Paths:
--------------
trunk/lib/extras/src/imf/hdr/Makefile.am
trunk/lib/extras/src/imf/mfn/Makefile.am
trunk/lib/extras/src/panoramic/Makefile.am
trunk/lib/extras/src/ppm/Makefile.am
trunk/lib/extras/src/raw/Makefile.am
Modified: trunk/lib/extras/src/imf/hdr/Makefile.am
===================================================================
--- trunk/lib/extras/src/imf/hdr/Makefile.am 2007-10-06 11:32:43 UTC (rev 345)
+++ trunk/lib/extras/src/imf/hdr/Makefile.am 2007-10-06 13:25:04 UTC (rev 346)
@@ -17,11 +17,11 @@
libhdrflow_extras_imfhdr_la_CXXFLAGS = \
$(BOOST_INCLUDE_PATH) \
$(MAYA_CXXFLAGS) \
- -I$(top_builddir)/../openlibraries/src
+ -I$(top_srcdir)/../openlibraries/src
libhdrflow_extras_imfhdr_la_LIBADD = \
$(MAYA_LIBS) \
- $(top_builddir)/../openlibraries/src/openpluginlib/pl/libopenpluginlib_pl.la
+ $(top_srcdir)/../openlibraries/src/openpluginlib/pl/libopenpluginlib_pl.la
libhdrflow_extras_imfhdr_la_LDFLAGS = \
$(MAYA_LDFLAGS)
Modified: trunk/lib/extras/src/imf/mfn/Makefile.am
===================================================================
--- trunk/lib/extras/src/imf/mfn/Makefile.am 2007-10-06 11:32:43 UTC (rev 345)
+++ trunk/lib/extras/src/imf/mfn/Makefile.am 2007-10-06 13:25:04 UTC (rev 346)
@@ -15,12 +15,12 @@
libhdrflow_extras_mfn_la_CXXFLAGS = \
$(BOOST_INCLUDE_PATH) \
$(MAYA_CXXFLAGS) \
- -I$(top_builddir)/../openlibraries/src
+ -I$(top_srcdir)/../openlibraries/src
libhdrflow_extras_mfn_la_LIBADD = \
$(MAYA_LIBS) \
- $(top_builddir)/../openlibraries/src/openpluginlib/pl/libopenpluginlib_pl.la \
- $(top_builddir)/../openlibraries/src/openimagelib/il/libopenimagelib_il.la
+ $(top_srcdir)/../openlibraries/src/openpluginlib/pl/libopenpluginlib_pl.la \
+ $(top_srcdir)/../openlibraries/src/openimagelib/il/libopenimagelib_il.la
libhdrflow_extras_mfn_la_LDFLAGS = \
$(MAYA_LDFLAGS)
Modified: trunk/lib/extras/src/panoramic/Makefile.am
===================================================================
--- trunk/lib/extras/src/panoramic/Makefile.am 2007-10-06 11:32:43 UTC (rev 345)
+++ trunk/lib/extras/src/panoramic/Makefile.am 2007-10-06 13:25:04 UTC (rev 346)
@@ -12,5 +12,5 @@
libhdrflow_extras_panoramic_la_CXXFLAGS = \
$(BOOST_INCLUDE_PATH) \
- -I$(top_builddir)/../openlibraries/src \
+ -I$(top_srcdir)/../openlibraries/src \
$(OFX_INCLUDE_PATH)
Modified: trunk/lib/extras/src/ppm/Makefile.am
===================================================================
--- trunk/lib/extras/src/ppm/Makefile.am 2007-10-06 11:32:43 UTC (rev 345)
+++ trunk/lib/extras/src/ppm/Makefile.am 2007-10-06 13:25:04 UTC (rev 346)
@@ -13,11 +13,11 @@
libhdrflow_extras_ppm_la_CXXFLAGS = \
$(EXTRAS_CXXFLAGS) \
$(BOOST_INCLUDE_PATH) \
- -I$(top_builddir)/../openlibraries/src
+ -I$(top_srcdir)/../openlibraries/src
libhdrflow_extras_ppm_la_LIBADD = \
- $(top_builddir)/../openlibraries/src/openpluginlib/pl/libopenpluginlib_pl.la \
- $(top_builddir)/../openlibraries/src/openimagelib/il/libopenimagelib_il.la
+ $(top_srcdir)/../openlibraries/src/openpluginlib/pl/libopenpluginlib_pl.la \
+ $(top_srcdir)/../openlibraries/src/openimagelib/il/libopenimagelib_il.la
libhdrflow_extras_ppm_la_LDFLAGS = \
$(EXTRAS_LDFLAGS)
Modified: trunk/lib/extras/src/raw/Makefile.am
===================================================================
--- trunk/lib/extras/src/raw/Makefile.am 2007-10-06 11:32:43 UTC (rev 345)
+++ trunk/lib/extras/src/raw/Makefile.am 2007-10-06 13:25:04 UTC (rev 346)
@@ -14,15 +14,15 @@
libhdrflow_extras_raw_la_CXXFLAGS = \
$(EXTRAS_CXXFLAGS) \
$(BOOST_INCLUDE_PATH) \
- -I$(top_builddir)/../openlibraries/src
+ -I$(top_srcdir)/../openlibraries/src
libhdrflow_extras_raw_la_CFLAGS = \
-DNO_JPEG \
-DNO_LCMS
libhdrflow_extras_raw_la_LIBADD = \
- $(top_builddir)/../openlibraries/src/openpluginlib/pl/libopenpluginlib_pl.la \
- $(top_builddir)/../openlibraries/src/openimagelib/il/libopenimagelib_il.la
+ $(top_srcdir)/../openlibraries/src/openpluginlib/pl/libopenpluginlib_pl.la \
+ $(top_srcdir)/../openlibraries/src/openimagelib/il/libopenimagelib_il.la
libhdrflow_extras_raw_la_LDFLAGS = \
$(EXTRAS_LDFLAGS)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-12-30 21:21:51
|
Revision: 390
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=390&view=rev
Author: glslang
Date: 2007-12-30 13:21:49 -0800 (Sun, 30 Dec 2007)
Log Message:
-----------
+ more JPEG XR/HD Photo support
Modified Paths:
--------------
trunk/lib/extras/src/lut/lut.cpp
trunk/lib/extras/src/wic/wic.cpp
Added Paths:
-----------
trunk/lib/extras/src/wic/wic_plugin.opl
Modified: trunk/lib/extras/src/lut/lut.cpp
===================================================================
--- trunk/lib/extras/src/lut/lut.cpp 2007-12-30 16:49:57 UTC (rev 389)
+++ trunk/lib/extras/src/lut/lut.cpp 2007-12-30 21:21:49 UTC (rev 390)
@@ -27,24 +27,22 @@
{
public:
explicit gamma_input( )
- : prop_width_( pcos::key::from_string( "width" ) )
+ : prop_colourspace_( pcos::key::from_string( "colourspace" ) )
+ , prop_width_( pcos::key::from_string( "width" ) )
, prop_height_( pcos::key::from_string( "height" ) )
- , prop_bitdepth_( pcos::key::from_string( "bitdepth" ) )
- , prop_is_float_( pcos::key::from_string( "is_float" ) )
- { }
+ {
+
+ }
virtual ~gamma_input( ) { }
virtual pl::wstring get_uri( ) const { return L"gamma:"; }
virtual pl::wstring get_mime_type( ) const { return L""; }
-
-
private:
+ pcos::property prop_colourspace_;
pcos::property prop_width_;
pcos::property prop_height_;
- pcos::property prop_bitdepth_;
- pcos::property prop_is_float_;
};
class ML_PLUGIN_DECLSPEC lut_plugin : public ml::openmedialib_plugin
Modified: trunk/lib/extras/src/wic/wic.cpp
===================================================================
--- trunk/lib/extras/src/wic/wic.cpp 2007-12-30 16:49:57 UTC (rev 389)
+++ trunk/lib/extras/src/wic/wic.cpp 2007-12-30 21:21:49 UTC (rev 390)
@@ -29,9 +29,17 @@
namespace
{
- il::image_type_ptr GUID_to_pf( WICPixelFormatGUID guid, UINT width, UINT height )
+ il::image_type_ptr GUID_to_pf( WICPixelFormatGUID guid, UINT width, UINT height, UINT& pitch )
{
- return il::image_type_ptr( );
+ il::image_type_ptr im;
+
+ if( guid == GUID_WICPixelFormat128bppRGBAFloat )
+ {
+ im = il::allocate( L"r32g32b32a32f", width, height );
+ pitch = im->pitch( ) * sizeof( float );
+ }
+
+ return im;
}
il::image_type_ptr load_wic( const pl::string& uri )
@@ -64,7 +72,9 @@
source->GetSize( &width, &height );
source->GetPixelFormat( &pixelformat );
- im = GUID_to_pf( pixelformat, width, height );
+ UINT pitch;
+ im = GUID_to_pf( pixelformat, width, height, pitch );
+ hr = source->CopyPixels( NULL, pitch, im->size( ), im->data( ) );
error:
SAFE_RELEASE( decoder );
Added: trunk/lib/extras/src/wic/wic_plugin.opl
===================================================================
--- trunk/lib/extras/src/wic/wic_plugin.opl (rev 0)
+++ trunk/lib/extras/src/wic/wic_plugin.opl 2007-12-30 21:21:49 UTC (rev 390)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openlibraries version="1.0">
+ <openimagelib name="oil" version="0.2.0">
+ <plugin name="HDRFlow wic plugin" type="input" in_filter="*.hdp *.wdp" extension='".*\.hdp", ".*\.wdp"' merit="0" filename='"libhdrflow_extras_wic.so", "libhdrflow_extras_wic.dylib", "hdrflow_extras_wic-vc80-d-0_1_0.dll", "hdrflow_extras_wic-vc80-r-0_1_0.dll"'/>
+ </openimagelib>
+</openlibraries>
Property changes on: trunk/lib/extras/src/wic/wic_plugin.opl
___________________________________________________________________
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2008-02-23 18:28:13
|
Revision: 421
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=421&view=rev
Author: glslang
Date: 2008-02-23 10:28:10 -0800 (Sat, 23 Feb 2008)
Log Message:
-----------
+ have all targets go to a single directory (win32 only)
Modified Paths:
--------------
trunk/lib/extras/src/imf/mfn/readers_vc8.vcproj
trunk/lib/extras/src/lut/lut_vc8.vcproj
trunk/lib/extras/src/noise/noise_vc8.vcproj
trunk/lib/extras/src/panoramic/panoramic_vc8.vcproj
trunk/lib/extras/src/ppm/ppm_vc8.vcproj
trunk/lib/extras/src/raw/raw_vc8.vcproj
trunk/lib/extras/src/wic/wic_vc8.vcproj
Modified: trunk/lib/extras/src/imf/mfn/readers_vc8.vcproj
===================================================================
--- trunk/lib/extras/src/imf/mfn/readers_vc8.vcproj 2008-02-23 14:23:14 UTC (rev 420)
+++ trunk/lib/extras/src/imf/mfn/readers_vc8.vcproj 2008-02-23 18:28:10 UTC (rev 421)
@@ -17,7 +17,7 @@
<Configurations>
<Configuration
Name="Multi-threaded Debug DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
@@ -69,7 +69,7 @@
AdditionalDependencies="OpenMaya.lib Foundation.lib"
OutputFile="$(OutDir)\HDRFlowMaya.mll"
LinkIncremental="2"
- AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\..\openlibraries\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openimagelib\il\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openmedialib\ml\$(ConfigurationName)";"C:\Program Files\Autodesk\Maya2008\lib""
+ AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\..\openlibraries\$(ConfigurationName)";"C:\Program Files\Autodesk\Maya2008\lib""
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -101,7 +101,7 @@
</Configuration>
<Configuration
Name="Multi-threaded Release DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
@@ -151,7 +151,7 @@
AdditionalDependencies="OpenMaya.lib Foundation.lib"
OutputFile="$(OutDir)\HDRFlowMaya.mll"
LinkIncremental="1"
- AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\..\openlibraries\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openimagelib\il\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openmedialib\ml\$(ConfigurationName)";"C:\Program Files\Autodesk\Maya2008\lib""
+ AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\..\openlibraries\$(ConfigurationName)";"C:\Program Files\Autodesk\Maya2008\lib""
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
Modified: trunk/lib/extras/src/lut/lut_vc8.vcproj
===================================================================
--- trunk/lib/extras/src/lut/lut_vc8.vcproj 2008-02-23 14:23:14 UTC (rev 420)
+++ trunk/lib/extras/src/lut/lut_vc8.vcproj 2008-02-23 18:28:10 UTC (rev 421)
@@ -17,7 +17,7 @@
<Configurations>
<Configuration
Name="Multi-threaded Debug DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
@@ -66,7 +66,7 @@
IgnoreImportLibrary="true"
OutputFile="$(OutDir)\hdrflow_extras_lut-vc80-d-0_1_0.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\..\openlibraries\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openimagelib\il\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openmedialib\ml\$(ConfigurationName)""
+ AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\..\openlibraries\$(ConfigurationName)""
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -98,7 +98,7 @@
</Configuration>
<Configuration
Name="Multi-threaded Release DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
@@ -146,7 +146,7 @@
IgnoreImportLibrary="true"
OutputFile="$(OutDir)\hdrflow_extras_lut-vc80-r-0_1_0.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\..\openlibraries\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openimagelib\il\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openmedialib\ml\$(ConfigurationName)""
+ AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\..\openlibraries\$(ConfigurationName)""
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
Modified: trunk/lib/extras/src/noise/noise_vc8.vcproj
===================================================================
--- trunk/lib/extras/src/noise/noise_vc8.vcproj 2008-02-23 14:23:14 UTC (rev 420)
+++ trunk/lib/extras/src/noise/noise_vc8.vcproj 2008-02-23 18:28:10 UTC (rev 421)
@@ -17,7 +17,7 @@
<Configurations>
<Configuration
Name="Multi-threaded Debug DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
@@ -66,7 +66,7 @@
IgnoreImportLibrary="true"
OutputFile="$(OutDir)\hdrflow_noise-vc80-d-0_1_0.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\..\openlibraries\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openimagelib\il\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openmedialib\ml\$(ConfigurationName)""
+ AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\..\openlibraries\$(ConfigurationName)""
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -98,7 +98,7 @@
</Configuration>
<Configuration
Name="Multi-threaded Release DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
@@ -146,7 +146,7 @@
IgnoreImportLibrary="true"
OutputFile="$(OutDir)\hdrflow_noise-vc80-r-0_1_0.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\..\openlibraries\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openimagelib\il\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openmedialib\ml\$(ConfigurationName)""
+ AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\..\openlibraries\$(ConfigurationName)""
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
Modified: trunk/lib/extras/src/panoramic/panoramic_vc8.vcproj
===================================================================
--- trunk/lib/extras/src/panoramic/panoramic_vc8.vcproj 2008-02-23 14:23:14 UTC (rev 420)
+++ trunk/lib/extras/src/panoramic/panoramic_vc8.vcproj 2008-02-23 18:28:10 UTC (rev 421)
@@ -17,7 +17,7 @@
<Configurations>
<Configuration
Name="Multi-threaded Debug DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
@@ -67,7 +67,7 @@
AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)\hdrflow_panoramic-vc80-d-0_1_0.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\..\openlibraries\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openimagelib\il\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openmedialib\ml\$(ConfigurationName)""
+ AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\..\openlibraries\$(ConfigurationName)""
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -99,7 +99,7 @@
</Configuration>
<Configuration
Name="Multi-threaded Release DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
@@ -149,7 +149,7 @@
AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)\hdrflow_panoramic-vc80-r-0_1_0.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\..\openlibraries\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openimagelib\il\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openmedialib\ml\$(ConfigurationName)""
+ AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\..\openlibraries\$(ConfigurationName)""
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
Modified: trunk/lib/extras/src/ppm/ppm_vc8.vcproj
===================================================================
--- trunk/lib/extras/src/ppm/ppm_vc8.vcproj 2008-02-23 14:23:14 UTC (rev 420)
+++ trunk/lib/extras/src/ppm/ppm_vc8.vcproj 2008-02-23 18:28:10 UTC (rev 421)
@@ -17,7 +17,7 @@
<Configurations>
<Configuration
Name="Multi-threaded Debug DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
@@ -66,7 +66,7 @@
IgnoreImportLibrary="true"
OutputFile="$(OutDir)\hdrflow_extras_ppm-vc80-d-0_1_0.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\..\openlibraries\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openimagelib\il\$(ConfigurationName)""
+ AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\..\openlibraries\$(ConfigurationName)""
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -98,7 +98,7 @@
</Configuration>
<Configuration
Name="Multi-threaded Release DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
@@ -146,7 +146,7 @@
IgnoreImportLibrary="true"
OutputFile="$(OutDir)\hdrflow_extras_ppm-vc80-r-0_1_0.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\..\openlibraries\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openimagelib\il\$(ConfigurationName)""
+ AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\..\openlibraries\$(ConfigurationName)""
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
Modified: trunk/lib/extras/src/raw/raw_vc8.vcproj
===================================================================
--- trunk/lib/extras/src/raw/raw_vc8.vcproj 2008-02-23 14:23:14 UTC (rev 420)
+++ trunk/lib/extras/src/raw/raw_vc8.vcproj 2008-02-23 18:28:10 UTC (rev 421)
@@ -17,7 +17,7 @@
<Configurations>
<Configuration
Name="Multi-threaded Debug DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
@@ -68,7 +68,7 @@
AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)\hdrflow_extras_raw-vc80-d-0_1_0.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\..\openlibraries\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openimagelib\il\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openmedialib\ml\$(ConfigurationName)""
+ AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\..\openlibraries\$(ConfigurationName)""
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
SubSystem="2"
@@ -101,7 +101,7 @@
</Configuration>
<Configuration
Name="Multi-threaded Release DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
@@ -152,7 +152,7 @@
AdditionalOptions="/LARGEADDRESSAWARE"
OutputFile="$(OutDir)\hdrflow_extras_raw-vc80-r-0_1_0.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\..\openlibraries\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openimagelib\il\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openmedialib\ml\$(ConfigurationName)""
+ AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\..\openlibraries\$(ConfigurationName)""
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
SubSystem="2"
Modified: trunk/lib/extras/src/wic/wic_vc8.vcproj
===================================================================
--- trunk/lib/extras/src/wic/wic_vc8.vcproj 2008-02-23 14:23:14 UTC (rev 420)
+++ trunk/lib/extras/src/wic/wic_vc8.vcproj 2008-02-23 18:28:10 UTC (rev 421)
@@ -17,7 +17,7 @@
<Configurations>
<Configuration
Name="Multi-threaded Debug DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
@@ -68,7 +68,7 @@
AdditionalDependencies="windowscodecs.lib"
OutputFile="$(OutDir)\hdrflow_extras_wic-vc80-d-0_1_0.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\..\openlibraries\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openimagelib\il\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openmedialib\ml\$(ConfigurationName)";C:\Program Files\Microsoft SDKs\Windows\v6.0\lib"
+ AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\..\openlibraries\$(ConfigurationName)";C:\Program Files\Microsoft SDKs\Windows\v6.0\lib"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -100,7 +100,7 @@
</Configuration>
<Configuration
Name="Multi-threaded Release DLL|Win32"
- OutputDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="1"
@@ -149,7 +149,7 @@
AdditionalDependencies="windowscodecs.lib"
OutputFile="$(OutDir)\hdrflow_extras_wic-vc80-r-0_1_0.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\..\openlibraries\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openimagelib\il\$(ConfigurationName)";"$(SolutionDir)\..\openlibraries\src\openmedialib\ml\$(ConfigurationName)";C:\Program Files\Microsoft SDKs\Windows\v6.0\lib"
+ AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\..\openlibraries\$(ConfigurationName)";C:\Program Files\Microsoft SDKs\Windows\v6.0\lib"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X