m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Win32/msvc: build with libtiff

Browse Source
This commit is contained in:
Thomas Bernard 2019-01-04 21:00:56 +01:00
parent c472f36d27
commit addf8d9798
6 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
project/msvc/grafx2-win32.vcxproj
View File

@ -53,13 +53,13 @@
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PreprocessorDefinitions>NOTTF;__ENABLE_LUA__;_CRT_SECURE_NO_WARNINGS;_USE_MATH_DEFINES;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>NOTTF;__ENABLE_LUA__;_CRT_SECURE_NO_WARNINGS;_USE_MATH_DEFINES;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4244</DisableSpecificWarnings> <DisableSpecificWarnings>4244</DisableSpecificWarnings>
<AdditionalIncludeDirectories>$(PNGIncDir);$(LuaIncDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(TIFFIncDir);$(PNGIncDir);$(LuaIncDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile> </ClCompile>
<Link> <Link>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>lua53.lib;libpng16.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>libtiff.lib;lua53.lib;libpng16.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(PNGLibDirDebug);$(LuaLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>$(TIFFLibDir);$(PNGLibDirDebug);$(LuaLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -70,15 +70,15 @@
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>NOTTF;__ENABLE_LUA__;_CRT_SECURE_NO_WARNINGS;_USE_MATH_DEFINES;WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>NOTTF;__ENABLE_LUA__;_CRT_SECURE_NO_WARNINGS;_USE_MATH_DEFINES;WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4244</DisableSpecificWarnings> <DisableSpecificWarnings>4244</DisableSpecificWarnings>
<AdditionalIncludeDirectories>$(PNGIncDir);$(LuaIncDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(TIFFIncDir);$(PNGIncDir);$(LuaIncDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile> </ClCompile>
<Link> <Link>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>lua53.lib;libpng16.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>libtiff.lib;lua53.lib;libpng16.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(PNGLibDirRelease);$(LuaLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>$(TIFFLibDir);$(PNGLibDirRelease);$(LuaLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
@ -133,6 +133,7 @@
<ClCompile Include="..\..\src\shade.c" /> <ClCompile Include="..\..\src\shade.c" />
<ClCompile Include="..\..\src\special.c" /> <ClCompile Include="..\..\src\special.c" />
<ClCompile Include="..\..\src\text.c" /> <ClCompile Include="..\..\src\text.c" />
<ClCompile Include="..\..\src\tifformat.c" />
<ClCompile Include="..\..\src\tiles.c" /> <ClCompile Include="..\..\src\tiles.c" />
<ClCompile Include="..\..\src\transform.c" /> <ClCompile Include="..\..\src\transform.c" />
<ClCompile Include="..\..\src\unicode.c" /> <ClCompile Include="..\..\src\unicode.c" />

3
project/msvc/grafx2-win32.vcxproj.filters
View File

@ -186,6 +186,9 @@
<ClCompile Include="..\..\src\gfx2log.c"> <ClCompile Include="..\..\src\gfx2log.c">
<Filter>Fichiers sources</Filter> <Filter>Fichiers sources</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\tifformat.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\src\brush.h"> <ClInclude Include="..\..\src\brush.h">

5
project/msvc/grafx2.vcxproj
View File

@ -56,7 +56,7 @@
</PrecompiledHeader> </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PreprocessorDefinitions>USE_SDL;NOTTF;__ENABLE_LUA__;__no_pnglib__;_CRT_SECURE_NO_WARNINGS;_USE_MATH_DEFINES;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>USE_SDL;NOTTF;__ENABLE_LUA__;__no_pnglib__;__no_tifflib__;_CRT_SECURE_NO_WARNINGS;_USE_MATH_DEFINES;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(SDLImageIncDir);$(SDLIncDir);$(LuaIncDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(SDLImageIncDir);$(SDLIncDir);$(LuaIncDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile> </ClCompile>
@ -75,7 +75,7 @@
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>USE_SDL;NOTTF;__ENABLE_LUA__;__no_pnglib__;_CRT_SECURE_NO_WARNINGS;_USE_MATH_DEFINES;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>USE_SDL;NOTTF;__ENABLE_LUA__;__no_pnglib__;__no_tifflib__;_CRT_SECURE_NO_WARNINGS;_USE_MATH_DEFINES;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(SDLImageIncDir);$(SDLIncDir);$(LuaIncDir);;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(SDLImageIncDir);$(SDLIncDir);$(LuaIncDir);;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile> </ClCompile>
@ -204,6 +204,7 @@
<ClCompile Include="..\..\src\shade.c" /> <ClCompile Include="..\..\src\shade.c" />
<ClCompile Include="..\..\src\special.c" /> <ClCompile Include="..\..\src\special.c" />
<ClCompile Include="..\..\src\text.c" /> <ClCompile Include="..\..\src\text.c" />
<ClCompile Include="..\..\src\tifformat.c" />
<ClCompile Include="..\..\src\tiles.c" /> <ClCompile Include="..\..\src\tiles.c" />
<ClCompile Include="..\..\src\transform.c" /> <ClCompile Include="..\..\src\transform.c" />
<ClCompile Include="..\..\src\unicode.c" /> <ClCompile Include="..\..\src\unicode.c" />

3
project/msvc/grafx2.vcxproj.filters
View File

@ -367,5 +367,8 @@
<ClCompile Include="..\..\src\gfx2log.c"> <ClCompile Include="..\..\src\gfx2log.c">
<Filter>Fichiers sources</Filter> <Filter>Fichiers sources</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\tifformat.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
</Project> </Project>

2
project/msvc/libraries.props
View File

@ -11,5 +11,7 @@
<PNGIncDir>..\..\..\..\lpng1634</PNGIncDir> <PNGIncDir>..\..\..\..\lpng1634</PNGIncDir>
<PNGLibDirDebug>..\..\..\..\lpng1634\projects\vstudio\Debug Library</PNGLibDirDebug> <PNGLibDirDebug>..\..\..\..\lpng1634\projects\vstudio\Debug Library</PNGLibDirDebug>
<PNGLibDirRelease>..\..\..\..\lpng1634\projects\vstudio\Release Library</PNGLibDirRelease> <PNGLibDirRelease>..\..\..\..\lpng1634\projects\vstudio\Release Library</PNGLibDirRelease>
<TIFFIncDir>..\..\..\..\tiff-4.0.10\libtiff</TIFFIncDir>
<TIFFLibDir>..\..\..\..\tiff-4.0.10\libtiff</TIFFLibDir>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

22
src/tifformat.c
View File

@ -27,6 +27,13 @@
#ifndef __no_tifflib__ #ifndef __no_tifflib__
#ifdef _MSC_VER
#include <stdio.h>
#if _MSC_VER < 1900
#define snprintf _snprintf
#define fileno _fileno
#endif
#endif
#include <tiffio.h> #include <tiffio.h>
#include "global.h" #include "global.h"
#include "io.h" #include "io.h"
@ -350,8 +357,9 @@ void Load_TIFF_Sub(T_IO_Context * context, TIFF * tif, unsigned long file_size)
/// Load TIFF from file /// Load TIFF from file
void Load_TIFF(T_IO_Context * context) void Load_TIFF(T_IO_Context * context)
{ {
FILE * file;
TIFF * tif; TIFF * tif;
#if !defined(WIN32)
FILE * file;
File_error = 1; File_error = 1;
@ -366,6 +374,18 @@ void Load_TIFF(T_IO_Context * context)
} }
fclose(file); fclose(file);
} }
#else
char filename[MAX_PATH_CHARACTERS]; // filename with full path
File_error = 1;
Get_full_filename(filename, context->File_name, context->File_directory);
tif = TIFFOpen(filename, "r");
if (tif != NULL)
{
Load_TIFF_Sub(context, tif, File_length(filename));
TIFFClose(tif);
}
#endif
} }