[Hdrflow-svn] SF.net SVN: hdrflow: [387] trunk/lib
Status: Pre-Alpha
Brought to you by:
glslang
From: <gl...@us...> - 2007-12-29 15:34:39
|
Revision: 387 http://hdrflow.svn.sourceforge.net/hdrflow/?rev=387&view=rev Author: glslang Date: 2007-12-29 07:34:35 -0800 (Sat, 29 Dec 2007) Log Message: ----------- + port maya plugin to win + build fixes to account for FFMpeg from SVN Modified Paths: -------------- trunk/lib/extras/extras_vc8.sln trunk/lib/extras/src/imf/mfn/mfn.cpp trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_vc8.vcproj Added Paths: ----------- trunk/lib/extras/src/imf/hdr/readers_vc8.vcproj trunk/lib/extras/src/imf/mfn/config.hpp trunk/lib/extras/src/imf/mfn/readers_vc8.vcproj Modified: trunk/lib/extras/extras_vc8.sln =================================================================== --- trunk/lib/extras/extras_vc8.sln 2007-12-22 20:01:12 UTC (rev 386) +++ trunk/lib/extras/extras_vc8.sln 2007-12-29 15:34:35 UTC (rev 387) @@ -24,6 +24,10 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "noise", "src\noise\noise_vc8.vcproj", "{927446CD-3483-4CCF-B581-F0896DD4A550}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Maya 2008", "Maya 2008", "{0CED7D48-905C-4C67-96B9-668B7728ED10}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "readers", "src\imf\mfn\readers_vc8.vcproj", "{061A3FF5-B3C6-4CDC-A018-5B985C234CD6}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Multi-threaded Debug DLL|Win32 = Multi-threaded Debug DLL|Win32 @@ -50,6 +54,10 @@ {927446CD-3483-4CCF-B581-F0896DD4A550}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32 {927446CD-3483-4CCF-B581-F0896DD4A550}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32 {927446CD-3483-4CCF-B581-F0896DD4A550}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32 + {061A3FF5-B3C6-4CDC-A018-5B985C234CD6}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32 + {061A3FF5-B3C6-4CDC-A018-5B985C234CD6}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32 + {061A3FF5-B3C6-4CDC-A018-5B985C234CD6}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32 + {061A3FF5-B3C6-4CDC-A018-5B985C234CD6}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -60,10 +68,12 @@ {D133B05E-F174-4CDA-8FF4-C45C139CFACD} = {2644DB77-2096-4A50-A23F-C57D3C011FE2} {CE7A290A-13C0-424E-A02A-96CDC6B0E6BE} = {2644DB77-2096-4A50-A23F-C57D3C011FE2} {4E0BD6BF-2B4D-4BF8-BEB7-3BFF57D627BC} = {2644DB77-2096-4A50-A23F-C57D3C011FE2} + {0CED7D48-905C-4C67-96B9-668B7728ED10} = {2644DB77-2096-4A50-A23F-C57D3C011FE2} {B4CCC2D9-D505-4B08-B908-B2A38105ABC8} = {675FBBBA-6681-49E3-AAC6-FE371310DA63} {927446CD-3483-4CCF-B581-F0896DD4A550} = {E0C3CF4A-5F43-4BBC-B7A9-6D4CDB225CD9} {C8F73831-1355-45C9-BD1B-C7AAB4CDE373} = {D133B05E-F174-4CDA-8FF4-C45C139CFACD} {9A2197B4-ABC1-4047-A81B-15E9D228C108} = {CE7A290A-13C0-424E-A02A-96CDC6B0E6BE} {95CD0C43-860C-467B-9995-E6A4E0F8519B} = {4E0BD6BF-2B4D-4BF8-BEB7-3BFF57D627BC} + {061A3FF5-B3C6-4CDC-A018-5B985C234CD6} = {0CED7D48-905C-4C67-96B9-668B7728ED10} EndGlobalSection EndGlobal Added: trunk/lib/extras/src/imf/hdr/readers_vc8.vcproj =================================================================== --- trunk/lib/extras/src/imf/hdr/readers_vc8.vcproj (rev 0) +++ trunk/lib/extras/src/imf/hdr/readers_vc8.vcproj 2007-12-29 15:34:35 UTC (rev 387) @@ -0,0 +1,205 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="readers" + ProjectGUID="{061A3FF5-B3C6-4CDC-A018-5B985C234CD6}" + RootNamespace="readers" + Keyword="Win32Proj" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Multi-threaded Debug DLL|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories=""$(SolutionDir)\..\openlibraries\src";"C:\Boost\include\boost-1_34_1"" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;READERS_EXPORTS;HAVE_FLEX_STRING" + MinimalRebuild="true" + ExceptionHandling="2" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="false" + OpenMP="true" + UsePrecompiledHeader="0" + WarningLevel="4" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(OutDir)\hdrflow_extras_maya_readers-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)"" + GenerateDebugInformation="true" + SubSystem="2" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Multi-threaded Release DLL|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(SolutionDir)\..\openlibraries\src";"C:\Boost\include\boost-1_34_1"" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;READERS_EXPORTS;HAVE_FLEX_STRING" + ExceptionHandling="2" + RuntimeLibrary="2" + BufferSecurityCheck="false" + OpenMP="true" + UsePrecompiledHeader="0" + WarningLevel="4" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(OutDir)\hdrflow_extras_maya_readers-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)"" + GenerateDebugInformation="true" + SubSystem="2" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </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}" + > + </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/extras/src/imf/hdr/readers_vc8.vcproj ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/lib/extras/src/imf/mfn/config.hpp =================================================================== --- trunk/lib/extras/src/imf/mfn/config.hpp (rev 0) +++ trunk/lib/extras/src/imf/mfn/config.hpp 2007-12-29 15:34:35 UTC (rev 387) @@ -0,0 +1,25 @@ + +// mfn - Autodesk's Maya import/export image plugin + +// Copyright (c) 2007 Goncalo N. M. de Carvalho +// Released under the GPL. +// For more information, see http://www.hdrflow.com. + +#ifndef READERS_CONFIG_INC_ +#define READERS_CONFIG_INC_ + +#ifdef WIN32 +# ifdef READERS_EXPORTS +# define READERS_DECLSPEC __declspec( dllexport ) +# else +# define READERS_DECLSPEC __declspec( dllimport ) +# endif +#else +# ifdef READERS_EXPORTS +# define READERS_DECLSPEC __attribute__( ( visibility( "default" ) ) ) +# else +# define READERS_DECLSPEC __attribute__( ( visibility( "default" ) ) ) +# endif +#endif + +#endif Property changes on: trunk/lib/extras/src/imf/mfn/config.hpp ___________________________________________________________________ Name: svn:eol-style + native Modified: trunk/lib/extras/src/imf/mfn/mfn.cpp =================================================================== --- trunk/lib/extras/src/imf/mfn/mfn.cpp 2007-12-22 20:01:12 UTC (rev 386) +++ trunk/lib/extras/src/imf/mfn/mfn.cpp 2007-12-29 15:34:35 UTC (rev 387) @@ -23,6 +23,8 @@ #include <openimagelib/il/openimagelib_plugin.hpp> +#include <imf/mfn/config.hpp> + namespace pl = olib::openpluginlib; namespace il = olib::openimagelib::il; @@ -188,7 +190,7 @@ } } } -extern "C" MStatus initializePlugin( MObject obj ) +extern "C" READERS_DECLSPEC MStatus initializePlugin( MObject obj ) { MFnPlugin plugin( obj, "com.cryogenicgraphics", "8.0", "Any" ); MStringArray extensions; @@ -210,7 +212,7 @@ return MS::kSuccess; } -extern "C" MStatus uninitializePlugin( MObject obj ) +extern "C" READERS_DECLSPEC MStatus uninitializePlugin( MObject obj ) { MFnPlugin plugin( obj ); CHECK_MSTATUS( plugin.deregisterImageFile( "HDRFlow" ) ); Added: trunk/lib/extras/src/imf/mfn/readers_vc8.vcproj =================================================================== --- trunk/lib/extras/src/imf/mfn/readers_vc8.vcproj (rev 0) +++ trunk/lib/extras/src/imf/mfn/readers_vc8.vcproj 2007-12-29 15:34:35 UTC (rev 387) @@ -0,0 +1,217 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="readers" + ProjectGUID="{061A3FF5-B3C6-4CDC-A018-5B985C234CD6}" + RootNamespace="readers" + Keyword="Win32Proj" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Multi-threaded Debug DLL|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories=""$(SolutionDir)\..\openlibraries\src";"$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";"C:\Program Files\Autodesk\Maya2008\include"" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;READERS_EXPORTS;HAVE_FLEX_STRING;_BOOL;REQUIRE_IOSTREAM" + MinimalRebuild="true" + ExceptionHandling="2" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="false" + OpenMP="true" + UsePrecompiledHeader="0" + WarningLevel="4" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + IgnoreImportLibrary="true" + 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"" + GenerateDebugInformation="true" + SubSystem="2" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Multi-threaded Release DLL|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(SolutionDir)\..\openlibraries\src";"$(SolutionDir)\src";"C:\Boost\include\boost-1_34_1";"C:\Program Files\Autodesk\Maya2008\include"" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;READERS_EXPORTS;HAVE_FLEX_STRING;_BOOL;REQUIRE_IOSTREAM" + ExceptionHandling="2" + RuntimeLibrary="2" + BufferSecurityCheck="false" + OpenMP="true" + UsePrecompiledHeader="0" + WarningLevel="4" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + IgnoreImportLibrary="true" + 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"" + GenerateDebugInformation="true" + SubSystem="2" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </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=".\mfn.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> + </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/extras/src/imf/mfn/readers_vc8.vcproj ___________________________________________________________________ Name: svn:eol-style + native Modified: trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_vc8.vcproj =================================================================== --- trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_vc8.vcproj 2007-12-22 20:01:12 UTC (rev 386) +++ trunk/lib/openlibraries/src/openmedialib/plugins/avformat/avformat_vc8.vcproj 2007-12-29 15:34:35 UTC (rev 387) @@ -67,7 +67,7 @@ <Tool Name="VCLinkerTool" IgnoreImportLibrary="true" - AdditionalDependencies="avcodec-51.lib avformat-51.lib avutil-49.lib" + AdditionalDependencies="avcodec.lib avformat.lib avutil.lib" OutputFile="$(OutDir)\openmedialib_avformat-vc80-d-0_5_0.dll" LinkIncremental="2" AdditionalLibraryDirectories="C:\Boost\lib;"$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName)";"$(SolutionDir)\src\openimagelib\il\$(ConfigurationName)";"C:\Program Files\FFmpeg\lib"" @@ -151,7 +151,7 @@ <Tool Name="VCLinkerTool" IgnoreImportLibrary="true" - AdditionalDependencies="avcodec-51.lib avformat-51.lib avutil-49.lib" + AdditionalDependencies="avcodec.lib avformat.lib avutil.lib" OutputFile="$(OutDir)\openmedialib_avformat-vc80-r-0_5_0.dll" LinkIncremental="1" AdditionalLibraryDirectories="C:\Boost\lib;$(SolutionDir)\src\openpluginlib\pl\$(ConfigurationName);C:\Boost\lib;$(SolutionDir)\src\openimagelib\il\$(ConfigurationName);"C:\Program Files\FFmpeg\lib"" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |