Skip to content

Commit

Permalink
updated submodules + MSVC project files.
Browse files Browse the repository at this point in the history
  • Loading branch information
@GerHobbelt
GerHobbelt committed Jan 13, 2025
1 parent 54dea4c commit 561f40c
Show file tree
Hide file tree
Showing 18 changed files with 2,532 additions and 267 deletions.
21 changes: 12 additions & 9 deletions platform/win32/liblcms2.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,16 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<Import Project="$(SolutionDir)\common-project.props" Label="SolutionWideSettings" />
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(SolutionDir)\common-project-Debug-Win32.props" Condition="exists('$(SolutionDir)\common-project-Debug-Win32.props')" Label="SolutionWideDebugWin32Settings" />
<Import Project="$(SolutionDir)\common-project-Debug-Win32.props" Condition="exists('$(SolutionDir)\common-project-Debug-Win32.props')" Label="SolutionWideDebugWin32Settings" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(SolutionDir)\common-project-Release-Win32.props" Condition="exists('$(SolutionDir)\common-project-Release-Win32.props')" Label="SolutionWideReleaseWin32Settings" />
<Import Project="$(SolutionDir)\common-project-Release-Win32.props" Condition="exists('$(SolutionDir)\common-project-Release-Win32.props')" Label="SolutionWideReleaseWin32Settings" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(SolutionDir)\common-project-Debug-Win64.props" Condition="exists('$(SolutionDir)\common-project-Debug-Win64.props')" Label="SolutionWideDebugWin64Settings" />
<Import Project="$(SolutionDir)\common-project-Debug-Win64.props" Condition="exists('$(SolutionDir)\common-project-Debug-Win64.props')" Label="SolutionWideDebugWin64Settings" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(SolutionDir)\common-project-Release-Win64.props" Condition="exists('$(SolutionDir)\common-project-Release-Win64.props')" Label="SolutionWideReleaseWin64Settings" />
<Import Project="$(SolutionDir)\common-project-Release-Win64.props" Condition="exists('$(SolutionDir)\common-project-Release-Win64.props')" Label="SolutionWideReleaseWin64Settings" />
</ImportGroup>
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
Expand All @@ -70,7 +70,7 @@
<WholeProgramOptimization>true</WholeProgramOptimization>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup>
<ItemDefinitionGroup>
<ClCompile>
<Optimization>Custom</Optimization>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
Expand Down Expand Up @@ -104,14 +104,15 @@
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<AdditionalOptions>/bigobj /utf-8 /Zc:__cplusplus /Zc:preprocessor %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Custom</Optimization>
<AdditionalIncludeDirectories>../../include/system-override;.;../../thirdparty/lcms2/include;../../scripts/freetype;../../scripts/libpng;../../scripts/libtiff;../../scripts/libjpeg-turbo;../../thirdparty/jbig2dec;../../thirdparty/owemdjee/libjpeg-turbo/src;../../thirdparty/openjpeg/src/lib/openjp2;../../thirdparty/freetype/include;../../thirdparty/freetype/include/freetype;../../thirdparty/harfbuzz/src;../../thirdparty/gumbo-parser/src;../../thirdparty/gumbo-parser/visualc/include;../../thirdparty/libpng;../../thirdparty/libtiff/libtiff;../../thirdparty/zlib;../../include/;../../include/mupdf;../../scripts/zlib;../../thirdparty/owemdjee/zstd/lib;../../thirdparty/owemdjee/libwebp/src;../../thirdparty/lcms2/plugins/fast_float/include;../../thirdparty/lcms2/plugins/threaded/include;../../thirdparty/owemdjee/pthread-win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>HAVE_MUPDF;MUJS_ALL_FILES;WITH_GZFILEOP;BUILD_MONOLITHIC;FT2_BUILD_LIBRARY;OPJ_STATIC;USE_JPIP=1;FT_CONFIG_MODULES_H="slimftmodules.h";FT_CONFIG_OPTIONS_H="slimftoptions.h";verbose=-1;JBIG_EXTERNAL_MEMENTO_H="memento.h";HAVE_FALLBACK=1;HAVE_OT;HAVE_UCDN;HB_NO_MT;hb_malloc_impl=fz_hb_malloc;hb_calloc_impl=fz_hb_calloc;hb_realloc_impl=fz_hb_realloc;hb_free_impl=fz_hb_free;HAVE_FREETYPE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
Expand All @@ -124,6 +125,7 @@
<PreprocessorDefinitions>HAVE_MUPDF;MUJS_ALL_FILES;WITH_GZFILEOP;BUILD_MONOLITHIC;FT2_BUILD_LIBRARY;OPJ_STATIC;USE_JPIP=1;FT_CONFIG_MODULES_H="slimftmodules.h";FT_CONFIG_OPTIONS_H="slimftoptions.h";verbose=-1;HAVE_FALLBACK=1;HAVE_OT;HAVE_UCDN;HB_NO_MT;hb_malloc_impl=fz_hb_malloc;hb_calloc_impl=fz_hb_calloc;hb_realloc_impl=fz_hb_realloc;hb_free_impl=fz_hb_free;HAVE_FREETYPE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Expand All @@ -133,6 +135,7 @@
<AdditionalIncludeDirectories>../../include/system-override;.;../../thirdparty/lcms2/include;../../scripts/freetype;../../scripts/libpng;../../scripts/libtiff;../../scripts/libjpeg-turbo;../../thirdparty/jbig2dec;../../thirdparty/owemdjee/libjpeg-turbo/src;../../thirdparty/openjpeg/src/lib/openjp2;../../thirdparty/freetype/include;../../thirdparty/freetype/include/freetype;../../thirdparty/harfbuzz/src;../../thirdparty/gumbo-parser/src;../../thirdparty/gumbo-parser/visualc/include;../../thirdparty/libpng;../../thirdparty/libtiff/libtiff;../../thirdparty/zlib;../../include/;../../include/mupdf;../../scripts/zlib;../../thirdparty/owemdjee/zstd/lib;../../thirdparty/owemdjee/libwebp/src;../../thirdparty/lcms2/plugins/fast_float/include;../../thirdparty/lcms2/plugins/threaded/include;../../thirdparty/owemdjee/pthread-win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>HAVE_MUPDF;MUJS_ALL_FILES;WITH_GZFILEOP;BUILD_MONOLITHIC;FT2_BUILD_LIBRARY;OPJ_STATIC;USE_JPIP=1;FT_CONFIG_MODULES_H="slimftmodules.h";FT_CONFIG_OPTIONS_H="slimftoptions.h";verbose=-1;JBIG_EXTERNAL_MEMENTO_H="memento.h";HAVE_FALLBACK=1;HAVE_OT;HAVE_UCDN;HB_NO_MT;hb_malloc_impl=fz_hb_malloc;hb_calloc_impl=fz_hb_calloc;hb_realloc_impl=fz_hb_realloc;hb_free_impl=fz_hb_free;HAVE_FREETYPE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
Expand All @@ -145,6 +148,7 @@
<AdditionalIncludeDirectories>../../include/system-override;.;../../thirdparty/lcms2/include;../../scripts/freetype;../../scripts/libpng;../../scripts/libtiff;../../scripts/libjpeg-turbo;../../thirdparty/jbig2dec;../../thirdparty/owemdjee/libjpeg-turbo/src;../../thirdparty/openjpeg/src/lib/openjp2;../../thirdparty/freetype/include;../../thirdparty/freetype/include/freetype;../../thirdparty/harfbuzz/src;../../thirdparty/gumbo-parser/src;../../thirdparty/gumbo-parser/visualc/include;../../thirdparty/libpng;../../thirdparty/libtiff/libtiff;../../thirdparty/zlib;../../include/;../../include/mupdf;../../scripts/zlib;../../thirdparty/owemdjee/zstd/lib;../../thirdparty/owemdjee/libwebp/src;../../thirdparty/lcms2/plugins/fast_float/include;../../thirdparty/lcms2/plugins/threaded/include;../../thirdparty/owemdjee/pthread-win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>HAVE_MUPDF;MUJS_ALL_FILES;WITH_GZFILEOP;BUILD_MONOLITHIC;FT2_BUILD_LIBRARY;OPJ_STATIC;USE_JPIP=1;FT_CONFIG_MODULES_H="slimftmodules.h";FT_CONFIG_OPTIONS_H="slimftoptions.h";verbose=-1;HAVE_FALLBACK=1;HAVE_OT;HAVE_UCDN;HB_NO_MT;hb_malloc_impl=fz_hb_malloc;hb_calloc_impl=fz_hb_calloc;hb_realloc_impl=fz_hb_realloc;hb_free_impl=fz_hb_free;HAVE_FREETYPE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Expand Down Expand Up @@ -282,5 +286,4 @@
<Text Include="../../thirdparty/lcms2/src/lcms2mt.def" />
</ItemGroup>
<Import Project="$(SolutionDir)\common-project-ultimate-override.props" Label="SolutionWideSettingsOverride" />
</Project>

