diff options
| author | Denton Woods <devil.imagelib@gmail.com> | 2008-11-10 18:03:42 +0000 |
|---|---|---|
| committer | Denton Woods <devil.imagelib@gmail.com> | 2008-11-10 18:03:42 +0000 |
| commit | e08e4199e199a0614f39a01d8b4d2a74f2ffdabc (patch) | |
| tree | bb1c56da3f980a15ba85e2de509751d3052258c2 | |
| parent | 2cb6efc29c926ad18348e69dafb8100294c63114 (diff) | |
| download | devil-e08e4199e199a0614f39a01d8b4d2a74f2ffdabc.tar.gz | |
Adding better Unicode support
26 files changed, 6196 insertions, 275 deletions
diff --git a/DevIL/include/IL/config.h.win b/DevIL/include/IL/config.h.win index 15f70ad8..ce7b4216 100644 --- a/DevIL/include/IL/config.h.win +++ b/DevIL/include/IL/config.h.win @@ -3,8 +3,7 @@ #ifndef __CONFIG_H__ #define __CONFIG_H__ -/* Text handling */ -#define IL_USE_UTF16 // Windows uses UTF16 internally, while Linux-based systems use UTF8. +#define IL_USE_PRAGMA_LIBS // /* Supported images formats (il) */ diff --git a/DevIL/projects/msvc/ImageLib.sln b/DevIL/projects/msvc/ImageLib.sln index f402daee..099dca17 100644 --- a/DevIL/projects/msvc/ImageLib.sln +++ b/DevIL/projects/msvc/ImageLib.sln @@ -1,29 +1,24 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ILU", "..\..\src-ILU\msvc\ILU.vcproj", "{98884911-2B7F-45C7-B0FD-CB909E8CB7C1}" - ProjectSection(ProjectDependencies) = postProject - {0F088168-B0B4-4350-9E6A-7FB271C76D39} = {0F088168-B0B4-4350-9E6A-7FB271C76D39} - EndProjectSection + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual C++ Express 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IL", "..\..\src-IL\msvc8\IL.vcproj", "{B46B180B-6079-4CE6-8647-A7D712774255}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ILUT", "..\..\src-ILUT\msvc\ILUT.vcproj", "{A4563D37-173F-4459-BDC5-9F42992AEF45}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ILU", "..\..\src-ILU\msvc8\ILU.vcproj", "{CCEBAA77-521A-4CC3-A4E0-C6B062FC2009}" ProjectSection(ProjectDependencies) = postProject - {98884911-2B7F-45C7-B0FD-CB909E8CB7C1} = {98884911-2B7F-45C7-B0FD-CB909E8CB7C1} - {0F088168-B0B4-4350-9E6A-7FB271C76D39} = {0F088168-B0B4-4350-9E6A-7FB271C76D39} + {B46B180B-6079-4CE6-8647-A7D712774255} = {B46B180B-6079-4CE6-8647-A7D712774255} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IL", "..\..\src-IL\msvc\IL.vcproj", "{0F088168-B0B4-4350-9E6A-7FB271C76D39}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WindowsTest", "..\..\examples\WindowsTest\WindowsTest.vcproj", "{DEA982DD-5797-4D77-A33A-367D0395612B}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ILUT", "..\..\src-ILUT\msvc8\ILUT.vcproj", "{7D060DA4-F2FA-44CC-80BE-065024DD6CA9}" ProjectSection(ProjectDependencies) = postProject - {98884911-2B7F-45C7-B0FD-CB909E8CB7C1} = {98884911-2B7F-45C7-B0FD-CB909E8CB7C1} - {A4563D37-173F-4459-BDC5-9F42992AEF45} = {A4563D37-173F-4459-BDC5-9F42992AEF45} - {0F088168-B0B4-4350-9E6A-7FB271C76D39} = {0F088168-B0B4-4350-9E6A-7FB271C76D39} + {CCEBAA77-521A-4CC3-A4E0-C6B062FC2009} = {CCEBAA77-521A-4CC3-A4E0-C6B062FC2009} + {B46B180B-6079-4CE6-8647-A7D712774255} = {B46B180B-6079-4CE6-8647-A7D712774255} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Scratch Test", "..\..\test\Scratch Test\Scratch Test.vcproj", "{9F2E96BF-0A49-4C24-B33E-76A4F42ED1EB}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WindowsTest", "..\..\examples\WindowsTest\WindowsTest-vc8.vcproj", "{22B03048-FD11-4D7F-88F5-C2628F8B6777}" ProjectSection(ProjectDependencies) = postProject - {98884911-2B7F-45C7-B0FD-CB909E8CB7C1} = {98884911-2B7F-45C7-B0FD-CB909E8CB7C1} - {0F088168-B0B4-4350-9E6A-7FB271C76D39} = {0F088168-B0B4-4350-9E6A-7FB271C76D39} + {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 @@ -33,41 +28,32 @@ Global Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {98884911-2B7F-45C7-B0FD-CB909E8CB7C1}.Debug|Win32.ActiveCfg = Debug|Win32 - {98884911-2B7F-45C7-B0FD-CB909E8CB7C1}.Debug|Win32.Build.0 = Debug|Win32 - {98884911-2B7F-45C7-B0FD-CB909E8CB7C1}.Dynamic|Win32.ActiveCfg = Release|Win32 - {98884911-2B7F-45C7-B0FD-CB909E8CB7C1}.Dynamic|Win32.Build.0 = Release|Win32 - {98884911-2B7F-45C7-B0FD-CB909E8CB7C1}.Release|Win32.ActiveCfg = Release|Win32 - {98884911-2B7F-45C7-B0FD-CB909E8CB7C1}.Release|Win32.Build.0 = Release|Win32 - {A4563D37-173F-4459-BDC5-9F42992AEF45}.Debug|Win32.ActiveCfg = Debug|Win32 - {A4563D37-173F-4459-BDC5-9F42992AEF45}.Debug|Win32.Build.0 = Debug|Win32 - {A4563D37-173F-4459-BDC5-9F42992AEF45}.Dynamic|Win32.ActiveCfg = Release|Win32 - {A4563D37-173F-4459-BDC5-9F42992AEF45}.Dynamic|Win32.Build.0 = Release|Win32 - {A4563D37-173F-4459-BDC5-9F42992AEF45}.Release|Win32.ActiveCfg = Release|Win32 - {A4563D37-173F-4459-BDC5-9F42992AEF45}.Release|Win32.Build.0 = Release|Win32 - {0F088168-B0B4-4350-9E6A-7FB271C76D39}.Debug|Win32.ActiveCfg = Debug|Win32 - {0F088168-B0B4-4350-9E6A-7FB271C76D39}.Debug|Win32.Build.0 = Debug|Win32 - {0F088168-B0B4-4350-9E6A-7FB271C76D39}.Dynamic|Win32.ActiveCfg = Release|Win32 - {0F088168-B0B4-4350-9E6A-7FB271C76D39}.Dynamic|Win32.Build.0 = Release|Win32 - {0F088168-B0B4-4350-9E6A-7FB271C76D39}.Release|Win32.ActiveCfg = Release|Win32 - {0F088168-B0B4-4350-9E6A-7FB271C76D39}.Release|Win32.Build.0 = Release|Win32 - {DEA982DD-5797-4D77-A33A-367D0395612B}.Debug|Win32.ActiveCfg = Debug|Win32 - {DEA982DD-5797-4D77-A33A-367D0395612B}.Debug|Win32.Build.0 = Debug|Win32 - {DEA982DD-5797-4D77-A33A-367D0395612B}.Dynamic|Win32.ActiveCfg = Release|Win32 - {DEA982DD-5797-4D77-A33A-367D0395612B}.Dynamic|Win32.Build.0 = Release|Win32 - {DEA982DD-5797-4D77-A33A-367D0395612B}.Release|Win32.ActiveCfg = Release|Win32 - {DEA982DD-5797-4D77-A33A-367D0395612B}.Release|Win32.Build.0 = Release|Win32 - {9F2E96BF-0A49-4C24-B33E-76A4F42ED1EB}.Debug|Win32.ActiveCfg = Debug|Win32 - {9F2E96BF-0A49-4C24-B33E-76A4F42ED1EB}.Debug|Win32.Build.0 = Debug|Win32 - {9F2E96BF-0A49-4C24-B33E-76A4F42ED1EB}.Dynamic|Win32.ActiveCfg = Debug|Win32 - {9F2E96BF-0A49-4C24-B33E-76A4F42ED1EB}.Dynamic|Win32.Build.0 = Debug|Win32 - {9F2E96BF-0A49-4C24-B33E-76A4F42ED1EB}.Release|Win32.ActiveCfg = Release|Win32 - {9F2E96BF-0A49-4C24-B33E-76A4F42ED1EB}.Release|Win32.Build.0 = Release|Win32 + {B46B180B-6079-4CE6-8647-A7D712774255}.Debug|Win32.ActiveCfg = Debug|Win32 + {B46B180B-6079-4CE6-8647-A7D712774255}.Debug|Win32.Build.0 = Debug|Win32 + {B46B180B-6079-4CE6-8647-A7D712774255}.Dynamic|Win32.ActiveCfg = Release|Win32 + {B46B180B-6079-4CE6-8647-A7D712774255}.Dynamic|Win32.Build.0 = Release|Win32 + {B46B180B-6079-4CE6-8647-A7D712774255}.Release|Win32.ActiveCfg = Release|Win32 + {B46B180B-6079-4CE6-8647-A7D712774255}.Release|Win32.Build.0 = Release|Win32 + {CCEBAA77-521A-4CC3-A4E0-C6B062FC2009}.Debug|Win32.ActiveCfg = Debug|Win32 + {CCEBAA77-521A-4CC3-A4E0-C6B062FC2009}.Debug|Win32.Build.0 = Debug|Win32 + {CCEBAA77-521A-4CC3-A4E0-C6B062FC2009}.Dynamic|Win32.ActiveCfg = Release|Win32 + {CCEBAA77-521A-4CC3-A4E0-C6B062FC2009}.Dynamic|Win32.Build.0 = Release|Win32 + {CCEBAA77-521A-4CC3-A4E0-C6B062FC2009}.Release|Win32.ActiveCfg = Release|Win32 + {CCEBAA77-521A-4CC3-A4E0-C6B062FC2009}.Release|Win32.Build.0 = Release|Win32 + {7D060DA4-F2FA-44CC-80BE-065024DD6CA9}.Debug|Win32.ActiveCfg = Debug|Win32 + {7D060DA4-F2FA-44CC-80BE-065024DD6CA9}.Debug|Win32.Build.0 = Debug|Win32 + {7D060DA4-F2FA-44CC-80BE-065024DD6CA9}.Dynamic|Win32.ActiveCfg = Release|Win32 + {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 EndGlobalSection - GlobalSection(DPCodeReviewSolutionGUID) = preSolution - DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} - EndGlobalSection EndGlobal diff --git a/DevIL/src-IL/msvc/IL Unicode.rc b/DevIL/src-IL/msvc/IL Unicode.rc new file mode 100644 index 00000000..0508f09f --- /dev/null +++ b/DevIL/src-IL/msvc/IL Unicode.rc @@ -0,0 +1,58 @@ +// Generated by ResEdit 1.4.3 +// Copyright (C) 2006-2008 +// http://www.resedit.net + +#include "resource.h" +#include "windows.h" + + +// +// Version Information resources +// +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +1 VERSIONINFO + FILEVERSION 0,1,7,2 + PRODUCTVERSION 0,1,7,2 + FILEOS VOS__WINDOWS32 + FILETYPE VFT_DLL +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Comments", "DevIL: A portable image library in development\0" + VALUE "CompanyName", "Abysmal Software\0" + VALUE "FileDescription", "DevIL: A portable image library in development\0" + VALUE "FileVersion", "1.7.2\0" + VALUE "InternalName", "Developer's Image Library (DevIL)\0" + VALUE "LegalCopyright", "Copyright 2000-2008\0" + VALUE "LegalTrademarks", "Under LGPL License\0" + VALUE "OriginalFilename", "DevIL.dll\0" + VALUE "PrivateBuild", "Open Source\0" + VALUE "ProductName", "Developer's Image Library (DevIL)\0" + VALUE "ProductVersion", "1.7.2 Unicode\0" + VALUE "SpecialBuild", "Unicode\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 1033, 1200 + END +END + + +// +// Icon resources +// +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +IDI_ICON1 ICON "resources\\IL Logo.ico" + + +// +// String Table resources +// +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +STRINGTABLE +BEGIN + IDC_OPENIL "Developer's Image Library, Version 1.7.2" +END diff --git a/DevIL/src-IL/msvc/IL Unicode.vcproj b/DevIL/src-IL/msvc/IL Unicode.vcproj index c523aa3b..af34f5c6 100644 --- a/DevIL/src-IL/msvc/IL Unicode.vcproj +++ b/DevIL/src-IL/msvc/IL Unicode.vcproj @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="9.00" - Name="IL Unicode" - ProjectGUID="{1FD529FA-1CF1-4C28-B280-E7BDAE1689AB}" - RootNamespace="IL Unicode" - TargetFrameworkVersion="131072" + Version="8.00" + Name="IL" + ProjectGUID="{B46B180B-6079-4CE6-8647-A7D712774255}" + RootNamespace="IL" > <Platforms> <Platform @@ -17,10 +16,10 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="..\..\lib\unicode\debug" - IntermediateDirectory="unicode\$(ConfigurationName)" + OutputDirectory=".\../../lib/vc8/debug" + IntermediateDirectory="Debug" ConfigurationType="2" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="1" @@ -43,21 +42,22 @@ MkTypLibCompatible="true" SuppressStartupBanner="true" TargetEnvironment="1" - TypeLibraryName=".\../../lib/unicode/debug/IL.tlb" + TypeLibraryName=".\../../lib/debug/IL.tlb" HeaderFileName="" /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"" Optimization="0" - AdditionalIncludeDirectories="../include;../../include" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB" - ExceptionHandling="0" - BasicRuntimeChecks="2" - RuntimeLibrary="3" - UsePrecompiledHeader="0" - PrecompiledHeaderThrough="" - WarningLevel="4" + AdditionalIncludeDirectories="../../projects/msvc/extlibs/,../include,../../include" + PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;_WINDOWS;IL_EXPORTS" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + PrecompiledHeaderFile=".\../src/obj/debug/IL.pch" + AssemblerListingLocation=".\../src/obj/debug/" + ObjectFile=".\../src/obj/debug/" + ProgramDataBaseFileName=".\../src/obj/debug/" + WarningLevel="3" SuppressStartupBanner="true" DebugInformationFormat="4" /> @@ -74,11 +74,18 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="libtiff.lib libpng.lib libjpeg.lib zlib.lib lcms.lib libjasper.lib" - OutputFile="$(OutDir)\DevIL.dll" - ModuleDefinitionFile="il.def" + AdditionalDependencies="libcmtd.lib comdlg32.lib user32.lib advapi32.lib gdi32.lib shell32.lib" + OutputFile="../../lib/vc8/debug/DevIL.dll" + LinkIncremental="2" + SuppressStartupBanner="true" + AdditionalLibraryDirectories="../../projects/msvc/extlibs" + IgnoreDefaultLibraryNames="msvcrt.lib;msvcrtd.lib" + ModuleDefinitionFile=".\il.def" + DelayLoadDLLs="ilmimf.dll half.dll" GenerateDebugInformation="true" - AssemblyDebug="0" + ProgramDatabaseFile=".\../../lib/vc8/debug/devil.pdb" + ImportLibrary=".\../../lib/vc8/debug/devil.lib" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -91,6 +98,8 @@ /> <Tool Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile="../src/obj/debug/DevIL.bsc" /> <Tool Name="VCFxCopTool" @@ -99,16 +108,19 @@ Name="VCAppVerifierTool" /> <Tool + Name="VCWebDeploymentTool" + /> + <Tool Name="VCPostBuildEventTool" - CommandLine="" + CommandLine="copy $(TargetPath) c:\windows\system32" /> </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="..\..\lib\unicode" - IntermediateDirectory="unicode\$(ConfigurationName)" + OutputDirectory=".\../../lib/vc8" + IntermediateDirectory="Release" ConfigurationType="2" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="1" @@ -131,20 +143,22 @@ MkTypLibCompatible="true" SuppressStartupBanner="true" TargetEnvironment="1" - TypeLibraryName=".\../../lib/unicode/IL.tlb" + TypeLibraryName=".\../../lib/IL.tlb" HeaderFileName="" /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"" - Optimization="2" - AdditionalIncludeDirectories="../include;../../include" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB" + Optimization="1" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="../../projects/msvc/extlibs/,../include,../../include" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IL_EXPORTS" StringPooling="true" - RuntimeLibrary="2" - BufferSecurityCheck="false" - UsePrecompiledHeader="0" - PrecompiledHeaderThrough="" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" + PrecompiledHeaderFile=".\../src/obj/IL.pch" + AssemblerListingLocation=".\../src/obj/" + ObjectFile=".\../src/obj/" + ProgramDataBaseFileName=".\../src/obj/" WarningLevel="3" SuppressStartupBanner="true" /> @@ -155,15 +169,26 @@ Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" + AdditionalIncludeDirectories="..\include" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="libtiff.lib libpng.lib libjpeg.lib zlib.lib lcms.lib libjasper.lib" - OutputFile="$(OutDir)\DevIL.dll" - ModuleDefinitionFile="il.def" + AdditionalOptions="/NODEFAULTLIB:msvcrtd.lib" + AdditionalDependencies="libcmt.lib comdlg32.lib user32.lib advapi32.lib gdi32.lib shell32.lib" + OutputFile="../../lib/vc8/DevIL.dll" + LinkIncremental="1" + SuppressStartupBanner="true" + AdditionalLibraryDirectories="../../projects/msvc/extlibs" + IgnoreDefaultLibraryNames="msvcrt.lib" + ModuleDefinitionFile=".\il.def" + DelayLoadDLLs="ilmimf.dll half.dll" + ProgramDatabaseFile=".\../../lib/vc8/DevIL.pdb" + OptimizeForWindows98="1" + ImportLibrary=".\../../lib/vc8/DevIL.lib" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -176,6 +201,8 @@ /> <Tool Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile="../src/obj/DevIL.bsc" /> <Tool Name="VCFxCopTool" @@ -184,8 +211,11 @@ Name="VCAppVerifierTool" /> <Tool + Name="VCWebDeploymentTool" + /> + <Tool Name="VCPostBuildEventTool" - CommandLine="
" + CommandLine="copy $(TargetPath) c:\windows\system32" /> </Configuration> </Configurations> @@ -197,60 +227,302 @@ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" > <File - RelativePath=".\il.def" + RelativePath="..\src\altivec_common.c" + > + </File> + <File + RelativePath="..\src\altivec_typeconversion.c" + > + </File> + <File + RelativePath="..\msvc\il.def" > </File> <File RelativePath="..\src\il_alloc.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_bits.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_bmp.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_convbuff.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_convert.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_cut.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_dcx.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_dds-save.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_dds.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_devil.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_doom.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_endian.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_error.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_exr.cpp" @@ -259,22 +531,112 @@ <File RelativePath="..\src\il_fastconv.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_files.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_gif.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_hdr.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_header.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_icns.c" @@ -283,14 +645,68 @@ <File RelativePath="..\src\il_icon.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_internal.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_io.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_jp2.c" @@ -299,126 +715,688 @@ <File RelativePath="..\src\il_jpeg.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_lif.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_main.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_manip.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_mdl.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_mng.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_neuquant.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_pal.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_pcd.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_pcx.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_pic.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_pix.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_png.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_pnm.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_profiles.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_psd.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_psp.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_pxr.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_quantizer.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_raw.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_rawdata.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_register.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_rle.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_sgi.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_stack.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_states.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_targa.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_tiff.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_utility.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_wal.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_wdp.c" + > </File> <File RelativePath="..\src\il_xpm.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> </Filter> <Filter @@ -478,7 +1456,7 @@ > </File> <File - RelativePath="..\include\il_icns.h" + RelativePath="..\include\il_hdr.h" > </File> <File @@ -490,10 +1468,6 @@ > </File> <File - RelativePath="..\include\il_jp2.h" - > - </File> - <File RelativePath="..\include\il_jpeg.h" > </File> @@ -567,7 +1541,11 @@ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" > <File - RelativePath=".\IL.rc" + RelativePath="resources\IL Logo.ico" + > + </File> + <File + RelativePath=".\IL Unicode.rc" > </File> </Filter> @@ -580,10 +1558,6 @@ > </File> <File - RelativePath="..\..\BUGS" - > - </File> - <File RelativePath="..\..\ChangeLog" > </File> @@ -607,6 +1581,10 @@ RelativePath="..\..\README.win" > </File> + <File + RelativePath="..\..\TODO" + > + </File> </Filter> </Files> <Globals> diff --git a/DevIL/src-IL/msvc/IL.rc b/DevIL/src-IL/msvc/IL.rc index c3d6baac..e4742c58 100644 --- a/DevIL/src-IL/msvc/IL.rc +++ b/DevIL/src-IL/msvc/IL.rc @@ -30,8 +30,8 @@ BEGIN VALUE "OriginalFilename", "DevIL.dll\0" VALUE "PrivateBuild", "Open Source\0" VALUE "ProductName", "Developer's Image Library (DevIL)\0" - VALUE "ProductVersion", "1.7.2\0" - VALUE "SpecialBuild", "eh?\0" + VALUE "ProductVersion", "1.7.2 Ansi\0" + VALUE "SpecialBuild", "Ansi\0" END END BLOCK "VarFileInfo" @@ -54,5 +54,5 @@ IDI_ICON1 ICON "resources\\IL Logo.ico" LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDC_OPENIL "Developer's Image Library, Version 1.7.1" + IDC_OPENIL "Developer's Image Library, Version 1.7.2" END diff --git a/DevIL/src-IL/msvc/IL.vcproj b/DevIL/src-IL/msvc/IL.vcproj index 0fd35a64..dc21e482 100644 --- a/DevIL/src-IL/msvc/IL.vcproj +++ b/DevIL/src-IL/msvc/IL.vcproj @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="9.00" + Version="8.00" Name="IL" - ProjectGUID="{0F088168-B0B4-4350-9E6A-7FB271C76D39}" + ProjectGUID="{B46B180B-6079-4CE6-8647-A7D712774255}" RootNamespace="IL" - TargetFrameworkVersion="131072" > <Platforms> <Platform @@ -17,13 +16,13 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="..\..\lib" - IntermediateDirectory="$(ConfigurationName)" + OutputDirectory=".\../../lib/vc8/debug" + IntermediateDirectory="Debug" ConfigurationType="2" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="1" + CharacterSet="2" > <Tool Name="VCPreBuildEventTool" @@ -48,16 +47,17 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"" Optimization="0" - AdditionalIncludeDirectories="../include;../../include" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB" - ExceptionHandling="0" - BasicRuntimeChecks="2" - RuntimeLibrary="3" - UsePrecompiledHeader="0" - PrecompiledHeaderThrough="" - WarningLevel="4" + AdditionalIncludeDirectories="../../projects/msvc/extlibs/,../include,../../include" + PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;_WINDOWS;IL_EXPORTS" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + PrecompiledHeaderFile=".\../src/obj/debug/IL.pch" + AssemblerListingLocation=".\../src/obj/debug/" + ObjectFile=".\../src/obj/debug/" + ProgramDataBaseFileName=".\../src/obj/debug/" + WarningLevel="3" SuppressStartupBanner="true" DebugInformationFormat="4" /> @@ -74,11 +74,18 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="libtiff.lib libpng.lib libjpeg.lib zlib.lib lcms.lib libjasper.lib WMPGlue.lib WMPMetaLib.lib DecodeLib.lib EncodeLib.lib CommonLib.lib MemtraceLib.lib" - OutputFile="$(OutDir)\DevIL.dll" - ModuleDefinitionFile="il.def" + AdditionalDependencies="libcmtd.lib comdlg32.lib user32.lib advapi32.lib gdi32.lib shell32.lib" + OutputFile="../../lib/vc8/debug/DevIL.dll" + LinkIncremental="2" + SuppressStartupBanner="true" + AdditionalLibraryDirectories="../../projects/msvc/extlibs" + IgnoreDefaultLibraryNames="msvcrt.lib;msvcrtd.lib" + ModuleDefinitionFile=".\il.def" + DelayLoadDLLs="ilmimf.dll half.dll" GenerateDebugInformation="true" - AssemblyDebug="0" + ProgramDatabaseFile=".\../../lib/vc8/debug/devil.pdb" + ImportLibrary=".\../../lib/vc8/debug/devil.lib" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -91,6 +98,8 @@ /> <Tool Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile="../src/obj/debug/DevIL.bsc" /> <Tool Name="VCFxCopTool" @@ -99,19 +108,22 @@ Name="VCAppVerifierTool" /> <Tool + Name="VCWebDeploymentTool" + /> + <Tool Name="VCPostBuildEventTool" - CommandLine="copy "$(TargetPath)" "../../examples/bin/debug"" + CommandLine="copy $(TargetPath) c:\windows\system32" /> </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="..\..\lib" - IntermediateDirectory="$(ConfigurationName)" + OutputDirectory=".\../../lib/vc8" + IntermediateDirectory="Release" ConfigurationType="2" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="1" + CharacterSet="2" > <Tool Name="VCPreBuildEventTool" @@ -136,15 +148,17 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"" - Optimization="2" - AdditionalIncludeDirectories="../include;../../include" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB" + Optimization="1" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="../../projects/msvc/extlibs/,../include,../../include" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IL_EXPORTS" StringPooling="true" - RuntimeLibrary="2" - BufferSecurityCheck="false" - UsePrecompiledHeader="0" - PrecompiledHeaderThrough="" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" + PrecompiledHeaderFile=".\../src/obj/IL.pch" + AssemblerListingLocation=".\../src/obj/" + ObjectFile=".\../src/obj/" + ProgramDataBaseFileName=".\../src/obj/" WarningLevel="3" SuppressStartupBanner="true" /> @@ -155,16 +169,26 @@ Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" + AdditionalIncludeDirectories="..\include" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="libtiff.lib libpng.lib libjpeg.lib zlib.lib lcms.lib libjasper.lib WMPGlue.lib WMPMetaLib.lib DecodeLib.lib EncodeLib.lib CommonLib.lib MemtraceLib.lib" - OutputFile="$(OutDir)\DevIL.dll" - IgnoreDefaultLibraryNames="" - ModuleDefinitionFile="il.def" + AdditionalOptions="/NODEFAULTLIB:msvcrtd.lib" + AdditionalDependencies="libcmt.lib comdlg32.lib user32.lib advapi32.lib gdi32.lib shell32.lib" + OutputFile="../../lib/vc8/DevIL.dll" + LinkIncremental="1" + SuppressStartupBanner="true" + AdditionalLibraryDirectories="../../projects/msvc/extlibs" + IgnoreDefaultLibraryNames="msvcrt.lib" + ModuleDefinitionFile=".\il.def" + DelayLoadDLLs="ilmimf.dll half.dll" + ProgramDatabaseFile=".\../../lib/vc8/DevIL.pdb" + OptimizeForWindows98="1" + ImportLibrary=".\../../lib/vc8/DevIL.lib" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -177,6 +201,8 @@ /> <Tool Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile="../src/obj/DevIL.bsc" /> <Tool Name="VCFxCopTool" @@ -185,8 +211,11 @@ Name="VCAppVerifierTool" /> <Tool + Name="VCWebDeploymentTool" + /> + <Tool Name="VCPostBuildEventTool" - CommandLine="copy "$(TargetPath)" "../../examples/bin/"" + CommandLine="copy $(TargetPath) c:\windows\system32" /> </Configuration> </Configurations> @@ -198,60 +227,302 @@ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" > <File - RelativePath=".\il.def" + RelativePath="..\src\altivec_common.c" + > + </File> + <File + RelativePath="..\src\altivec_typeconversion.c" + > + </File> + <File + RelativePath="..\msvc\il.def" > </File> <File RelativePath="..\src\il_alloc.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_bits.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_bmp.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_convbuff.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_convert.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_cut.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_dcx.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_dds-save.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_dds.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_devil.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_doom.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_endian.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_error.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_exr.cpp" @@ -260,22 +531,112 @@ <File RelativePath="..\src\il_fastconv.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_files.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_gif.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_hdr.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_header.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_icns.c" @@ -284,14 +645,68 @@ <File RelativePath="..\src\il_icon.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_internal.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_io.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_jp2.c" @@ -300,122 +715,662 @@ <File RelativePath="..\src\il_jpeg.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_lif.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_main.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_manip.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_mdl.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_mng.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_neuquant.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_pal.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_pcd.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_pcx.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_pic.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_pix.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_png.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_pnm.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_profiles.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_psd.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_psp.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_pxr.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_quantizer.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_raw.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_rawdata.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_register.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_rle.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_sgi.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_stack.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_states.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_targa.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_tiff.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_utility.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_wal.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\il_wdp.c" @@ -424,6 +1379,24 @@ <File RelativePath="..\src\il_xpm.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> </Filter> <Filter @@ -487,10 +1460,6 @@ > </File> <File - RelativePath="..\include\il_icns.h" - > - </File> - <File RelativePath="..\include\il_icon.h" > </File> @@ -499,10 +1468,6 @@ > </File> <File - RelativePath="..\include\il_jp2.h" - > - </File> - <File RelativePath="..\include\il_jpeg.h" > </File> @@ -576,9 +1541,30 @@ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" > <File - RelativePath=".\IL.rc" + RelativePath="resources\IL Logo.ico" > </File> + <File + RelativePath="IL.rc" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="" + AdditionalIncludeDirectories="" + /> + </FileConfiguration> + </File> </Filter> <Filter Name="Text Files" @@ -589,10 +1575,6 @@ > </File> <File - RelativePath="..\..\BUGS" - > - </File> - <File RelativePath="..\..\ChangeLog" > </File> @@ -609,10 +1591,6 @@ > </File> <File - RelativePath="..\..\README" - > - </File> - <File RelativePath="..\..\README.unix" > </File> diff --git a/DevIL/src-IL/msvc8/IL Unicode.rc b/DevIL/src-IL/msvc8/IL Unicode.rc new file mode 100644 index 00000000..0508f09f --- /dev/null +++ b/DevIL/src-IL/msvc8/IL Unicode.rc @@ -0,0 +1,58 @@ +// Generated by ResEdit 1.4.3 +// Copyright (C) 2006-2008 +// http://www.resedit.net + +#include "resource.h" +#include "windows.h" + + +// +// Version Information resources +// +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +1 VERSIONINFO + FILEVERSION 0,1,7,2 + PRODUCTVERSION 0,1,7,2 + FILEOS VOS__WINDOWS32 + FILETYPE VFT_DLL +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Comments", "DevIL: A portable image library in development\0" + VALUE "CompanyName", "Abysmal Software\0" + VALUE "FileDescription", "DevIL: A portable image library in development\0" + VALUE "FileVersion", "1.7.2\0" + VALUE "InternalName", "Developer's Image Library (DevIL)\0" + VALUE "LegalCopyright", "Copyright 2000-2008\0" + VALUE "LegalTrademarks", "Under LGPL License\0" + VALUE "OriginalFilename", "DevIL.dll\0" + VALUE "PrivateBuild", "Open Source\0" + VALUE "ProductName", "Developer's Image Library (DevIL)\0" + VALUE "ProductVersion", "1.7.2 Unicode\0" + VALUE "SpecialBuild", "Unicode\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 1033, 1200 + END +END + + +// +// Icon resources +// +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +IDI_ICON1 ICON "resources\\IL Logo.ico" + + +// +// String Table resources +// +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +STRINGTABLE +BEGIN + IDC_OPENIL "Developer's Image Library, Version 1.7.2" +END diff --git a/DevIL/src-IL/msvc8/IL Unicode.vcproj b/DevIL/src-IL/msvc8/IL Unicode.vcproj new file mode 100644 index 00000000..af34f5c6 --- /dev/null +++ b/DevIL/src-IL/msvc8/IL Unicode.vcproj @@ -0,0 +1,1592 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="IL" + ProjectGUID="{B46B180B-6079-4CE6-8647-A7D712774255}" + RootNamespace="IL" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory=".\../../lib/vc8/debug" + IntermediateDirectory="Debug" + ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="_DEBUG" + MkTypLibCompatible="true" + SuppressStartupBanner="true" + TargetEnvironment="1" + TypeLibraryName=".\../../lib/debug/IL.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="../../projects/msvc/extlibs/,../include,../../include" + PreprocessorDefinitions="WIN32;_DEBUG;_USRDLL;_WINDOWS;IL_EXPORTS" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + PrecompiledHeaderFile=".\../src/obj/debug/IL.pch" + AssemblerListingLocation=".\../src/obj/debug/" + ObjectFile=".\../src/obj/debug/" + ProgramDataBaseFileName=".\../src/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="libcmtd.lib comdlg32.lib user32.lib advapi32.lib gdi32.lib shell32.lib" + OutputFile="../../lib/vc8/debug/DevIL.dll" + LinkIncremental="2" + SuppressStartupBanner="true" + AdditionalLibraryDirectories="../../projects/msvc/extlibs" + IgnoreDefaultLibraryNames="msvcrt.lib;msvcrtd.lib" + ModuleDefinitionFile=".\il.def" + DelayLoadDLLs="ilmimf.dll half.dll" + GenerateDebugInformation="true" + ProgramDatabaseFile=".\../../lib/vc8/debug/devil.pdb" + ImportLibrary=".\../../lib/vc8/debug/devil.lib" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile="../src/obj/debug/DevIL.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="copy $(TargetPath) c:\windows\system32" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory=".\../../lib/vc8" + IntermediateDirectory="Release" + ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="NDEBUG" + MkTypLibCompatible="true" + SuppressStartupBanner="true" + TargetEnvironment="1" + TypeLibraryName=".\../../lib/IL.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="1" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="../../projects/msvc/extlibs/,../include,../../include" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IL_EXPORTS" + StringPooling="true" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" + PrecompiledHeaderFile=".\../src/obj/IL.pch" + AssemblerListingLocation=".\../src/obj/" + ObjectFile=".\../src/obj/" + ProgramDataBaseFileName=".\../src/obj/" + WarningLevel="3" + SuppressStartupBanner="true" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + AdditionalIncludeDirectories="..\include" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalOptions="/NODEFAULTLIB:msvcrtd.lib" + AdditionalDependencies="libcmt.lib comdlg32.lib user32.lib advapi32.lib gdi32.lib shell32.lib" + OutputFile="../../lib/vc8/DevIL.dll" + LinkIncremental="1" + SuppressStartupBanner="true" + AdditionalLibraryDirectories="../../projects/msvc/extlibs" + IgnoreDefaultLibraryNames="msvcrt.lib" + ModuleDefinitionFile=".\il.def" + DelayLoadDLLs="ilmimf.dll half.dll" + ProgramDatabaseFile=".\../../lib/vc8/DevIL.pdb" + OptimizeForWindows98="1" + ImportLibrary=".\../../lib/vc8/DevIL.lib" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile="../src/obj/DevIL.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="copy $(TargetPath) c:\windows\system32" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + > + <File + RelativePath="..\src\altivec_common.c" + > + </File> + <File + RelativePath="..\src\altivec_typeconversion.c" + > + </File> + <File + RelativePath="..\msvc\il.def" + > + </File> + <File + RelativePath="..\src\il_alloc.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_bits.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_bmp.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_convbuff.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_convert.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_cut.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_dcx.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_dds-save.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_dds.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_devil.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_doom.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_endian.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_error.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_exr.cpp" + > + </File> + <File + RelativePath="..\src\il_fastconv.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_files.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_gif.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_hdr.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_header.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_icns.c" + > + </File> + <File + RelativePath="..\src\il_icon.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_internal.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_io.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_jp2.c" + > + </File> + <File + RelativePath="..\src\il_jpeg.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_lif.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_main.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_manip.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_mdl.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_mng.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_neuquant.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_pal.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_pcd.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_pcx.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_pic.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_pix.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_png.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_pnm.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_profiles.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_psd.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_psp.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_pxr.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_quantizer.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_raw.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_rawdata.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_register.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_rle.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_sgi.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_stack.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_states.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_targa.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_tiff.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_utility.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_wal.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\il_wdp.c" + > + </File> + <File + RelativePath="..\src\il_xpm.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl" + > + <File + RelativePath="..\..\include\IL\config.h" + > + </File> + <File + RelativePath="..\..\include\IL\devil_internal_exports.h" + > + </File> + <File + RelativePath="..\..\include\il\il.h" + > + </File> + <File + RelativePath="..\include\il_alloc.h" + > + </File> + <File + RelativePath="..\include\il_bits.h" + > + </File> + <File + RelativePath="..\include\il_bmp.h" + > + </File> + <File + RelativePath="..\include\il_dcx.h" + > + </File> + <File + RelativePath="..\include\il_dds.h" + > + </File> + <File + RelativePath="..\include\il_doompal.h" + > + </File> + <File + RelativePath="..\include\il_endian.h" + > + </File> + <File + RelativePath="..\include\il_exr.h" + > + </File> + <File + RelativePath="..\include\il_files.h" + > + </File> + <File + RelativePath="..\include\il_gif.h" + > + </File> + <File + RelativePath="..\include\il_hdr.h" + > + </File> + <File + RelativePath="..\include\il_icon.h" + > + </File> + <File + RelativePath="..\include\il_internal.h" + > + </File> + <File + RelativePath="..\include\il_jpeg.h" + > + </File> + <File + RelativePath="..\include\il_lif.h" + > + </File> + <File + RelativePath="..\include\il_manip.h" + > + </File> + <File + RelativePath="..\include\il_mdl.h" + > + </File> + <File + RelativePath="..\include\il_pal.h" + > + </File> + <File + RelativePath="..\include\il_pcx.h" + > + </File> + <File + RelativePath="..\include\il_pic.h" + > + </File> + <File + RelativePath="..\include\il_pnm.h" + > + </File> + <File + RelativePath="..\include\il_psd.h" + > + </File> + <File + RelativePath="..\include\il_psp.h" + > + </File> + <File + RelativePath="..\include\il_q2pal.h" + > + </File> + <File + RelativePath="..\include\il_register.h" + > + </File> + <File + RelativePath="..\include\il_rle.h" + > + </File> + <File + RelativePath="..\include\il_sgi.h" + > + </File> + <File + RelativePath="..\include\il_stack.h" + > + </File> + <File + RelativePath="..\include\il_states.h" + > + </File> + <File + RelativePath="..\include\il_targa.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" + > + <File + RelativePath="resources\IL Logo.ico" + > + </File> + <File + RelativePath=".\IL Unicode.rc" + > + </File> + </Filter> + <Filter + Name="Text Files" + Filter="txt" + > + <File + RelativePath="..\..\AUTHORS" + > + </File> + <File + RelativePath="..\..\ChangeLog" + > + </File> + <File + RelativePath="..\..\CREDITS" + > + </File> + <File + RelativePath="..\..\libraries.txt" + > + </File> + <File + RelativePath="..\..\MSVC++.txt" + > + </File> + <File + RelativePath="..\..\README.unix" + > + </File> + <File + RelativePath="..\..\README.win" + > + </File> + <File + RelativePath="..\..\TODO" + > + </File> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> diff --git a/DevIL/src-IL/msvc8/IL.rc b/DevIL/src-IL/msvc8/IL.rc index 8963ee84..e4742c58 100644 --- a/DevIL/src-IL/msvc8/IL.rc +++ b/DevIL/src-IL/msvc8/IL.rc @@ -30,8 +30,8 @@ BEGIN VALUE "OriginalFilename", "DevIL.dll\0" VALUE "PrivateBuild", "Open Source\0" VALUE "ProductName", "Developer's Image Library (DevIL)\0" - VALUE "ProductVersion", "1.7.2\0" - VALUE "SpecialBuild", "eh?\0" + VALUE "ProductVersion", "1.7.2 Ansi\0" + VALUE "SpecialBuild", "Ansi\0" END END BLOCK "VarFileInfo" diff --git a/DevIL/src-IL/msvc8/IL.vcproj b/DevIL/src-IL/msvc8/IL.vcproj index 2c035be0..dc21e482 100644 --- a/DevIL/src-IL/msvc8/IL.vcproj +++ b/DevIL/src-IL/msvc8/IL.vcproj @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="9.00" + Version="8.00" Name="IL" ProjectGUID="{B46B180B-6079-4CE6-8647-A7D712774255}" RootNamespace="IL" - TargetFrameworkVersion="131072" > <Platforms> <Platform @@ -17,13 +16,13 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory=".\../../lib/debug" + OutputDirectory=".\../../lib/vc8/debug" IntermediateDirectory="Debug" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="1" + CharacterSet="2" > <Tool Name="VCPreBuildEventTool" @@ -76,7 +75,7 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="libcmtd.lib comdlg32.lib user32.lib advapi32.lib gdi32.lib shell32.lib" - OutputFile="../../lib/debug/DevIL.dll" + OutputFile="../../lib/vc8/debug/DevIL.dll" LinkIncremental="2" SuppressStartupBanner="true" AdditionalLibraryDirectories="../../projects/msvc/extlibs" @@ -84,10 +83,8 @@ ModuleDefinitionFile=".\il.def" DelayLoadDLLs="ilmimf.dll half.dll" GenerateDebugInformation="true" - ProgramDatabaseFile=".\../../lib/debug/devil.pdb" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - ImportLibrary=".\../../lib/debug/devil.lib" + ProgramDatabaseFile=".\../../lib/vc8/debug/devil.pdb" + ImportLibrary=".\../../lib/vc8/debug/devil.lib" TargetMachine="1" /> <Tool @@ -111,19 +108,22 @@ Name="VCAppVerifierTool" /> <Tool + Name="VCWebDeploymentTool" + /> + <Tool Name="VCPostBuildEventTool" CommandLine="copy $(TargetPath) c:\windows\system32" /> </Configuration> <Configuration Name="Release|Win32" - OutputDirectory=".\../../lib" + OutputDirectory=".\../../lib/vc8" IntermediateDirectory="Release" ConfigurationType="2" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="1" + CharacterSet="2" > <Tool Name="VCPreBuildEventTool" @@ -178,18 +178,16 @@ Name="VCLinkerTool" AdditionalOptions="/NODEFAULTLIB:msvcrtd.lib" AdditionalDependencies="libcmt.lib comdlg32.lib user32.lib advapi32.lib gdi32.lib shell32.lib" - OutputFile="../../lib/DevIL.dll" + OutputFile="../../lib/vc8/DevIL.dll" LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="../../projects/msvc/extlibs" IgnoreDefaultLibraryNames="msvcrt.lib" ModuleDefinitionFile=".\il.def" DelayLoadDLLs="ilmimf.dll half.dll" - ProgramDatabaseFile=".\../../lib/DevIL.pdb" + ProgramDatabaseFile=".\../../lib/vc8/DevIL.pdb" OptimizeForWindows98="1" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - ImportLibrary=".\../../lib/DevIL.lib" + ImportLibrary=".\../../lib/vc8/DevIL.lib" TargetMachine="1" /> <Tool @@ -213,6 +211,9 @@ Name="VCAppVerifierTool" /> <Tool + Name="VCWebDeploymentTool" + /> + <Tool Name="VCPostBuildEventTool" CommandLine="copy $(TargetPath) c:\windows\system32" /> diff --git a/DevIL/src-ILU/include/ilu_error/ilu_err-arabic.h b/DevIL/src-ILU/include/ilu_error/ilu_err-arabic.h index e7612822..a7b51028 100644 --- a/DevIL/src-ILU/include/ilu_error/ilu_err-arabic.h +++ b/DevIL/src-ILU/include/ilu_error/ilu_err-arabic.h @@ -1,8 +1,8 @@ -//----------------------------------------------------------------------------- +//----------------------------------------------------------------------------- // // ImageLib Utility Sources // Copyright (C) 2000-2008 by Denton Woods -// Last modified: 11/08/2008 +// Last modified: 11/10/2008 // // Filename: src-ILU/include/ilu_error/ilu_err-arabic.h // @@ -42,7 +42,7 @@ ILconst_string iluLibErrorStringsArabic[IL_LIB_MNG_ERROR - IL_LIB_GIF_ERROR + 1] IL_TEXT("خطأ في مكتبة jpeg"), IL_TEXT("خطأ في مكتبة png"), IL_TEXT("خطأ في مكتبة tiff"), - IL_TEXT("خطأ في مكتبة mng" + IL_TEXT("خطأ في مكتبة mng") }; ILconst_string iluMiscErrorStringsArabic[2] = { diff --git a/DevIL/src-ILU/include/ilu_error/ilu_err-japanese.h b/DevIL/src-ILU/include/ilu_error/ilu_err-japanese.h index 9fc7c358..2076f5d8 100644 --- a/DevIL/src-ILU/include/ilu_error/ilu_err-japanese.h +++ b/DevIL/src-ILU/include/ilu_error/ilu_err-japanese.h @@ -1,8 +1,8 @@ -//----------------------------------------------------------------------------- +//----------------------------------------------------------------------------- // // ImageLib Utility Sources // Copyright (C) 2000-2008 by Denton Woods -// Last modified: 11/08/2008 +// Last modified: 11/10/2008 // // Filename: src-ILU/include/ilu_error/ilu_err-japanese.h // diff --git a/DevIL/src-ILU/msvc/ILU Unicode.rc b/DevIL/src-ILU/msvc/ILU Unicode.rc new file mode 100644 index 00000000..4a36235c --- /dev/null +++ b/DevIL/src-ILU/msvc/ILU Unicode.rc @@ -0,0 +1,135 @@ +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#define APSTUDIO_HIDDEN_SYMBOLS +#include "windows.h" +#undef APSTUDIO_HIDDEN_SYMBOLS +#include "resource.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +2 TEXTINCLUDE MOVEABLE PURE +BEGIN + "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""windows.h""\r\n" + "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""resource.h""\r\n" + "\0" +END + +3 TEXTINCLUDE MOVEABLE PURE +BEGIN + "\r\n" + "\0" +END + +1 TEXTINCLUDE MOVEABLE PURE +BEGIN + "resource.h\0" +END + +#endif // APSTUDIO_INVOKED + + +#ifndef _MAC +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 0,1,7,2 + PRODUCTVERSION 0,1,7,2 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x29L +#else + FILEFLAGS 0x28L +#endif + FILEOS 0x40004L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Comments", "ILU: A portable image library in development\0" + VALUE "CompanyName", "Abysmal Software\0" + VALUE "FileDescription", "ILU: A portable image library in development\0" + VALUE "FileVersion", "1.7.2\0" + VALUE "InternalName", "ILU\0" + VALUE "LegalCopyright", "Copyright 2000-2008\0" + VALUE "LegalTrademarks", "Under LGPL License\0" + VALUE "OriginalFilename", "ILU.dll\0" + VALUE "PrivateBuild", "Open Source\0" + VALUE "ProductName", "Developer's Image Utilities Library\0" + VALUE "ProductVersion", "1.7.2 Unicode\0" + VALUE "SpecialBuild", "Unicode\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // !_MAC + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_ICON1 ICON DISCARDABLE "resources\\IL Logo.ico" + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDC_OPENILU "Developer's Image Utilities Library, Version 1.7.2" +END + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/DevIL/src-ILU/msvc/ILU Unicode.vcproj b/DevIL/src-ILU/msvc/ILU Unicode.vcproj index 1cf8892c..6493be7d 100644 --- a/DevIL/src-ILU/msvc/ILU Unicode.vcproj +++ b/DevIL/src-ILU/msvc/ILU Unicode.vcproj @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="9.00" - Name="ILU Unicode" - ProjectGUID="{E3236F31-10DD-4FE3-9FAB-D9665A6B5D24}" - RootNamespace="ILU Unicode" - TargetFrameworkVersion="131072" + Version="8.00" + Name="ILU" + ProjectGUID="{CCEBAA77-521A-4CC3-A4E0-C6B062FC2009}" > <Platforms> <Platform @@ -17,10 +15,10 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="..\..\lib\unicode\debug" - IntermediateDirectory="unicode\$(ConfigurationName)" + OutputDirectory=".\../../lib/vc8/debug" + IntermediateDirectory="Debug" ConfigurationType="2" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="1" @@ -48,16 +46,17 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"" Optimization="0" - AdditionalIncludeDirectories="../include;../../include" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB" + AdditionalIncludeDirectories="../include,../../include" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;ILU_EXPORTS" + MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="3" - BufferSecurityCheck="true" - UsePrecompiledHeader="0" - PrecompiledHeaderThrough="" - WarningLevel="4" + RuntimeLibrary="1" + PrecompiledHeaderFile=".\../src/obj/debug/ILU.pch" + AssemblerListingLocation=".\../src/obj/debug/" + ObjectFile=".\../src/obj/debug/" + ProgramDataBaseFileName=".\../src/obj/debug/" + WarningLevel="3" SuppressStartupBanner="true" DebugInformationFormat="4" /> @@ -74,9 +73,16 @@ /> <Tool Name="VCLinkerTool" - OutputFile="$(OutDir)\ILU.dll" - ModuleDefinitionFile="ilu.def" + AdditionalDependencies="odbc32.lib odbccp32.lib" + OutputFile="../../lib/vc8/debug/ilu.dll" + LinkIncremental="2" + SuppressStartupBanner="true" + IgnoreDefaultLibraryNames="msvcrt.lib; msvcrtd.lib" + ModuleDefinitionFile=".\ilu.def" GenerateDebugInformation="true" + ProgramDatabaseFile=".\../../lib/debug/ilu-d.pdb" + ImportLibrary=".\../../lib/vc8/debug/ilu.lib" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -89,6 +95,8 @@ /> <Tool Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\../../lib/debug/ILU.bsc" /> <Tool Name="VCFxCopTool" @@ -97,16 +105,19 @@ Name="VCAppVerifierTool" /> <Tool + Name="VCWebDeploymentTool" + /> + <Tool Name="VCPostBuildEventTool" - CommandLine="" + CommandLine="copy $(TargetPath) c:\windows\system32" /> </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="..\..\lib\unicode" - IntermediateDirectory="unicode\$(ConfigurationName)" + OutputDirectory=".\../../lib/vc8" + IntermediateDirectory="Release" ConfigurationType="2" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="1" @@ -129,20 +140,22 @@ MkTypLibCompatible="true" SuppressStartupBanner="true" TargetEnvironment="1" - TypeLibraryName=".\../../lib/unicode/ILU.tlb" + TypeLibraryName=".\../../lib/ILU.tlb" HeaderFileName="" /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"" - Optimization="2" - AdditionalIncludeDirectories="../include;../../include" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB" + Optimization="1" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="../include,../../include" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;ILU_EXPORTS" StringPooling="true" - RuntimeLibrary="2" - BufferSecurityCheck="false" - UsePrecompiledHeader="0" - PrecompiledHeaderThrough="" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" + PrecompiledHeaderFile=".\../src/obj/ILU.pch" + AssemblerListingLocation=".\../src/obj/" + ObjectFile=".\../src/obj/" + ProgramDataBaseFileName=".\../src/obj/" WarningLevel="3" SuppressStartupBanner="true" /> @@ -153,14 +166,23 @@ Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" + AdditionalIncludeDirectories="..\include" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" - OutputFile="$(OutDir)\ILU.dll" - ModuleDefinitionFile="ilu.def" + AdditionalDependencies="odbc32.lib odbccp32.lib devil.lib" + OutputFile=".\../../lib/vc8/ILU.dll" + LinkIncremental="1" + SuppressStartupBanner="true" + AdditionalLibraryDirectories="../../lib" + IgnoreDefaultLibraryNames="msvcrt.lib; msvcrtd.lib" + ModuleDefinitionFile=".\ilu.def" + ProgramDatabaseFile=".\../../lib/ILU.pdb" + ImportLibrary=".\../../lib/vc8/ILU.lib" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -173,6 +195,8 @@ /> <Tool Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\../../lib/ILU.bsc" /> <Tool Name="VCFxCopTool" @@ -181,8 +205,11 @@ Name="VCAppVerifierTool" /> <Tool + Name="VCWebDeploymentTool" + /> + <Tool Name="VCPostBuildEventTool" - CommandLine="" + CommandLine="copy $(TargetPath) c:\windows\system32" /> </Configuration> </Configurations> @@ -194,68 +221,338 @@ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" > <File - RelativePath="ilu.def" + RelativePath="..\msvc\ilu.def" > </File> <File RelativePath="..\src\ilu_error.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\ilu_filter.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\ilu_filter_rcg.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\ilu_internal.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\ilu_main.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\ilu_manip.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\ilu_mipmap.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\ilu_noise.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\ilu_region.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\ilu_rotate.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\ilu_scale.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\ilu_scale2d.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\ilu_scale3d.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\ilu_states.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\ilu_utilities.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> </Filter> <Filter @@ -290,11 +587,43 @@ RelativePath="..\include\ilu_states.h" > </File> + <Filter + Name="Error Messages" + > + <File + RelativePath="..\include\ilu_error\ilu_err-arabic.h" + > + </File> + <File + RelativePath="..\include\ilu_error\ilu_err-dutch.h" + > + </File> + <File + RelativePath="..\include\ilu_error\ilu_err-english.h" + > + </File> + <File + RelativePath="..\include\ilu_error\ilu_err-japanese.h" + > + </File> + <File + RelativePath="..\include\ilu_error\ilu_err-spanish.h" + > + </File> + </Filter> </Filter> <Filter Name="Resource Files" Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" > + <File + RelativePath="resources\IL Logo.ico" + > + </File> + <File + RelativePath=".\ILU Unicode.rc" + > + </File> </Filter> </Files> <Globals> diff --git a/DevIL/src-ILU/msvc/ILU.rc b/DevIL/src-ILU/msvc/ILU.rc index 12805120..350349cf 100644 --- a/DevIL/src-ILU/msvc/ILU.rc +++ b/DevIL/src-ILU/msvc/ILU.rc @@ -86,8 +86,8 @@ BEGIN VALUE "OriginalFilename", "ILU.dll\0" VALUE "PrivateBuild", "Open Source\0" VALUE "ProductName", "Developer's Image Utilities Library\0" - VALUE "ProductVersion", "1.7.2\0" - VALUE "SpecialBuild", "eh?\0" + VALUE "ProductVersion", "1.7.2 Ansi\0" + VALUE "SpecialBuild", "Ansi\0" END END BLOCK "VarFileInfo" @@ -115,7 +115,7 @@ IDI_ICON1 ICON DISCARDABLE "resources\\IL Logo.ico" STRINGTABLE DISCARDABLE BEGIN - IDC_OPENILU "Developer's Image Utilities Library, Version 1.6.6" + IDC_OPENILU "Developer's Image Utilities Library, Version 1.7.2" END #endif // English (U.S.) resources diff --git a/DevIL/src-ILU/msvc/ILU.vcproj b/DevIL/src-ILU/msvc/ILU.vcproj index 2214afa0..86b50277 100644 --- a/DevIL/src-ILU/msvc/ILU.vcproj +++ b/DevIL/src-ILU/msvc/ILU.vcproj @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="9.00" + Version="8.00" Name="ILU" - ProjectGUID="{98884911-2B7F-45C7-B0FD-CB909E8CB7C1}" - RootNamespace="ILU" - TargetFrameworkVersion="131072" + ProjectGUID="{CCEBAA77-521A-4CC3-A4E0-C6B062FC2009}" > <Platforms> <Platform @@ -17,10 +15,10 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="..\..\lib" - IntermediateDirectory="$(ConfigurationName)" + OutputDirectory=".\../../lib/vc8/debug" + IntermediateDirectory="Debug" ConfigurationType="2" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" @@ -48,16 +46,17 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"" Optimization="0" - AdditionalIncludeDirectories="../include;../../include" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB" + AdditionalIncludeDirectories="../include,../../include" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;ILU_EXPORTS" + MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="3" - BufferSecurityCheck="true" - UsePrecompiledHeader="0" - PrecompiledHeaderThrough="" - WarningLevel="4" + RuntimeLibrary="1" + PrecompiledHeaderFile=".\../src/obj/debug/ILU.pch" + AssemblerListingLocation=".\../src/obj/debug/" + ObjectFile=".\../src/obj/debug/" + ProgramDataBaseFileName=".\../src/obj/debug/" + WarningLevel="3" SuppressStartupBanner="true" DebugInformationFormat="4" /> @@ -74,9 +73,16 @@ /> <Tool Name="VCLinkerTool" - OutputFile="$(OutDir)\ILU.dll" - ModuleDefinitionFile="ilu.def" + AdditionalDependencies="odbc32.lib odbccp32.lib" + OutputFile="../../lib/vc8/debug/ilu.dll" + LinkIncremental="2" + SuppressStartupBanner="true" + IgnoreDefaultLibraryNames="msvcrt.lib; msvcrtd.lib" + ModuleDefinitionFile=".\ilu.def" GenerateDebugInformation="true" + ProgramDatabaseFile=".\../../lib/debug/ilu-d.pdb" + ImportLibrary=".\../../lib/vc8/debug/ilu.lib" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -89,6 +95,8 @@ /> <Tool Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\../../lib/debug/ILU.bsc" /> <Tool Name="VCFxCopTool" @@ -97,16 +105,19 @@ Name="VCAppVerifierTool" /> <Tool + Name="VCWebDeploymentTool" + /> + <Tool Name="VCPostBuildEventTool" - CommandLine="copy "$(TargetPath)" "../../examples/bin/debug"" + CommandLine="copy $(TargetPath) c:\windows\system32" /> </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="..\..\lib" - IntermediateDirectory="$(ConfigurationName)" + OutputDirectory=".\../../lib/vc8" + IntermediateDirectory="Release" ConfigurationType="2" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" @@ -134,15 +145,17 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"" - Optimization="2" - AdditionalIncludeDirectories="../include;../../include" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB" + Optimization="1" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="../include,../../include" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;ILU_EXPORTS" StringPooling="true" - RuntimeLibrary="2" - BufferSecurityCheck="false" - UsePrecompiledHeader="0" - PrecompiledHeaderThrough="" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" + PrecompiledHeaderFile=".\../src/obj/ILU.pch" + AssemblerListingLocation=".\../src/obj/" + ObjectFile=".\../src/obj/" + ProgramDataBaseFileName=".\../src/obj/" WarningLevel="3" SuppressStartupBanner="true" /> @@ -153,13 +166,23 @@ Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" + AdditionalIncludeDirectories="..\include" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" - ModuleDefinitionFile="ilu.def" + AdditionalDependencies="odbc32.lib odbccp32.lib devil.lib" + OutputFile=".\../../lib/vc8/ILU.dll" + LinkIncremental="1" + SuppressStartupBanner="true" + AdditionalLibraryDirectories="../../lib" + IgnoreDefaultLibraryNames="msvcrt.lib; msvcrtd.lib" + ModuleDefinitionFile=".\ilu.def" + ProgramDatabaseFile=".\../../lib/ILU.pdb" + ImportLibrary=".\../../lib/vc8/ILU.lib" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -172,6 +195,8 @@ /> <Tool Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\../../lib/ILU.bsc" /> <Tool Name="VCFxCopTool" @@ -180,8 +205,11 @@ Name="VCAppVerifierTool" /> <Tool + Name="VCWebDeploymentTool" + /> + <Tool Name="VCPostBuildEventTool" - CommandLine="copy "$(TargetPath)" "../../examples/bin/"" + CommandLine="copy $(TargetPath) c:\windows\system32" /> </Configuration> </Configurations> @@ -193,68 +221,338 @@ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" > <File - RelativePath="ilu.def" + RelativePath="..\msvc\ilu.def" > </File> <File RelativePath="..\src\ilu_error.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\ilu_filter.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\ilu_filter_rcg.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\ilu_internal.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\ilu_main.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\ilu_manip.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\ilu_mipmap.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\ilu_noise.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\ilu_region.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\ilu_rotate.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\ilu_scale.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\ilu_scale2d.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\ilu_scale3d.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\ilu_states.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> <File RelativePath="..\src\ilu_utilities.c" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> </File> </Filter> <Filter @@ -289,12 +587,40 @@ RelativePath="..\include\ilu_states.h" > </File> + <Filter + Name="Error Messages" + > + <File + RelativePath="..\include\ilu_error\ilu_err-arabic.h" + > + </File> + <File + RelativePath="..\include\ilu_error\ilu_err-dutch.h" + > + </File> + <File + RelativePath="..\include\ilu_error\ilu_err-english.h" + > + </File> + <File + RelativePath="..\include\ilu_error\ilu_err-japanese.h" + > + </File> + <File + RelativePath="..\include\ilu_error\ilu_err-spanish.h" + > + </File> + </Filter> </Filter> <Filter Name="Resource Files" Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" > <File + RelativePath="resources\IL Logo.ico" + > + </File> + <File RelativePath=".\ILU.rc" > </File> diff --git a/DevIL/src-ILU/msvc/ilu.def b/DevIL/src-ILU/msvc/ilu.def index 0afb5808..b9587839 100644 --- a/DevIL/src-ILU/msvc/ilu.def +++ b/DevIL/src-ILU/msvc/ilu.def @@ -44,6 +44,7 @@ iluSaturate4f iluScaleColours iluScale iluScaleAlpha +iluSetLanguage iluSharpen iluSwapColours iluWave diff --git a/DevIL/src-ILU/msvc8/ILU Unicode.rc b/DevIL/src-ILU/msvc8/ILU Unicode.rc new file mode 100644 index 00000000..4a36235c --- /dev/null +++ b/DevIL/src-ILU/msvc8/ILU Unicode.rc @@ -0,0 +1,135 @@ +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#define APSTUDIO_HIDDEN_SYMBOLS +#include "windows.h" +#undef APSTUDIO_HIDDEN_SYMBOLS +#include "resource.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +2 TEXTINCLUDE MOVEABLE PURE +BEGIN + "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""windows.h""\r\n" + "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""resource.h""\r\n" + "\0" +END + +3 TEXTINCLUDE MOVEABLE PURE +BEGIN + "\r\n" + "\0" +END + +1 TEXTINCLUDE MOVEABLE PURE +BEGIN + "resource.h\0" +END + +#endif // APSTUDIO_INVOKED + + +#ifndef _MAC +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 0,1,7,2 + PRODUCTVERSION 0,1,7,2 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x29L +#else + FILEFLAGS 0x28L +#endif + FILEOS 0x40004L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Comments", "ILU: A portable image library in development\0" + VALUE "CompanyName", "Abysmal Software\0" + VALUE "FileDescription", "ILU: A portable image library in development\0" + VALUE "FileVersion", "1.7.2\0" + VALUE "InternalName", "ILU\0" + VALUE "LegalCopyright", "Copyright 2000-2008\0" + VALUE "LegalTrademarks", "Under LGPL License\0" + VALUE "OriginalFilename", "ILU.dll\0" + VALUE "PrivateBuild", "Open Source\0" + VALUE "ProductName", "Developer's Image Utilities Library\0" + VALUE "ProductVersion", "1.7.2 Unicode\0" + VALUE "SpecialBuild", "Unicode\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // !_MAC + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_ICON1 ICON DISCARDABLE "resources\\IL Logo.ico" + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDC_OPENILU "Developer's Image Utilities Library, Version 1.7.2" +END + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/DevIL/src-ILU/msvc8/ILU Unicode.vcproj b/DevIL/src-ILU/msvc8/ILU Unicode.vcproj new file mode 100644 index 00000000..6493be7d --- /dev/null +++ b/DevIL/src-ILU/msvc8/ILU Unicode.vcproj @@ -0,0 +1,631 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="ILU" + ProjectGUID="{CCEBAA77-521A-4CC3-A4E0-C6B062FC2009}" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory=".\../../lib/vc8/debug" + IntermediateDirectory="Debug" + ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="_DEBUG" + MkTypLibCompatible="true" + SuppressStartupBanner="true" + TargetEnvironment="1" + TypeLibraryName=".\../../lib/debug/ILU.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="../include,../../include" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;ILU_EXPORTS" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + PrecompiledHeaderFile=".\../src/obj/debug/ILU.pch" + AssemblerListingLocation=".\../src/obj/debug/" + ObjectFile=".\../src/obj/debug/" + ProgramDataBaseFileName=".\../src/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="odbc32.lib odbccp32.lib" + OutputFile="../../lib/vc8/debug/ilu.dll" + LinkIncremental="2" + SuppressStartupBanner="true" + IgnoreDefaultLibraryNames="msvcrt.lib; msvcrtd.lib" + ModuleDefinitionFile=".\ilu.def" + GenerateDebugInformation="true" + ProgramDatabaseFile=".\../../lib/debug/ilu-d.pdb" + ImportLibrary=".\../../lib/vc8/debug/ilu.lib" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\../../lib/debug/ILU.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="copy $(TargetPath) c:\windows\system32" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory=".\../../lib/vc8" + IntermediateDirectory="Release" + ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="NDEBUG" + MkTypLibCompatible="true" + SuppressStartupBanner="true" + TargetEnvironment="1" + TypeLibraryName=".\../../lib/ILU.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="1" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="../include,../../include" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;ILU_EXPORTS" + StringPooling="true" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" + PrecompiledHeaderFile=".\../src/obj/ILU.pch" + AssemblerListingLocation=".\../src/obj/" + ObjectFile=".\../src/obj/" + ProgramDataBaseFileName=".\../src/obj/" + WarningLevel="3" + SuppressStartupBanner="true" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + AdditionalIncludeDirectories="..\include" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="odbc32.lib odbccp32.lib devil.lib" + OutputFile=".\../../lib/vc8/ILU.dll" + LinkIncremental="1" + SuppressStartupBanner="true" + AdditionalLibraryDirectories="../../lib" + IgnoreDefaultLibraryNames="msvcrt.lib; msvcrtd.lib" + ModuleDefinitionFile=".\ilu.def" + ProgramDatabaseFile=".\../../lib/ILU.pdb" + ImportLibrary=".\../../lib/vc8/ILU.lib" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\../../lib/ILU.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="copy $(TargetPath) c:\windows\system32" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + > + <File + RelativePath="..\msvc\ilu.def" + > + </File> + <File + RelativePath="..\src\ilu_error.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\ilu_filter.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\ilu_filter_rcg.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\ilu_internal.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\ilu_main.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\ilu_manip.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\ilu_mipmap.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\ilu_noise.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\ilu_region.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\ilu_rotate.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\ilu_scale.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\ilu_scale2d.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\ilu_scale3d.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\ilu_states.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\ilu_utilities.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl" + > + <File + RelativePath="..\..\include\IL\devil_internal_exports.h" + > + </File> + <File + RelativePath="..\..\include\il\ilu.h" + > + </File> + <File + RelativePath="..\include\ilu_filter.h" + > + </File> + <File + RelativePath="..\include\ilu_internal.h" + > + </File> + <File + RelativePath="..\include\ilu_mipmap.h" + > + </File> + <File + RelativePath="..\include\ilu_region.h" + > + </File> + <File + RelativePath="..\include\ilu_states.h" + > + </File> + <Filter + Name="Error Messages" + > + <File + RelativePath="..\include\ilu_error\ilu_err-arabic.h" + > + </File> + <File + RelativePath="..\include\ilu_error\ilu_err-dutch.h" + > + </File> + <File + RelativePath="..\include\ilu_error\ilu_err-english.h" + > + </File> + <File + RelativePath="..\include\ilu_error\ilu_err-japanese.h" + > + </File> + <File + RelativePath="..\include\ilu_error\ilu_err-spanish.h" + > + </File> + </Filter> + </Filter> + <Filter + Name="Resource Files" + Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" + > + <File + RelativePath="resources\IL Logo.ico" + > + </File> + <File + RelativePath=".\ILU Unicode.rc" + > + </File> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> diff --git a/DevIL/src-ILU/msvc8/ILU.rc b/DevIL/src-ILU/msvc8/ILU.rc index aa80edca..350349cf 100644 --- a/DevIL/src-ILU/msvc8/ILU.rc +++ b/DevIL/src-ILU/msvc8/ILU.rc @@ -86,8 +86,8 @@ BEGIN VALUE "OriginalFilename", "ILU.dll\0" VALUE "PrivateBuild", "Open Source\0" VALUE "ProductName", "Developer's Image Utilities Library\0" - VALUE "ProductVersion", "1.7.2\0" - VALUE "SpecialBuild", "eh?\0" + VALUE "ProductVersion", "1.7.2 Ansi\0" + VALUE "SpecialBuild", "Ansi\0" END END BLOCK "VarFileInfo" diff --git a/DevIL/src-ILU/msvc8/ILU.vcproj b/DevIL/src-ILU/msvc8/ILU.vcproj index 1611f3f8..86b50277 100644 --- a/DevIL/src-ILU/msvc8/ILU.vcproj +++ b/DevIL/src-ILU/msvc8/ILU.vcproj @@ -1,10 +1,9 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="9.00" + Version="8.00" Name="ILU" ProjectGUID="{CCEBAA77-521A-4CC3-A4E0-C6B062FC2009}" - TargetFrameworkVersion="131072" > <Platforms> <Platform @@ -22,7 +21,7 @@ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="1" + CharacterSet="2" > <Tool Name="VCPreBuildEventTool" @@ -82,8 +81,6 @@ ModuleDefinitionFile=".\ilu.def" GenerateDebugInformation="true" ProgramDatabaseFile=".\../../lib/debug/ilu-d.pdb" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" ImportLibrary=".\../../lib/vc8/debug/ilu.lib" TargetMachine="1" /> @@ -108,6 +105,9 @@ Name="VCAppVerifierTool" /> <Tool + Name="VCWebDeploymentTool" + /> + <Tool Name="VCPostBuildEventTool" CommandLine="copy $(TargetPath) c:\windows\system32" /> @@ -120,7 +120,7 @@ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="1" + CharacterSet="2" > <Tool Name="VCPreBuildEventTool" @@ -181,8 +181,6 @@ IgnoreDefaultLibraryNames="msvcrt.lib; msvcrtd.lib" ModuleDefinitionFile=".\ilu.def" ProgramDatabaseFile=".\../../lib/ILU.pdb" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" ImportLibrary=".\../../lib/vc8/ILU.lib" TargetMachine="1" /> @@ -207,6 +205,9 @@ Name="VCAppVerifierTool" /> <Tool + Name="VCWebDeploymentTool" + /> + <Tool Name="VCPostBuildEventTool" CommandLine="copy $(TargetPath) c:\windows\system32" /> diff --git a/DevIL/src-ILUT/msvc/ILUT Unicode.rc b/DevIL/src-ILUT/msvc/ILUT Unicode.rc new file mode 100644 index 00000000..a2d55cff --- /dev/null +++ b/DevIL/src-ILUT/msvc/ILUT Unicode.rc @@ -0,0 +1,135 @@ +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#define APSTUDIO_HIDDEN_SYMBOLS +#include "windows.h" +#undef APSTUDIO_HIDDEN_SYMBOLS +#include "resource.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +2 TEXTINCLUDE MOVEABLE PURE +BEGIN + "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""windows.h""\r\n" + "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""resource.h""\r\n" + "\0" +END + +3 TEXTINCLUDE MOVEABLE PURE +BEGIN + "\r\n" + "\0" +END + +1 TEXTINCLUDE MOVEABLE PURE +BEGIN + "resource.h\0" +END + +#endif // APSTUDIO_INVOKED + + +#ifndef _MAC +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 0,1,7,2 + PRODUCTVERSION 0,1,7,2 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x29L +#else + FILEFLAGS 0x28L +#endif + FILEOS 0x40004L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Comments", "ILUT: A portable image library in development\0" + VALUE "CompanyName", "Abysmal Software\0" + VALUE "FileDescription", "ILUT: A portable image library in development\0" + VALUE "FileVersion", "1.7.2\0" + VALUE "InternalName", "ILUT\0" + VALUE "LegalCopyright", "Copyright 2000-2008\0" + VALUE "LegalTrademarks", "Under LGPL License\0" + VALUE "OriginalFilename", "ILUT.dll\0" + VALUE "PrivateBuild", "Open Source\0" + VALUE "ProductName", "Developer's Image Utility Toolkit Library\0" + VALUE "ProductVersion", "1.7.2 Unicode\0" + VALUE "SpecialBuild", "Unicode\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // !_MAC + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_ICON1 ICON DISCARDABLE "resources\\IL Logo.ico" + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDC_OPENILUT "Developer's Image Utility Toolkit Library, Version 1.6.6" +END + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/DevIL/src-ILUT/msvc8/ILUT Unicode.rc b/DevIL/src-ILUT/msvc8/ILUT Unicode.rc new file mode 100644 index 00000000..a2d55cff --- /dev/null +++ b/DevIL/src-ILUT/msvc8/ILUT Unicode.rc @@ -0,0 +1,135 @@ +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#define APSTUDIO_HIDDEN_SYMBOLS +#include "windows.h" +#undef APSTUDIO_HIDDEN_SYMBOLS +#include "resource.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +2 TEXTINCLUDE MOVEABLE PURE +BEGIN + "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""windows.h""\r\n" + "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""resource.h""\r\n" + "\0" +END + +3 TEXTINCLUDE MOVEABLE PURE +BEGIN + "\r\n" + "\0" +END + +1 TEXTINCLUDE MOVEABLE PURE +BEGIN + "resource.h\0" +END + +#endif // APSTUDIO_INVOKED + + +#ifndef _MAC +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 0,1,7,2 + PRODUCTVERSION 0,1,7,2 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x29L +#else + FILEFLAGS 0x28L +#endif + FILEOS 0x40004L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Comments", "ILUT: A portable image library in development\0" + VALUE "CompanyName", "Abysmal Software\0" + VALUE "FileDescription", "ILUT: A portable image library in development\0" + VALUE "FileVersion", "1.7.2\0" + VALUE "InternalName", "ILUT\0" + VALUE "LegalCopyright", "Copyright 2000-2008\0" + VALUE "LegalTrademarks", "Under LGPL License\0" + VALUE "OriginalFilename", "ILUT.dll\0" + VALUE "PrivateBuild", "Open Source\0" + VALUE "ProductName", "Developer's Image Utility Toolkit Library\0" + VALUE "ProductVersion", "1.7.2 Unicode\0" + VALUE "SpecialBuild", "Unicode\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // !_MAC + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_ICON1 ICON DISCARDABLE "resources\\IL Logo.ico" + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDC_OPENILUT "Developer's Image Utility Toolkit Library, Version 1.6.6" +END + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/DevIL/src-ILUT/msvc8/ILUT Unicode.vcproj b/DevIL/src-ILUT/msvc8/ILUT Unicode.vcproj new file mode 100644 index 00000000..d33fbb00 --- /dev/null +++ b/DevIL/src-ILUT/msvc8/ILUT Unicode.vcproj @@ -0,0 +1,442 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="ILUT" + ProjectGUID="{7D060DA4-F2FA-44CC-80BE-065024DD6CA9}" + RootNamespace="ILUT" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Release|Win32" + OutputDirectory=".\../../lib/vc8" + IntermediateDirectory="Release" + ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="NDEBUG" + MkTypLibCompatible="true" + SuppressStartupBanner="true" + TargetEnvironment="1" + TypeLibraryName=".\../../lib/ILUT.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="1" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="../include,../../include" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;ILUT_EXPORTS;IL_STATIC_LIB" + StringPooling="true" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" + PrecompiledHeaderFile=".\../src/obj/ILUT.pch" + AssemblerListingLocation=".\../src/obj/" + ObjectFile=".\../src/obj/" + ProgramDataBaseFileName=".\../src/obj/" + WarningLevel="4" + SuppressStartupBanner="true" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + 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; msvcrtd.lib" + ModuleDefinitionFile=".\ilut.def" + 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" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\../../lib/ILUT.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="copy $(TargetPath) c:\windows\system32" + /> + </Configuration> + <Configuration + Name="Debug|Win32" + OutputDirectory=".\../../lib/vc8/debug" + IntermediateDirectory="Debug" + ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="_DEBUG" + MkTypLibCompatible="true" + SuppressStartupBanner="true" + TargetEnvironment="1" + TypeLibraryName=".\../../lib/debug/ILUT.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="../include,../../include" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;ILUT_EXPORTS" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + PrecompiledHeaderFile=".\../src/obj/debug/ILUT.pch" + AssemblerListingLocation=".\../src/obj/debug/" + ObjectFile=".\../src/obj/debug/" + ProgramDataBaseFileName=".\../src/obj/debug/" + WarningLevel="4" + SuppressStartupBanner="true" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + 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" + AdditionalLibraryDirectories="../../lib" + IgnoreDefaultLibraryNames="msvcrt.lib; msvcrtd.lib" + ModuleDefinitionFile=".\ilut.def" + DelayLoadDLLs="d3d8.dll,sdl.dll,alleg42.dll" + GenerateDebugInformation="true" + ProgramDatabaseFile=".\../../lib/debug/ilut.pdb" + ImportLibrary=".\../../lib/vc8/debug/ilut.lib" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + SuppressStartupBanner="true" + OutputFile=".\../../lib/debug/ILUT.bsc" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="copy $(TargetPath) c:\windows\system32" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + > + <File + RelativePath="..\msvc\ilut.def" + > + </File> + <File + RelativePath="..\src\ilut_allegro.c" + > + </File> + <File + RelativePath="..\src\ilut_directx.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\ilut_directx9.c" + > + </File> + <File + RelativePath="..\src\ilut_directxm.c" + > + </File> + <File + RelativePath="..\src\ilut_internal.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\ilut_main.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\ilut_opengl.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\ilut_sdlsurface.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\ilut_states.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\ilut_win32.c" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl" + > + <File + RelativePath="..\..\include\IL\devil_internal_exports.h" + > + </File> + <File + RelativePath="..\..\include\il\ilut.h" + > + </File> + <File + RelativePath="..\include\ilut_internal.h" + > + </File> + <File + RelativePath="..\include\ilut_opengl.h" + > + </File> + <File + RelativePath="..\include\ilut_states.h" + > + </File> + <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\IL Logo.ico" + > + </File> + <File + RelativePath=".\ILUT Unicode.rc" + > + </File> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> diff --git a/DevIL/src-ILUT/msvc8/ILUT.rc b/DevIL/src-ILUT/msvc8/ILUT.rc index 3c98a557..f4ed4eda 100644 --- a/DevIL/src-ILUT/msvc8/ILUT.rc +++ b/DevIL/src-ILUT/msvc8/ILUT.rc @@ -86,8 +86,8 @@ BEGIN VALUE "OriginalFilename", "ILUT.dll\0" VALUE "PrivateBuild", "Open Source\0" VALUE "ProductName", "Developer's Image Utility Toolkit Library\0" - VALUE "ProductVersion", "1.7.2\0" - VALUE "SpecialBuild", "eh?\0" + VALUE "ProductVersion", "1.7.2 Ansi\0" + VALUE "SpecialBuild", "Ansi\0" END END BLOCK "VarFileInfo" diff --git a/DevIL/src-ILUT/msvc8/ILUT.vcproj b/DevIL/src-ILUT/msvc8/ILUT.vcproj index 926328e1..e1bb04a2 100644 --- a/DevIL/src-ILUT/msvc8/ILUT.vcproj +++ b/DevIL/src-ILUT/msvc8/ILUT.vcproj @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="9.00" + Version="8.00" Name="ILUT" ProjectGUID="{7D060DA4-F2FA-44CC-80BE-065024DD6CA9}" RootNamespace="ILUT" - TargetFrameworkVersion="131072" > <Platforms> <Platform @@ -23,7 +22,7 @@ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="1" + CharacterSet="2" > <Tool Name="VCPreBuildEventTool" @@ -84,8 +83,6 @@ ModuleDefinitionFile=".\ilut.def" DelayLoadDLLs="opengl32.dll,glu32.dll,d3d8.dll,d3d9.dll,sdl.dll,alleg42.dll,wininet.dll" ProgramDatabaseFile=".\../../lib/ILUT.pdb" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" ImportLibrary=".\../../lib/vc8/ILUT.lib" TargetMachine="1" /> @@ -110,6 +107,9 @@ Name="VCAppVerifierTool" /> <Tool + Name="VCWebDeploymentTool" + /> + <Tool Name="VCPostBuildEventTool" CommandLine="copy $(TargetPath) c:\windows\system32" /> @@ -122,7 +122,7 @@ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="1" + CharacterSet="2" > <Tool Name="VCPreBuildEventTool" @@ -184,8 +184,6 @@ DelayLoadDLLs="d3d8.dll,sdl.dll,alleg42.dll" GenerateDebugInformation="true" ProgramDatabaseFile=".\../../lib/debug/ilut.pdb" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" ImportLibrary=".\../../lib/vc8/debug/ilut.lib" TargetMachine="1" /> @@ -210,6 +208,9 @@ Name="VCAppVerifierTool" /> <Tool + Name="VCWebDeploymentTool" + /> + <Tool Name="VCPostBuildEventTool" CommandLine="copy $(TargetPath) c:\windows\system32" /> |