Skip to content

Commit

Permalink
Switch projects to pngquant-msvc-fnordware
Browse files Browse the repository at this point in the history 
It appears that Kornel deleted his msvc branch and then began a new one,
effectively killing the branch I was using as a submodule. I've
resurrected it in my own fork, added that as a submodule, and pointed
the projects to it.

The pngquant-msvc submodule now points to Kornel's latest version of
that branch, which I have not been able to build in vc12 (Visual Studio
Express 2013).

It would be good to get everything to build with Kornel's latest.
  • Loading branch information
@fnordware
fnordware committed Jun 1, 2016
1 parent 46187ca commit f951651
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 22 deletions.
8 changes: 4 additions & 4 deletions vc/vc12/SuperPNG.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.\ext;..\..\src\photoshop;..\..\src\photoshop\win;..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\Common\Includes;..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\photoshopapi\Photoshop;..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\photoshopapi\PICA_SP;..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\photoshopapi\ADM;..\..\ext\zlib;..\..\ext\lcms\include;..\..\ext\lcms\src;..\..\ext\libpng;..\..\ext\pngquant-msvc\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.\ext;..\..\src\photoshop;..\..\src\photoshop\win;..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\Common\Includes;..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\photoshopapi\Photoshop;..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\photoshopapi\PICA_SP;..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\photoshopapi\ADM;..\..\ext\zlib;..\..\ext\lcms\include;..\..\ext\lcms\src;..\..\ext\libpng;..\..\ext\pngquant-msvc-fnordware\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ISOLATION_AWARE_ENABLED=1;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32=1;_WIN32;_WINDOWS;__PI__;PS_CS4_SDK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
Expand Down Expand Up @@ -138,7 +138,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.\ext;..\..\src\photoshop;..\..\src\photoshop\win;..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\Common\Includes;..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\photoshopapi\Photoshop;..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\photoshopapi\PICA_SP;..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\photoshopapi\ADM;..\..\ext\zlib;..\..\ext\lcms\include;..\..\ext\lcms\src;..\..\ext\libpng;..\..\ext\pngquant-msvc\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.\ext;..\..\src\photoshop;..\..\src\photoshop\win;..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\Common\Includes;..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\photoshopapi\Photoshop;..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\photoshopapi\PICA_SP;..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\photoshopapi\ADM;..\..\ext\zlib;..\..\ext\lcms\include;..\..\ext\lcms\src;..\..\ext\libpng;..\..\ext\pngquant-msvc-fnordware\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ISOLATION_AWARE_ENABLED=1;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32=1;_WIN32;_WINDOWS;__PI__;PS_CS4_SDK;PNG_SETJMP_NOT_SUPPORTED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
Expand Down Expand Up @@ -179,7 +179,7 @@
</Midl>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<AdditionalIncludeDirectories>.\ext;..\..\src\photoshop;..\..\src\photoshop\win;..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\Common\Includes;..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\photoshopapi\Photoshop;..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\photoshopapi\PICA_SP;..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\photoshopapi\ADM;..\..\ext\zlib;..\..\ext\lcms\include;..\..\ext\lcms\src;..\..\ext\libpng;..\..\ext\pngquant-msvc\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.\ext;..\..\src\photoshop;..\..\src\photoshop\win;..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\Common\Includes;..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\photoshopapi\Photoshop;..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\photoshopapi\PICA_SP;..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\photoshopapi\ADM;..\..\ext\zlib;..\..\ext\lcms\include;..\..\ext\lcms\src;..\..\ext\libpng;..\..\ext\pngquant-msvc-fnordware\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ISOLATION_AWARE_ENABLED=1;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32=1;_WIN32;_WINDOWS;__PI__;PS_CS4_SDK</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
Expand Down Expand Up @@ -221,7 +221,7 @@
</Midl>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<AdditionalIncludeDirectories>.\ext;..\..\src\photoshop;..\..\src\photoshop\win;..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\Common\Includes;..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\photoshopapi\Photoshop;..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\photoshopapi\PICA_SP;..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\photoshopapi\ADM;..\..\ext\zlib;..\..\ext\lcms\include;..\..\ext\lcms\src;..\..\ext\libpng;..\..\ext\pngquant-msvc\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.\ext;..\..\src\photoshop;..\..\src\photoshop\win;..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\Common\Includes;..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\photoshopapi\Photoshop;..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\photoshopapi\PICA_SP;..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\photoshopapi\ADM;..\..\ext\zlib;..\..\ext\lcms\include;..\..\ext\lcms\src;..\..\ext\libpng;..\..\ext\pngquant-msvc-fnordware\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ISOLATION_AWARE_ENABLED=1;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32=1;_WIN32;_WINDOWS;__PI__;PS_CS4_SDK;PNG_SETJMP_NOT_SUPPORTED</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
Expand Down
36 changes: 18 additions & 18 deletions vc/vc12/ext/pngquant.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\ext\pngquant-msvc\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\ext\pngquant-msvc-fnordware\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;USE_SSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
Expand All @@ -98,7 +98,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>..\..\..\ext\pngquant-msvc\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\ext\pngquant-msvc-fnordware\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;USE_SSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
Expand All @@ -113,7 +113,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\ext\pngquant-msvc\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\ext\pngquant-msvc-fnordware\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;USE_SSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
Expand All @@ -130,7 +130,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>..\..\..\ext\pngquant-msvc\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\ext\pngquant-msvc-fnordware\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;USE_SSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
Expand All @@ -140,23 +140,23 @@
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\ext\pngquant-msvc\lib\blur.c" />
<ClCompile Include="..\..\..\ext\pngquant-msvc\lib\libimagequant.c" />
<ClCompile Include="..\..\..\ext\pngquant-msvc\lib\mediancut.c" />
<ClCompile Include="..\..\..\ext\pngquant-msvc\lib\mempool.c" />
<ClCompile Include="..\..\..\ext\pngquant-msvc\lib\nearest.c" />
<ClCompile Include="..\..\..\ext\pngquant-msvc\lib\pam.c" />
<ClCompile Include="..\..\..\ext\pngquant-msvc\lib\viter.c" />
<ClCompile Include="..\..\..\ext\pngquant-msvc-fnordware\lib\blur.c" />
<ClCompile Include="..\..\..\ext\pngquant-msvc-fnordware\lib\libimagequant.c" />
<ClCompile Include="..\..\..\ext\pngquant-msvc-fnordware\lib\mediancut.c" />
<ClCompile Include="..\..\..\ext\pngquant-msvc-fnordware\lib\mempool.c" />
<ClCompile Include="..\..\..\ext\pngquant-msvc-fnordware\lib\nearest.c" />
<ClCompile Include="..\..\..\ext\pngquant-msvc-fnordware\lib\pam.c" />
<ClCompile Include="..\..\..\ext\pngquant-msvc-fnordware\lib\viter.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\ext\pngquant-msvc\lib\blur.h" />
<ClInclude Include="..\..\..\ext\pngquant-msvc\lib\libimagequant.h" />
<ClInclude Include="..\..\..\ext\pngquant-msvc\lib\mediancut.h" />
<ClInclude Include="..\..\..\ext\pngquant-msvc\lib\mempool.h" />
<ClInclude Include="..\..\..\ext\pngquant-msvc\lib\nearest.h" />
<ClInclude Include="..\..\..\ext\pngquant-msvc\lib\pam.h" />
<ClInclude Include="..\..\..\ext\pngquant-msvc-fnordware\lib\blur.h" />
<ClInclude Include="..\..\..\ext\pngquant-msvc-fnordware\lib\libimagequant.h" />
<ClInclude Include="..\..\..\ext\pngquant-msvc-fnordware\lib\mediancut.h" />
<ClInclude Include="..\..\..\ext\pngquant-msvc-fnordware\lib\mempool.h" />
<ClInclude Include="..\..\..\ext\pngquant-msvc-fnordware\lib\nearest.h" />
<ClInclude Include="..\..\..\ext\pngquant-msvc-fnordware\lib\pam.h" />
<ClInclude Include="stdbool.h" />
<ClInclude Include="..\..\..\ext\pngquant-msvc\lib\viter.h" />
<ClInclude Include="..\..\..\ext\pngquant-msvc-fnordware\lib\viter.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
Expand Down

0 comments on commit f951651

Please sign in to comment.