diff options
author | Denton Woods <devil.imagelib@gmail.com> | 2008-09-19 20:17:30 +0000 |
---|---|---|
committer | Denton Woods <devil.imagelib@gmail.com> | 2008-09-19 20:17:30 +0000 |
commit | bfb339f66fcfdf23b5dc25545c7bda1e80240af5 (patch) | |
tree | 92f0b67ba29a5739dc3e921c3bd20f76b3fc812f | |
parent | 72588c548342349f873b681d8ed14f4822fbbf94 (diff) | |
download | devil-bfb339f66fcfdf23b5dc25545c7bda1e80240af5.tar.gz |
Changed MSVCRT dependency to static library.
-rw-r--r-- | DevIL/ChangeLog | 1 | ||||
-rw-r--r-- | DevIL/examples/WindowsTest/BatchConv.cpp | 10 | ||||
-rw-r--r-- | DevIL/examples/WindowsTest/windowstest-vc8.vcproj | 413 | ||||
-rw-r--r-- | DevIL/projects/msvc8/ImageLib.sln | 13 | ||||
-rw-r--r-- | DevIL/projects/msvc8/extlibs/LibJpeg.vcproj | 2 | ||||
-rw-r--r-- | DevIL/projects/msvc8/extlibs/Libtiff.vcproj | 10 | ||||
-rw-r--r-- | DevIL/projects/msvc8/extlibs/lcms.vcproj | 2 | ||||
-rw-r--r-- | DevIL/projects/msvc8/extlibs/libjasper.vcproj | 2 | ||||
-rw-r--r-- | DevIL/projects/msvc8/extlibs/libmng.vcproj | 2 | ||||
-rw-r--r-- | DevIL/projects/msvc8/extlibs/libpng.vcproj | 2 | ||||
-rw-r--r-- | DevIL/projects/msvc8/extlibs/zlib.vcproj | 2 | ||||
-rw-r--r-- | DevIL/src-IL/msvc8/IL.vcproj | 15 | ||||
-rw-r--r-- | DevIL/src-IL/src/il_exr.cpp | 2 | ||||
-rw-r--r-- | DevIL/src-IL/src/il_jpeg.c | 4 | ||||
-rw-r--r-- | DevIL/src-ILU/msvc/ilu.def | 2 | ||||
-rw-r--r-- | DevIL/src-ILU/msvc8/ILU.vcproj | 7 | ||||
-rw-r--r-- | DevIL/src-ILUT/msvc8/ILUT.vcproj | 13 |
17 files changed, 472 insertions, 30 deletions
diff --git a/DevIL/ChangeLog b/DevIL/ChangeLog index feecc3d1..27e33ac3 100644 --- a/DevIL/ChangeLog +++ b/DevIL/ChangeLog @@ -6,6 +6,7 @@ - Applied bugfixes from Richard Sims (mainly .psd). - Added new Xcode framework. - Added Fortran support. +- Changed MSVC++ 2005 project to link with static MSVCRT library. 1.7.2 --- diff --git a/DevIL/examples/WindowsTest/BatchConv.cpp b/DevIL/examples/WindowsTest/BatchConv.cpp index bedc5869..9c8fd1f5 100644 --- a/DevIL/examples/WindowsTest/BatchConv.cpp +++ b/DevIL/examples/WindowsTest/BatchConv.cpp @@ -57,23 +57,23 @@ void ParseDirs(const string &_Dir, char **ExtList, char *ConvExt, bool Recurse) HANDLE Search; WIN32_FIND_DATA FindData; - chdir(_Dir.c_str()); + _chdir(_Dir.c_str()); Search = FindFirstFile("*.*", &FindData); do { if (!strcmp(FindData.cFileName, ".") || !strcmp(FindData.cFileName, "..")) continue; if (IsDir(&FindData) && Recurse) { - chdir(FindData.cFileName); + _chdir(FindData.cFileName); string NewDir = _Dir + string("\\"); NewDir += FindData.cFileName; ParseDirs(NewDir, ExtList, ConvExt, Recurse); - chdir(".."); + _chdir(".."); } Ext = GetExtension(FindData.cFileName); if (Ext == NULL) continue; - if (!stricmp(Ext, ConvExt)) // Already has that extension. + if (!_stricmp(Ext, ConvExt)) // Already has that extension. continue; for (j = 0; ExtList[j] != NULL; j++) { if (CheckExtension(FindData.cFileName, ExtList[j])) { @@ -154,7 +154,7 @@ bool CheckExtension(char *Arg, char *Ext) if (!PeriodFound) // if no period, no extension return false; - if (!stricmp(Argu+1, Ext)) // extension and ext match? + if (!_stricmp(Argu+1, Ext)) // extension and ext match? return true; return false; // if all else fails, return IL_FALSE diff --git a/DevIL/examples/WindowsTest/windowstest-vc8.vcproj b/DevIL/examples/WindowsTest/windowstest-vc8.vcproj new file mode 100644 index 00000000..5d0833b9 --- /dev/null +++ b/DevIL/examples/WindowsTest/windowstest-vc8.vcproj @@ -0,0 +1,413 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="WindowsTest" + ProjectGUID="{22B03048-FD11-4D7F-88F5-C2628F8B6777}" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Release|Win32" + OutputDirectory=".\../bin" + IntermediateDirectory=".\obj" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="NDEBUG" + MkTypLibCompatible="true" + SuppressStartupBanner="true" + TargetEnvironment="1" + TypeLibraryName=".\../bin/WindowsTest.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/D _CRT_SECURE_NO_DEPRECATE" + Optimization="2" + InlineFunctionExpansion="1" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + PrecompiledHeaderFile=".\obj/WindowsTest.pch" + AssemblerListingLocation=".\obj/" + ObjectFile=".\obj/" + ProgramDataBaseFileName=".\obj/" + WarningLevel="3" + SuppressStartupBanner="true" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="devil.lib ilu.lib ilut.lib comdlg32.lib user32.lib advapi32.lib gdi32.lib shell32.lib" + OutputFile=".\../bin/WindowsTest.exe" + LinkIncremental="1" + SuppressStartupBanner="true" + ProgramDatabaseFile=".\../bin/WindowsTest.pdb" + SubSystem="2" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\../bin/WindowsTest.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|Win32" + OutputDirectory=".\../bin/debug" + IntermediateDirectory=".\obj/debug" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="_DEBUG" + MkTypLibCompatible="true" + SuppressStartupBanner="true" + TargetEnvironment="1" + TypeLibraryName=".\../bin/debug/WindowsTest.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + PrecompiledHeaderFile=".\obj/debug/WindowsTest.pch" + AssemblerListingLocation=".\obj/debug/" + ObjectFile=".\obj/debug/" + ProgramDataBaseFileName=".\obj/debug/" + WarningLevel="3" + SuppressStartupBanner="true" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="comdlg32.lib user32.lib advapi32.lib gdi32.lib shell32.lib" + OutputFile=".\../bin/debug/WindowsTest.exe" + LinkIncremental="2" + SuppressStartupBanner="true" + GenerateDebugInformation="true" + ProgramDatabaseFile=".\../bin/debug/WindowsTest.pdb" + SubSystem="2" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\../bin/debug/WindowsTest.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Dynamic|Win32" + OutputDirectory=".\WindowsTest___Win32_Dynamic" + IntermediateDirectory=".\WindowsTest___Win32_Dynamic" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="NDEBUG" + MkTypLibCompatible="true" + SuppressStartupBanner="true" + TargetEnvironment="1" + TypeLibraryName=".\WindowsTest___Win32_Dynamic/WindowsTest.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + PrecompiledHeaderFile=".\WindowsTest___Win32_Dynamic/WindowsTest.pch" + AssemblerListingLocation=".\WindowsTest___Win32_Dynamic/" + ObjectFile=".\WindowsTest___Win32_Dynamic/" + ProgramDataBaseFileName=".\WindowsTest___Win32_Dynamic/" + WarningLevel="3" + SuppressStartupBanner="true" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="../bin/WindowsTest.exe" + LinkIncremental="1" + SuppressStartupBanner="true" + ProgramDatabaseFile="../bin/debug/WindowsTest.pdb" + SubSystem="2" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\WindowsTest___Win32_Dynamic/WindowsTest.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + > + <File + RelativePath="BatchConv.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Dynamic|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="WindowsTest.cpp" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Dynamic|Win32" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl" + > + <File + RelativePath="resource.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" + > + <File + RelativePath="resources\OpenIL Logo.ico" + > + </File> + <File + RelativePath="WindowsTest.rc" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Dynamic|Win32" + > + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> diff --git a/DevIL/projects/msvc8/ImageLib.sln b/DevIL/projects/msvc8/ImageLib.sln index d812fb24..099dca17 100644 --- a/DevIL/projects/msvc8/ImageLib.sln +++ b/DevIL/projects/msvc8/ImageLib.sln @@ -14,6 +14,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ILUT", "..\..\src-ILUT\msvc {B46B180B-6079-4CE6-8647-A7D712774255} = {B46B180B-6079-4CE6-8647-A7D712774255} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WindowsTest", "..\..\examples\WindowsTest\WindowsTest-vc8.vcproj", "{22B03048-FD11-4D7F-88F5-C2628F8B6777}" + ProjectSection(ProjectDependencies) = postProject + {B46B180B-6079-4CE6-8647-A7D712774255} = {B46B180B-6079-4CE6-8647-A7D712774255} + {CCEBAA77-521A-4CC3-A4E0-C6B062FC2009} = {CCEBAA77-521A-4CC3-A4E0-C6B062FC2009} + {7D060DA4-F2FA-44CC-80BE-065024DD6CA9} = {7D060DA4-F2FA-44CC-80BE-065024DD6CA9} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -39,6 +46,12 @@ Global {7D060DA4-F2FA-44CC-80BE-065024DD6CA9}.Dynamic|Win32.Build.0 = Release|Win32 {7D060DA4-F2FA-44CC-80BE-065024DD6CA9}.Release|Win32.ActiveCfg = Release|Win32 {7D060DA4-F2FA-44CC-80BE-065024DD6CA9}.Release|Win32.Build.0 = Release|Win32 + {22B03048-FD11-4D7F-88F5-C2628F8B6777}.Debug|Win32.ActiveCfg = Debug|Win32 + {22B03048-FD11-4D7F-88F5-C2628F8B6777}.Debug|Win32.Build.0 = Debug|Win32 + {22B03048-FD11-4D7F-88F5-C2628F8B6777}.Dynamic|Win32.ActiveCfg = Dynamic|Win32 + {22B03048-FD11-4D7F-88F5-C2628F8B6777}.Dynamic|Win32.Build.0 = Dynamic|Win32 + {22B03048-FD11-4D7F-88F5-C2628F8B6777}.Release|Win32.ActiveCfg = Release|Win32 + {22B03048-FD11-4D7F-88F5-C2628F8B6777}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/DevIL/projects/msvc8/extlibs/LibJpeg.vcproj b/DevIL/projects/msvc8/extlibs/LibJpeg.vcproj index 96971e97..3aab405a 100644 --- a/DevIL/projects/msvc8/extlibs/LibJpeg.vcproj +++ b/DevIL/projects/msvc8/extlibs/LibJpeg.vcproj @@ -193,7 +193,7 @@ InlineFunctionExpansion="1" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" StringPooling="true" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="true" PrecompiledHeaderFile=".\libjpeg___Win32_Release/LibJpeg.pch" AssemblerListingLocation=".\libjpeg___Win32_Release/" diff --git a/DevIL/projects/msvc8/extlibs/Libtiff.vcproj b/DevIL/projects/msvc8/extlibs/Libtiff.vcproj index 8127645f..afc6542a 100644 --- a/DevIL/projects/msvc8/extlibs/Libtiff.vcproj +++ b/DevIL/projects/msvc8/extlibs/Libtiff.vcproj @@ -118,7 +118,7 @@ InlineFunctionExpansion="1" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" StringPooling="true" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="true" PrecompiledHeaderFile=".\libtiff___Win32_Release/Libtiff.pch" AssemblerListingLocation=".\libtiff___Win32_Release/" @@ -246,10 +246,6 @@ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" > <File - RelativePath="..\..\..\extlibs\LibTiff\libtiff\mkg3states.c" - > - </File> - <File RelativePath="..\..\..\extlibs\LibTiff\libtiff\tif_aux.c" > </File> @@ -326,6 +322,10 @@ > </File> <File + RelativePath="..\..\..\extlibs\libtiff\libtiff\tif_next.c" + > + </File> + <File RelativePath="..\..\..\extlibs\LibTiff\libtiff\tif_ojpeg.c" > </File> diff --git a/DevIL/projects/msvc8/extlibs/lcms.vcproj b/DevIL/projects/msvc8/extlibs/lcms.vcproj index c2278dd0..2e7d08c9 100644 --- a/DevIL/projects/msvc8/extlibs/lcms.vcproj +++ b/DevIL/projects/msvc8/extlibs/lcms.vcproj @@ -221,7 +221,7 @@ AdditionalIncludeDirectories="..\..\include;../../../extlibs/littlecms/include" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS" StringPooling="true" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\lcms___Win32_Release/lcms.pch" diff --git a/DevIL/projects/msvc8/extlibs/libjasper.vcproj b/DevIL/projects/msvc8/extlibs/libjasper.vcproj index 5557bb21..27d5dff6 100644 --- a/DevIL/projects/msvc8/extlibs/libjasper.vcproj +++ b/DevIL/projects/msvc8/extlibs/libjasper.vcproj @@ -45,7 +45,7 @@ AdditionalIncludeDirectories="..\..\..\extlibs\JasPer\src\libjasper\include" PreprocessorDefinitions="NDEBUG;WIN32;_LIB;JAS_WIN_MSVC_BUILD" StringPooling="true" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="true" PrecompiledHeaderFile=".\libjasper___Win32_Release/libjasper.pch" AssemblerListingLocation=".\libjasper___Win32_Release/" diff --git a/DevIL/projects/msvc8/extlibs/libmng.vcproj b/DevIL/projects/msvc8/extlibs/libmng.vcproj index 305095a4..457d3981 100644 --- a/DevIL/projects/msvc8/extlibs/libmng.vcproj +++ b/DevIL/projects/msvc8/extlibs/libmng.vcproj @@ -144,7 +144,7 @@ AdditionalIncludeDirectories="../../../extlibs/littlecms/include;../../../extlibs/zlib;../../../extlibs/libjpeg" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;MNG_BUILD_SO;MNG_USE_SO" StringPooling="true" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\libmng___Win32_Release/libmng.pch" diff --git a/DevIL/projects/msvc8/extlibs/libpng.vcproj b/DevIL/projects/msvc8/extlibs/libpng.vcproj index e942ed31..15b8ef97 100644 --- a/DevIL/projects/msvc8/extlibs/libpng.vcproj +++ b/DevIL/projects/msvc8/extlibs/libpng.vcproj @@ -137,7 +137,7 @@ AdditionalIncludeDirectories="..\..,..\..\..\zlib" PreprocessorDefinitions="WIN32;NDEBUG" StringPooling="true" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="true" UsePrecompiledHeader="2" PrecompiledHeaderThrough="png.h" diff --git a/DevIL/projects/msvc8/extlibs/zlib.vcproj b/DevIL/projects/msvc8/extlibs/zlib.vcproj index 54251995..09b93a14 100644 --- a/DevIL/projects/msvc8/extlibs/zlib.vcproj +++ b/DevIL/projects/msvc8/extlibs/zlib.vcproj @@ -204,7 +204,7 @@ InlineFunctionExpansion="1" PreprocessorDefinitions="WIN32;NDEBUG" StringPooling="true" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="true" PrecompiledHeaderFile=".\zlib___Win32_Release/zlib.pch" AssemblerListingLocation=".\zlib___Win32_Release/" diff --git a/DevIL/src-IL/msvc8/IL.vcproj b/DevIL/src-IL/msvc8/IL.vcproj index b8a0383b..c8ecd8f6 100644 --- a/DevIL/src-IL/msvc8/IL.vcproj +++ b/DevIL/src-IL/msvc8/IL.vcproj @@ -4,6 +4,7 @@ Version="8.00" Name="IL" ProjectGUID="{B46B180B-6079-4CE6-8647-A7D712774255}" + RootNamespace="IL" > <Platforms> <Platform @@ -73,12 +74,14 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="odbc32.lib odbccp32.lib libtiff.lib libpng.lib libjpeg.lib zlib.lib lcms.lib libjasper.lib" + AdditionalDependencies="libtiff.lib libpng.lib libjpeg.lib zlib.lib lcms.lib libjasper.lib IlmImf.lib half.lib imath.lib iex.lib ilmthread.lib" OutputFile="../../lib/vc8/debug/DevIL.dll" LinkIncremental="2" SuppressStartupBanner="true" AdditionalLibraryDirectories="../../projects/msvc/extlibs" + IgnoreDefaultLibraryNames="libcmt.lib" ModuleDefinitionFile=".\il.def" + DelayLoadDLLs="ilmimf.dll half.dll" GenerateDebugInformation="true" ProgramDatabaseFile=".\../../lib/vc8/debug/devil.pdb" ImportLibrary=".\../../lib/vc8/debug/devil.lib" @@ -109,6 +112,7 @@ /> <Tool Name="VCPostBuildEventTool" + CommandLine="copy $(TargetPath) ..\..\examples\bin\debug" /> </Configuration> <Configuration @@ -149,7 +153,7 @@ AdditionalIncludeDirectories="../../projects/msvc/extlibs/,../include,../../include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IL_EXPORTS" StringPooling="true" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="true" PrecompiledHeaderFile=".\../src/obj/IL.pch" AssemblerListingLocation=".\../src/obj/" @@ -172,12 +176,15 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="libtiff.lib libpng.lib libjpeg.lib zlib.lib lcms.lib libjasper.lib" + AdditionalOptions="/NODEFAULTLIB:msvcrtd.lib" + AdditionalDependencies="comdlg32.lib user32.lib advapi32.lib gdi32.lib shell32.lib libcmt.lib libtiff.lib libpng.lib libjpeg.lib zlib.lib lcms.lib libjasper.lib IlmImf.lib half.lib imath.lib iex.lib ilmthread.lib" OutputFile="../../lib/vc8/DevIL.dll" LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="../../projects/msvc/extlibs" + IgnoreDefaultLibraryNames="" ModuleDefinitionFile=".\il.def" + DelayLoadDLLs="ilmimf.dll half.dll" ProgramDatabaseFile=".\../../lib/vc8/DevIL.pdb" OptimizeForWindows98="1" ImportLibrary=".\../../lib/vc8/DevIL.lib" @@ -208,7 +215,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="" + CommandLine="copy $(TargetPath) ..\..\examples\bin" /> </Configuration> </Configurations> diff --git a/DevIL/src-IL/src/il_exr.cpp b/DevIL/src-IL/src/il_exr.cpp index 5c65f3f0..ea763341 100644 --- a/DevIL/src-IL/src/il_exr.cpp +++ b/DevIL/src-IL/src/il_exr.cpp @@ -14,6 +14,8 @@ #include "il_internal.h" #ifndef IL_NO_EXR +#define OPENEXR_DLL +#define HALF_EXPORTS #include "il_exr.h" #include <ImfRgba.h> #include <ImfArray.h> diff --git a/DevIL/src-IL/src/il_jpeg.c b/DevIL/src-IL/src/il_jpeg.c index 58d37539..15099869 100644 --- a/DevIL/src-IL/src/il_jpeg.c +++ b/DevIL/src-IL/src/il_jpeg.c @@ -906,7 +906,7 @@ ILboolean ilSaveFromJpegStruct(ILvoid *_JpegInfo) { #ifndef IL_NO_JPG #ifndef IL_USE_IJL - void (*errorHandler)(j_common_ptr); + void (*errorHandler)(); JSAMPROW row_pointer[1]; ILimage *TempImage; ILubyte *TempData; @@ -917,7 +917,7 @@ ILboolean ilSaveFromJpegStruct(ILvoid *_JpegInfo) return IL_FALSE; } - //added on 2003-08-31 as explained in sf bug 596793 + //added on 2003-08-31 as explained in SF bug 596793 jpgErrorOccured = IL_FALSE; errorHandler = JpegInfo->err->error_exit; diff --git a/DevIL/src-ILU/msvc/ilu.def b/DevIL/src-ILU/msvc/ilu.def index bc3dc4e7..0afb5808 100644 --- a/DevIL/src-ILU/msvc/ilu.def +++ b/DevIL/src-ILU/msvc/ilu.def @@ -6,6 +6,7 @@ iluBlurAvg iluBlurGaussian iluBuildMipmaps iluColoursUsed +iluConvolution iluCompareImage iluContrast iluCrop @@ -42,6 +43,7 @@ iluSaturate1f iluSaturate4f iluScaleColours iluScale +iluScaleAlpha iluSharpen iluSwapColours iluWave diff --git a/DevIL/src-ILU/msvc8/ILU.vcproj b/DevIL/src-ILU/msvc8/ILU.vcproj index 209a58f2..f57e930a 100644 --- a/DevIL/src-ILU/msvc8/ILU.vcproj +++ b/DevIL/src-ILU/msvc8/ILU.vcproj @@ -108,7 +108,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="" + CommandLine="copy $(TargetPath) ..\..\examples\bin\debug" /> </Configuration> <Configuration @@ -149,7 +149,7 @@ AdditionalIncludeDirectories="../include,../../include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;ILU_EXPORTS" StringPooling="true" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="true" PrecompiledHeaderFile=".\../src/obj/ILU.pch" AssemblerListingLocation=".\../src/obj/" @@ -177,6 +177,7 @@ LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="../../lib" + IgnoreDefaultLibraryNames="msvcrt.lib" ModuleDefinitionFile=".\ilu.def" ProgramDatabaseFile=".\../../lib/ILU.pdb" ImportLibrary=".\../../lib/vc8/ILU.lib" @@ -207,7 +208,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="" + CommandLine="copy $(TargetPath) ..\..\examples\bin" /> </Configuration> </Configurations> diff --git a/DevIL/src-ILUT/msvc8/ILUT.vcproj b/DevIL/src-ILUT/msvc8/ILUT.vcproj index 6a89ae50..ef53e72c 100644 --- a/DevIL/src-ILUT/msvc8/ILUT.vcproj +++ b/DevIL/src-ILUT/msvc8/ILUT.vcproj @@ -4,6 +4,7 @@ Version="8.00" Name="ILUT" ProjectGUID="{7D060DA4-F2FA-44CC-80BE-065024DD6CA9}" + RootNamespace="ILUT" > <Platforms> <Platform @@ -51,7 +52,7 @@ AdditionalIncludeDirectories="../include,../../include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;ILUT_EXPORTS;IL_STATIC_LIB" StringPooling="true" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="true" PrecompiledHeaderFile=".\../src/obj/ILUT.pch" AssemblerListingLocation=".\../src/obj/" @@ -73,13 +74,14 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="devil.lib ilu.lib alleg.lib odbc32.lib odbccp32.lib Gdi32.lib User32.lib Comdlg32.lib" + AdditionalDependencies="devil.lib ilu.lib odbc32.lib odbccp32.lib Gdi32.lib User32.lib Comdlg32.lib" OutputFile=".\../../lib/vc8/ILUT.dll" LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="../../lib" + IgnoreDefaultLibraryNames="msvcrt.lib" ModuleDefinitionFile=".\ilut.def" - DelayLoadDLLs="d3d8.dll,sdl.dll,alleg42.dll" + DelayLoadDLLs="opengl32.dll,glu32.dll,d3d8.dll,d3d9.dll,sdl.dll,alleg42.dll,wininet.dll" ProgramDatabaseFile=".\../../lib/ILUT.pdb" ImportLibrary=".\../../lib/vc8/ILUT.lib" TargetMachine="1" @@ -109,7 +111,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="" + CommandLine="copy $(TargetPath) ..\..\examples\bin" /> </Configuration> <Configuration @@ -172,7 +174,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="devil.lib ilu.lib alleg.lib delayimp.lib odbc32.lib odbccp32.lib Gdi32.lib User32.lib Comdlg32.lib" + AdditionalDependencies="devil.lib ilu.lib delayimp.lib odbc32.lib odbccp32.lib Gdi32.lib User32.lib Comdlg32.lib" OutputFile=".\../../lib/vc8/debug/ILUT.dll" LinkIncremental="2" SuppressStartupBanner="true" @@ -209,6 +211,7 @@ /> <Tool Name="VCPostBuildEventTool" + CommandLine="copy $(TargetPath) ..\..\examples\bin\debug" /> </Configuration> </Configurations> |