</Project>
21 changes: 12 additions & 9 deletions platform/win32/libleptonica.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,16 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<Import Project="$(SolutionDir)\common-project.props" Label="SolutionWideSettings" />
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(SolutionDir)\common-project-Debug-Win32.props" Condition="exists('$(SolutionDir)\common-project-Debug-Win32.props')" Label="SolutionWideDebugWin32Settings" />
<Import Project="$(SolutionDir)\common-project-Debug-Win32.props" Condition="exists('$(SolutionDir)\common-project-Debug-Win32.props')" Label="SolutionWideDebugWin32Settings" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(SolutionDir)\common-project-Release-Win32.props" Condition="exists('$(SolutionDir)\common-project-Release-Win32.props')" Label="SolutionWideReleaseWin32Settings" />
<Import Project="$(SolutionDir)\common-project-Release-Win32.props" Condition="exists('$(SolutionDir)\common-project-Release-Win32.props')" Label="SolutionWideReleaseWin32Settings" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(SolutionDir)\common-project-Debug-Win64.props" Condition="exists('$(SolutionDir)\common-project-Debug-Win64.props')" Label="SolutionWideDebugWin64Settings" />
<Import Project="$(SolutionDir)\common-project-Debug-Win64.props" Condition="exists('$(SolutionDir)\common-project-Debug-Win64.props')" Label="SolutionWideDebugWin64Settings" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(SolutionDir)\common-project-Release-Win64.props" Condition="exists('$(SolutionDir)\common-project-Release-Win64.props')" Label="SolutionWideReleaseWin64Settings" />
<Import Project="$(SolutionDir)\common-project-Release-Win64.props" Condition="exists('$(SolutionDir)\common-project-Release-Win64.props')" Label="SolutionWideReleaseWin64Settings" />
</ImportGroup>
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
Expand All @@ -75,7 +75,7 @@
<LinkIncremental>false</LinkIncremental>
<OutDir>$(SolutionDir)bin\$(Configuration)-$(CharacterSet)-$(PlatformArchitecture)bit-$(PlatformShortname)\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup>
<ItemDefinitionGroup>
<ClCompile>
<Optimization>Custom</Optimization>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
Expand Down Expand Up @@ -109,8 +109,8 @@
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<AdditionalOptions>/bigobj /utf-8 /Zc:__cplusplus /Zc:preprocessor %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<Optimization>Custom</Optimization>
Expand All @@ -121,6 +121,7 @@
<UndefinePreprocessorDefinitions>
</UndefinePreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
<Link>
<SubSystem>
Expand All @@ -144,6 +145,7 @@
<UndefinePreprocessorDefinitions>
</UndefinePreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
<Link>
<SubSystem>
Expand All @@ -167,6 +169,7 @@
<UndefinePreprocessorDefinitions>
</UndefinePreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
<Link>
<SubSystem>
Expand All @@ -190,6 +193,7 @@
<UndefinePreprocessorDefinitions>
</UndefinePreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
<Link>
<SubSystem>
Expand Down Expand Up @@ -460,5 +464,4 @@
<Text Include="../../thirdparty/leptonica/version-notes.html" />
</ItemGroup>
<Import Project="$(SolutionDir)\common-project-ultimate-override.props" Label="SolutionWideSettingsOverride" />
</Project>

