[Hdrflow-svn] SF.net SVN: hdrflow: [427] trunk
Status: Pre-Alpha
Brought to you by:
glslang
Menu
▾
▴
[Hdrflow-svn] SF.net SVN: hdrflow: [427] trunk
|
From: <gl...@us...> - 2008-02-24 18:00:39
|
Revision: 427
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=427&view=rev
Author: glslang
Date: 2008-02-24 10:00:36 -0800 (Sun, 24 Feb 2008)
Log Message:
-----------
+ ensures no name conflicts exist between hdrflow and olibs
Modified Paths:
--------------
trunk/hdrflow_runtime.nsi
trunk/hdrflow_sdk.nsi
trunk/lib/extras/src/imf/mfn/readers_vc8.vcproj
trunk/lib/extras/src/ppm/ppm_vc8.vcproj
trunk/lib/extras/src/raw/raw_vc8.vcproj
trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/il/config.hpp
trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/png/png_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/py/py_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/ml/config.hpp
trunk/lib/openlibraries/src/openmedialib/ml/ml_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/plugins/openal/openal_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/py/py_vc8.vcproj
trunk/lib/openlibraries/src/openpluginlib/pl/config.hpp
trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj
trunk/lib/openlibraries/test/openmedialib/player/player_vc8.vcproj
trunk/lib/openlibraries/test/openmedialib/store/store_vc8.vcproj
Modified: trunk/hdrflow_runtime.nsi
===================================================================
--- trunk/hdrflow_runtime.nsi 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/hdrflow_runtime.nsi 2008-02-24 18:00:36 UTC (rev 427)
@@ -51,7 +51,7 @@
!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of HDRFlow.\r\n\r\n$_CLICK"
!insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE "lib\openlibraries\COPYING"
+!insertmacro MUI_PAGE_LICENSE "lib\extras\COPYING"
!insertmacro MUI_PAGE_COMPONENTS
!insertmacro MUI_PAGE_DIRECTORY
!insertmacro MUI_PAGE_INSTFILES
@@ -80,6 +80,15 @@
SetOverwrite on
+ VAR /GLOBAL maya_location
+ ReadRegStr $maya_location HKLM "Software\Autodesk\Maya\2008\Setup\InstallPath" "MAYA_INSTALL_LOCATION"
+ IfErrors no_maya yes_maya
+ no_maya:
+ MessageBox MB_ICONEXCLAMATION "Unable to detect Maya 2008"
+ Quit
+
+ yes_maya:
+
SetOutPath $INSTDIR\DLLs
File "lib\openlibraries\Multi-threaded Release DLL\*-vc80-r-${VERSION}.dll"
File "lib\openlibraries\Multi-threaded Release DLL\*.opl"
@@ -118,6 +127,9 @@
File "lib\openlibraries\effects\shaders\channel_selector.cg"
File "lib\openlibraries\effects\shaders\channel_selector.frag"
+ SetOutPath $maya_location\bin\plug-ins
+ File "lib\extras\Multi-threaded Release DLL\HDRFlowMaya.mll"
+
SetDetailsPrint both
;--------------------------------
Modified: trunk/hdrflow_sdk.nsi
===================================================================
--- trunk/hdrflow_sdk.nsi 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/hdrflow_sdk.nsi 2008-02-24 18:00:36 UTC (rev 427)
@@ -80,6 +80,15 @@
SetOverwrite on
+ VAR /GLOBAL maya_location
+ ReadRegStr $maya_location HKLM "Software\Autodesk\Maya\2008\Setup\InstallPath" "MAYA_INSTALL_LOCATION"
+ IfErrors no_maya yes_maya
+ no_maya:
+ MessageBox MB_ICONEXCLAMATION "Unable to detect Maya 2008"
+ Quit
+
+ yes_maya:
+
SetOutPath $INSTDIR\include\hdrflow-${VERSION_DOT}\openpluginlib\pl
File lib\openlibraries\src\openpluginlib\pl\allocatorstringstorage.h
File lib\openlibraries\src\openpluginlib\pl\bind_info.hpp
@@ -147,7 +156,10 @@
File "lib\openlibraries\Multi-threaded Debug DLL\*-vc80-d-${VERSION}.dll"
File "lib\openlibraries\Multi-threaded Debug DLL\*.opl"
File "lib\openlibraries\Multi-threaded Release DLL\*-vc80-r-${VERSION}.dll"
-
+ File "lib\extras\Multi-threaded Debug DLL\*-vc80-d-*.dll"
+ File "lib\extras\Multi-threaded Debug DLL\*.opl"
+ File "lib\extras\Multi-threaded Release DLL\*-vc80-r-*.dll"
+
; dependencies
File "C:\Program Files\FFmpeg\lib\avcodec-51.dll"
File "C:\Program Files\FFmpeg\lib\avformat-52.dll"
@@ -192,6 +204,9 @@
File "lib\openlibraries\effects\shaders\channel_selector.cg"
File "lib\openlibraries\effects\shaders\channel_selector.frag"
+ SetOutPath $maya_location\bin\plug-ins
+ File "lib\extras\Multi-threaded Debug DLL\HDRFlowMaya.mll"
+
SetDetailsPrint both
;--------------------------------
Modified: trunk/lib/extras/src/imf/mfn/readers_vc8.vcproj
===================================================================
--- trunk/lib/extras/src/imf/mfn/readers_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/extras/src/imf/mfn/readers_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -97,6 +97,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine=""
/>
</Configuration>
<Configuration
@@ -181,6 +182,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine=""
/>
</Configuration>
</Configurations>
Modified: trunk/lib/extras/src/ppm/ppm_vc8.vcproj
===================================================================
--- trunk/lib/extras/src/ppm/ppm_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/extras/src/ppm/ppm_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -94,6 +94,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy *.opl "$(SolutionDir)$(ConfigurationName)""
/>
</Configuration>
<Configuration
@@ -176,6 +177,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy *.opl "$(SolutionDir)$(ConfigurationName)""
/>
</Configuration>
</Configurations>
Modified: trunk/lib/extras/src/raw/raw_vc8.vcproj
===================================================================
--- trunk/lib/extras/src/raw/raw_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/extras/src/raw/raw_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -97,6 +97,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy *.opl "$(SolutionDir)$(ConfigurationName)""
/>
</Configuration>
<Configuration
@@ -183,6 +184,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy *.opl "$(SolutionDir)$(ConfigurationName)""
/>
</Configuration>
</Configurations>
Modified: trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -67,9 +67,9 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="Half.lib IlmImf.lib Iex.lib"
- OutputFile="$(OutDir)\openeffectslib_tonemap-vc80-d-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrfloweffects_tonemap-vc80-d-0_5_0.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)";C:\OpenEXR\lib\Debug"
+ AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\$(ConfigurationName)";C:\OpenEXR\lib\Debug"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -152,9 +152,9 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="Half.lib IlmImf.lib Iex.lib"
- OutputFile="$(OutDir)\openeffectslib_tonemap-vc80-r-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrfloweffects_tonemap-vc80-r-0_5_0.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)";C:\OpenEXR\lib\Release"
+ AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\$(ConfigurationName)";C:\OpenEXR\lib\Release"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
Modified: trunk/lib/openlibraries/src/openimagelib/il/config.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/config.hpp 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openimagelib/il/config.hpp 2008-02-24 18:00:36 UTC (rev 427)
@@ -23,7 +23,7 @@
#endif
#ifndef OPENIMAGELIB_LIBNAME
-# define OPENIMAGELIB_LIBNAME "openimagelib_il"
+# define OPENIMAGELIB_LIBNAME "hdrflowimage_il"
#endif
#ifndef OPENIMAGELIB_TOOLSET
Modified: trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openimagelib/il/il_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -72,14 +72,14 @@
Name="VCLinkerTool"
UseUnicodeResponseFiles="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)/openimagelib_il-vc80-d-0_5_0.dll"
+ OutputFile="$(OutDir)/hdrflowimage_il-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)""
GenerateManifest="false"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/il.pdb"
SubSystem="2"
- ImportLibrary="$(TargetDir)openimagelib_il-vc80-d-0_5_0.lib"
+ ImportLibrary="$(TargetDir)hdrflowimage_il-vc80-d-0_5_0.lib"
TargetMachine="1"
/>
<Tool
@@ -161,7 +161,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)/openimagelib_il-vc80-r-0_5_0.dll"
+ OutputFile="$(OutDir)/hdrflowimage_il-vc80-r-0_5_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)""
GenerateManifest="false"
@@ -169,7 +169,7 @@
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- ImportLibrary="$(TargetDir)openimagelib_il-vc80-r-0_5_0.lib"
+ ImportLibrary="$(TargetDir)hdrflowimage_il-vc80-r-0_5_0.lib"
TargetMachine="1"
/>
<Tool
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -68,7 +68,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openimagelib_dds-vc80-d-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowimage_dds-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
GenerateDebugInformation="true"
@@ -154,7 +154,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openimagelib_dds-vc80-r-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowimage_dds-vc80-r-0_5_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
GenerateDebugInformation="false"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -66,7 +66,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
ShowProgress="0"
- OutputFile="$(OutDir)\openimagelib_dpx-vc80-d-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowimage_dpx-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)""
GenerateDebugInformation="true"
@@ -148,7 +148,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
- OutputFile="$(OutDir)\openimagelib_dpx-vc80-r-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowimage_dpx-vc80-r-0_5_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)""
GenerateDebugInformation="true"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/exr/exr_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -68,7 +68,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="Half.lib IlmImf.lib Iex.lib"
- OutputFile="$(OutDir)\openimagelib_exr-vc80-d-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowimage_exr-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)";C:\OpenEXR\lib\Debug"
GenerateDebugInformation="true"
@@ -153,7 +153,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="Half.lib IlmImf.lib Iex.lib"
- OutputFile="$(OutDir)\openimagelib_exr-vc80-r-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowimage_exr-vc80-r-0_5_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)";C:\OpenEXR\lib\Release"
GenerateDebugInformation="true"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/gdi+/gdi+_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -68,7 +68,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="gdiplus.lib"
- OutputFile="$(OutDir)\openimagelib_gdi-vc80-d-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowimage_gdi-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
GenerateDebugInformation="true"
@@ -153,7 +153,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="gdiplus.lib"
- OutputFile="$(OutDir)\openimagelib_gdi-vc80-r-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowimage_gdi-vc80-r-0_5_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
GenerateDebugInformation="true"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/hdr/hdr_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -70,7 +70,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openimagelib_hdr-vc80-d-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowimage_hdr-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
GenerateDebugInformation="true"
@@ -156,7 +156,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openimagelib_hdr-vc80-r-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowimage_hdr-vc80-r-0_5_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
GenerateDebugInformation="false"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/png/png_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/png/png_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/png/png_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -68,7 +68,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="libpng13.lib zdll.lib"
- OutputFile="$(OutDir)\openimagelib_png-vc80-d-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowimage_png-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\libpng\lib;C:\zlib\lib"
GenerateDebugInformation="true"
@@ -155,7 +155,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="libpng13.lib zdll.lib"
- OutputFile="$(OutDir)\openimagelib_png-vc80-r-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowimage_png-vc80-r-0_5_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\libpng\lib;C:\zlib\lib"
GenerateDebugInformation="false"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/quicktime_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -68,7 +68,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="qtmlClient.lib"
- OutputFile="$(OutDir)\openimagelib_quicktime-vc80-d-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowimage_quicktime-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\Program Files\QuickTime SDK\Libraries"
IgnoreDefaultLibraryNames="libcmt.lib"
@@ -154,7 +154,7 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="qtmlClient.lib"
- OutputFile="$(OutDir)\openimagelib_quicktime-vc80-r-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowimage_quicktime-vc80-r-0_5_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\Program Files\QuickTime SDK\Libraries"
IgnoreDefaultLibraryNames="libcmt.lib"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/sgi/sgi_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -67,7 +67,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openimagelib_sgi-vc80-d-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowimage_sgi-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
GenerateDebugInformation="true"
@@ -152,7 +152,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openimagelib_sgi-vc80-r-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowimage_sgi-vc80-r-0_5_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
GenerateDebugInformation="false"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tga/tga_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -68,7 +68,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openimagelib_tga-vc80-d-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowimage_tga-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
GenerateDebugInformation="true"
@@ -154,7 +154,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openimagelib_tga-vc80-r-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowimage_tga-vc80-r-0_5_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)"
GenerateDebugInformation="false"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tiff/tiff_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -66,9 +66,9 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="libtiff.lib"
- OutputFile="$(OutDir)\openimagelib_tiff-vc80-d-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowimage_tiff-vc80-d-0_5_0.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\libtiff\lib"
+ AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\$(ConfigurationName);C:\libtiff\lib"
IgnoreDefaultLibraryNames="msvcrt.lib"
GenerateDebugInformation="true"
SubSystem="2"
@@ -151,9 +151,9 @@
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="libtiff.lib"
- OutputFile="$(OutDir)\openimagelib_tiff-vc80-r-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowimage_tiff-vc80-r-0_5_0.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\libtiff\lib"
+ AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\$(ConfigurationName);C:\libtiff\lib"
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
SubSystem="2"
Modified: trunk/lib/openlibraries/src/openimagelib/py/py_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/py/py_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openimagelib/py/py_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -68,7 +68,7 @@
AdditionalDependencies="boost_python-vc80-mt-gd-1_34_1.lib"
OutputFile="$(OutDir)\HDRFlowImage.pyd"
LinkIncremental="2"
- AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName);C:\Python25\Libs"
+ AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\$(ConfigurationName);C:\Python25\Libs"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -152,7 +152,7 @@
AdditionalDependencies="boost_python-vc80-mt-1_34_1.lib"
OutputFile="$(OutDir)\HDRFlowImage.pyd"
LinkIncremental="1"
- AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName);C:\Python25\Libs"
+ AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\$(ConfigurationName);C:\Python25\Libs"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
Modified: trunk/lib/openlibraries/src/openmedialib/ml/config.hpp
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/ml/config.hpp 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openmedialib/ml/config.hpp 2008-02-24 18:00:36 UTC (rev 427)
@@ -37,7 +37,7 @@
#endif
#ifndef OPENMEDIALIB_LIBNAME
-# define OPENMEDIALIB_LIBNAME "openmedialib_ml"
+# define OPENMEDIALIB_LIBNAME "hdrflowmedia_ml"
#endif
#ifndef OPENMEDIALIB_TOOLSET
Modified: trunk/lib/openlibraries/src/openmedialib/ml/ml_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/ml/ml_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openmedialib/ml/ml_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -67,12 +67,12 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openmedialib_ml-vc80-d-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowmedia_ml-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
GenerateDebugInformation="true"
SubSystem="2"
- ImportLibrary="$(TargetDir)openmedialib_ml-vc80-d-0_5_0.lib"
+ ImportLibrary="$(TargetDir)hdrflowmedia_ml-vc80-d-0_5_0.lib"
TargetMachine="1"
/>
<Tool
@@ -150,14 +150,14 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openmedialib_ml-vc80-r-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowmedia_ml-vc80-r-0_5_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- ImportLibrary="$(TargetDir)openmedialib_ml-vc80-r-0_5_0.lib"
+ ImportLibrary="$(TargetDir)hdrflowmedia_ml-vc80-r-0_5_0.lib"
TargetMachine="1"
/>
<Tool
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -68,9 +68,9 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalDependencies="avcodec.lib avformat.lib avutil.lib"
- OutputFile="$(OutDir)\openmedialib_avformat-vc80-d-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowmedia_avformat-vc80-d-0_5_0.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)";"C:\Program Files\FFmpeg\lib""
+ AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\$(ConfigurationName)";"C:\Program Files\FFmpeg\lib""
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -153,9 +153,9 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalDependencies="avcodec.lib avformat.lib avutil.lib"
- OutputFile="$(OutDir)\openmedialib_avformat-vc80-r-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowmedia_avformat-vc80-r-0_5_0.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\Boost\lib;$(SolutionDir)\src\openimagelib\il\$(ConfigurationName);"C:\Program Files\FFmpeg\lib""
+ AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\$(ConfigurationName);C:\Boost\lib;"C:\Program Files\FFmpeg\lib""
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/gensys/gensys_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -67,7 +67,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openmedialib_gensys-vc80-d-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowmedia_gensys-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)""
GenerateDebugInformation="true"
@@ -151,7 +151,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openmedialib_gensys-vc80-r-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowmedia_gensys-vc80-r-0_5_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)""
GenerateDebugInformation="true"
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -66,7 +66,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openmedialib_ofx-vc80-d-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowmedia_ofx-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\Boost\lib;$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
GenerateDebugInformation="true"
@@ -149,7 +149,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openmedialib_ofx-vc80-r-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowmedia_ofx-vc80-r-0_5_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\Boost\lib;$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
GenerateDebugInformation="true"
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/oil/oil_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -68,7 +68,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openmedialib_oil-vc80-d-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowmedia_oil-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\Boost\lib;$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
GenerateDebugInformation="true"
@@ -152,7 +152,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalOptions="/LARGEADDRESSAWARE"
- OutputFile="$(OutDir)\openmedialib_oil-vc80-r-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowmedia_oil-vc80-r-0_5_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\Boost\lib;$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
GenerateDebugInformation="true"
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/openal/openal_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/openal/openal_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/openal/openal_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -68,9 +68,9 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalDependencies="OpenAL32.lib"
- OutputFile="$(OutDir)\openmedialib_openal-vc80-d-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowmedia_openal-vc80-d-0_5_0.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)";"C:\Program Files\OpenAL 1.1 SDK\libs\Win32""
+ AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\$(ConfigurationName)";"C:\Program Files\OpenAL 1.1 SDK\libs\Win32""
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -152,9 +152,9 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalDependencies="OpenAL32.lib"
- OutputFile="$(OutDir)\openmedialib_openal-vc80-r-0_5_0.dll"
+ OutputFile="$(OutDir)\hdrflowmedia_openal-vc80-r-0_5_0.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\Boost\lib;$(SolutionDir)\src\openimagelib\il\$(ConfigurationName);"C:\Program Files\OpenAL 1.1 SDK\libs\Win32""
+ AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\$(ConfigurationName);C:\Boost\lib;"C:\Program Files\OpenAL 1.1 SDK\libs\Win32""
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
Modified: trunk/lib/openlibraries/src/openmedialib/py/py_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/py/py_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openmedialib/py/py_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -70,7 +70,7 @@
AdditionalDependencies="boost_python-vc80-mt-gd-1_34_1.lib"
OutputFile="$(OutDir)\HDRFlowMedia.pyd"
LinkIncremental="2"
- AdditionalLibraryDirectories="C:\Boost\lib;C:\Python25\Libs;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
+ AdditionalLibraryDirectories="C:\Boost\lib;C:\Python25\Libs;$(SolutionDir)\$(ConfigurationName)"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -154,7 +154,7 @@
AdditionalDependencies="boost_python-vc80-mt-1_34_1.lib"
OutputFile="$(OutDir)\HDRFlowMedia.pyd"
LinkIncremental="1"
- AdditionalLibraryDirectories="C:\Boost\lib;C:\Python25\Libs;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
+ AdditionalLibraryDirectories="C:\Boost\lib;C:\Python25\Libs;$(SolutionDir)\$(ConfigurationName)"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/config.hpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/config.hpp 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/config.hpp 2008-02-24 18:00:36 UTC (rev 427)
@@ -23,7 +23,7 @@
#endif
#ifndef OPENPLUGINLIB_LIBNAME
-# define OPENPLUGINLIB_LIBNAME "openpluginlib_pl"
+# define OPENPLUGINLIB_LIBNAME "hdrflowplugin_pl"
#endif
#ifndef OPENPLUGINLIB_TOOLSET
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -69,13 +69,13 @@
Name="VCLinkerTool"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="winmm.lib opengl32.lib glew32.lib cg.lib cgGL.lib"
- OutputFile="$(OutDir)/openpluginlib_pl-vc80-d-0_5_0.dll"
+ OutputFile="$(OutDir)/hdrflowplugin_pl-vc80-d-0_5_0.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\Boost\lib;"C:\Program Files\NVIDIA Corporation\Cg\lib""
GenerateDebugInformation="true"
SubSystem="2"
EntryPointSymbol=""
- ImportLibrary="$(TargetDir)openpluginlib_pl-vc80-d-0_5_0.lib"
+ ImportLibrary="$(TargetDir)hdrflowplugin_pl-vc80-d-0_5_0.lib"
TargetMachine="1"
/>
<Tool
@@ -156,14 +156,14 @@
Name="VCLinkerTool"
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="winmm.lib opengl32.lib glew32.lib cg.lib cgGL.lib"
- OutputFile="$(OutDir)/openpluginlib_pl-vc80-r-0_5_0.dll"
+ OutputFile="$(OutDir)/hdrflowplugin_pl-vc80-r-0_5_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\Boost\lib;"C:\Program Files\NVIDIA Corporation\Cg\lib""
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- ImportLibrary="$(TargetDir)openpluginlib_pl-vc80-r-0_5_0.lib"
+ ImportLibrary="$(TargetDir)hdrflowplugin_pl-vc80-r-0_5_0.lib"
TargetMachine="1"
/>
<Tool
Modified: trunk/lib/openlibraries/test/openmedialib/player/player_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/test/openmedialib/player/player_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/test/openmedialib/player/player_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -70,7 +70,7 @@
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="glew32.lib"
LinkIncremental="2"
- AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\Boost\lib;$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
+ AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\$(ConfigurationName);C:\Boost\lib"
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="1"
@@ -153,7 +153,7 @@
AdditionalOptions="/LARGEADDRESSAWARE"
AdditionalDependencies="glew32.lib"
LinkIncremental="1"
- AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
+ AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\$(ConfigurationName)"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
Modified: trunk/lib/openlibraries/test/openmedialib/store/store_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/test/openmedialib/store/store_vc8.vcproj 2008-02-24 14:42:19 UTC (rev 426)
+++ trunk/lib/openlibraries/test/openmedialib/store/store_vc8.vcproj 2008-02-24 18:00:36 UTC (rev 427)
@@ -69,7 +69,7 @@
Name="VCLinkerTool"
AdditionalOptions="/LARGEADDRESSAWARE"
LinkIncremental="2"
- AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\Boost\lib;$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
+ AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\$(ConfigurationName);C:\Boost\lib"
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="1"
@@ -151,7 +151,7 @@
Name="VCLinkerTool"
AdditionalOptions="/LARGEADDRESSAWARE"
LinkIncremental="1"
- AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\Boost\lib;$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)"
+ AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\$(ConfigurationName);C:\Boost\lib"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