</Project>
32 changes: 32 additions & 0 deletions platform/win32/m-dev-algorithmic.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8727,6 +8727,22 @@ Global
{A60D8644-5A1C-4D29-8970-7518FF1C7EC0}.Release|x64.Build.0 = Release|x64
{A60D8644-5A1C-4D29-8970-7518FF1C7EC0}.Release|x86.ActiveCfg = Release|Win32
{A60D8644-5A1C-4D29-8970-7518FF1C7EC0}.Release|x86.Build.0 = Release|Win32
{A60D8644-5A1C-4D29-8970-7518FF015065}.Debug|x64.ActiveCfg = Debug|x64
{A60D8644-5A1C-4D29-8970-7518FF015065}.Debug|x64.Build.0 = Debug|x64
{A60D8644-5A1C-4D29-8970-7518FF015065}.Debug|x86.ActiveCfg = Debug|Win32
{A60D8644-5A1C-4D29-8970-7518FF015065}.Debug|x86.Build.0 = Debug|Win32
{A60D8644-5A1C-4D29-8970-7518FF015065}.Release|x64.ActiveCfg = Release|x64
{A60D8644-5A1C-4D29-8970-7518FF015065}.Release|x64.Build.0 = Release|x64
{A60D8644-5A1C-4D29-8970-7518FF015065}.Release|x86.ActiveCfg = Release|Win32
{A60D8644-5A1C-4D29-8970-7518FF015065}.Release|x86.Build.0 = Release|Win32
{A60D8644-5A1C-4D29-8970-7518FFAD21E9}.Debug|x64.ActiveCfg = Debug|x64
{A60D8644-5A1C-4D29-8970-7518FFAD21E9}.Debug|x64.Build.0 = Debug|x64
{A60D8644-5A1C-4D29-8970-7518FFAD21E9}.Debug|x86.ActiveCfg = Debug|Win32
{A60D8644-5A1C-4D29-8970-7518FFAD21E9}.Debug|x86.Build.0 = Debug|Win32
{A60D8644-5A1C-4D29-8970-7518FFAD21E9}.Release|x64.ActiveCfg = Release|x64
{A60D8644-5A1C-4D29-8970-7518FFAD21E9}.Release|x64.Build.0 = Release|x64
{A60D8644-5A1C-4D29-8970-7518FFAD21E9}.Release|x86.ActiveCfg = Release|Win32
{A60D8644-5A1C-4D29-8970-7518FFAD21E9}.Release|x86.Build.0 = Release|Win32
{A60D8644-5A1C-4D29-8970-7518FFE83546}.Debug|x64.ActiveCfg = Debug|x64
{A60D8644-5A1C-4D29-8970-7518FFE83546}.Debug|x64.Build.0 = Debug|x64
{A60D8644-5A1C-4D29-8970-7518FFE83546}.Debug|x86.ActiveCfg = Debug|Win32
Expand Down Expand Up @@ -8863,6 +8879,14 @@ Global
{A60D8644-5A1C-4D29-8970-7518FF0FFD54}.Release|x64.Build.0 = Release|x64
{A60D8644-5A1C-4D29-8970-7518FF0FFD54}.Release|x86.ActiveCfg = Release|Win32
{A60D8644-5A1C-4D29-8970-7518FF0FFD54}.Release|x86.Build.0 = Release|Win32
{A60D8644-5A1C-4D29-8970-7518FF16F046}.Debug|x64.ActiveCfg = Debug|x64
{A60D8644-5A1C-4D29-8970-7518FF16F046}.Debug|x64.Build.0 = Debug|x64
{A60D8644-5A1C-4D29-8970-7518FF16F046}.Debug|x86.ActiveCfg = Debug|Win32
{A60D8644-5A1C-4D29-8970-7518FF16F046}.Debug|x86.Build.0 = Debug|Win32
{A60D8644-5A1C-4D29-8970-7518FF16F046}.Release|x64.ActiveCfg = Release|x64
{A60D8644-5A1C-4D29-8970-7518FF16F046}.Release|x64.Build.0 = Release|x64
{A60D8644-5A1C-4D29-8970-7518FF16F046}.Release|x86.ActiveCfg = Release|Win32
{A60D8644-5A1C-4D29-8970-7518FF16F046}.Release|x86.Build.0 = Release|Win32
{A60D8644-5A1C-4D29-8970-7518FFCFD9ED}.Debug|x64.ActiveCfg = Debug|x64
{A60D8644-5A1C-4D29-8970-7518FFCFD9ED}.Debug|x64.Build.0 = Debug|x64
{A60D8644-5A1C-4D29-8970-7518FFCFD9ED}.Debug|x86.ActiveCfg = Debug|Win32
Expand Down Expand Up @@ -15999,6 +16023,14 @@ Global
{6D5D28B5-CC96-4DE7-97EA-9CAAE76E1BD4}.Release|x64.Build.0 = Release|x64
{6D5D28B5-CC96-4DE7-97EA-9CAAE76E1BD4}.Release|x86.ActiveCfg = Release|Win32
{6D5D28B5-CC96-4DE7-97EA-9CAAE76E1BD4}.Release|x86.Build.0 = Release|Win32
{A60D8644-5A1C-4D29-8970-7518FF2456DE}.Debug|x64.ActiveCfg = Debug|x64
{A60D8644-5A1C-4D29-8970-7518FF2456DE}.Debug|x64.Build.0 = Debug|x64
{A60D8644-5A1C-4D29-8970-7518FF2456DE}.Debug|x86.ActiveCfg = Debug|Win32
{A60D8644-5A1C-4D29-8970-7518FF2456DE}.Debug|x86.Build.0 = Debug|Win32
{A60D8644-5A1C-4D29-8970-7518FF2456DE}.Release|x64.ActiveCfg = Release|x64
{A60D8644-5A1C-4D29-8970-7518FF2456DE}.Release|x64.Build.0 = Release|x64
{A60D8644-5A1C-4D29-8970-7518FF2456DE}.Release|x86.ActiveCfg = Release|Win32
{A60D8644-5A1C-4D29-8970-7518FF2456DE}.Release|x86.Build.0 = Release|Win32
{A60D8644-5A1C-4D29-8970-7518FF64CF8D}.Debug|x64.ActiveCfg = Debug|x64
{A60D8644-5A1C-4D29-8970-7518FF64CF8D}.Debug|x64.Build.0 = Debug|x64
{A60D8644-5A1C-4D29-8970-7518FF64CF8D}.Debug|x86.ActiveCfg = Debug|Win32
Expand Down
Loading

0 comments on commit 561f40c

Please sign in to comment.