Move PNG to separate project (2011)

This commit is contained in:
Jason Felds
2014-03-16 12:04:01 -04:00
parent 70f7d18b1b
commit f4eca5cc78
5 changed files with 157 additions and 166 deletions
+3 -97
View File
@@ -1222,96 +1222,6 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"</Command>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\extern\libpng\include\png.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release-SSE2|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='FastDebug|Win32'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\extern\libpng\include\pngerror.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release-SSE2|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='FastDebug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\extern\libpng\include\pngget.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release-SSE2|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='FastDebug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\extern\libpng\include\pngmem.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release-SSE2|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='FastDebug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\extern\libpng\include\pngpread.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release-SSE2|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='FastDebug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\extern\libpng\include\pngread.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release-SSE2|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='FastDebug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\extern\libpng\include\pngrio.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release-SSE2|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='FastDebug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\extern\libpng\include\pngrtran.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release-SSE2|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='FastDebug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\extern\libpng\include\pngrutil.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release-SSE2|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='FastDebug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\extern\libpng\include\pngset.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release-SSE2|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='FastDebug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\extern\libpng\include\pngtrans.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release-SSE2|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='FastDebug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\extern\libpng\include\pngwio.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release-SSE2|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='FastDebug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\extern\libpng\include\pngwrite.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release-SSE2|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='FastDebug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\extern\libpng\include\pngwtran.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release-SSE2|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='FastDebug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\extern\libpng\include\pngwutil.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release-SSE2|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='FastDebug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\extern\lua-5.1\src\lapi.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</PrecompiledHeader>
@@ -2289,13 +2199,6 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"</Command>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</CustomBuildStep>
<ClInclude Include="glext.h" />
<ClInclude Include="..\extern\libpng\include\png.h" />
<ClInclude Include="..\extern\libpng\include\pngconf.h" />
<ClInclude Include="..\extern\libpng\include\pngdebug.h" />
<ClInclude Include="..\extern\libpng\include\pnginfo.h" />
<ClInclude Include="..\extern\libpng\include\scripts\pnglibconf.h" />
<ClInclude Include="..\extern\libpng\include\pngpriv.h" />
<ClInclude Include="..\extern\libpng\include\pngstruct.h" />
<ClInclude Include="..\extern\lua-5.1\src\lapi.h" />
<ClInclude Include="..\extern\lua-5.1\src\lauxlib.h" />
<ClInclude Include="..\extern\lua-5.1\src\lcode.h" />
@@ -2332,6 +2235,9 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"</Command>
<ResourceCompile Include="archutils\Win32\WindowsResources.rc" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\extern\libpng\libpng-net2011.vcxproj">
<Project>{046c857a-41c5-4e87-ad44-462ab17bbf4f}</Project>
</ProjectReference>
<ProjectReference Include="..\extern\pcre\libpcre-net2011.vcxproj">
<Project>{91920268-4395-419f-8ce5-da7e11a5c1fd}</Project>
</ProjectReference>
-69
View File
@@ -100,9 +100,6 @@
<Filter Include="Helpers">
<UniqueIdentifier>{46a5ab77-6eaf-44eb-93ec-43b2db4741ff}</UniqueIdentifier>
</Filter>
<Filter Include="Helpers\libpng">
<UniqueIdentifier>{a89b61cf-bbf6-4303-a32a-6eec76f78893}</UniqueIdentifier>
</Filter>
<Filter Include="Helpers\Lua">
<UniqueIdentifier>{c2c701a5-a88f-4a36-ab40-43619668f88f}</UniqueIdentifier>
</Filter>
@@ -1452,51 +1449,6 @@
<ClCompile Include="BaseClasses\wxutil.cpp">
<Filter>BaseClasses</Filter>
</ClCompile>
<ClCompile Include="..\extern\libpng\include\png.c">
<Filter>Helpers\libpng</Filter>
</ClCompile>
<ClCompile Include="..\extern\libpng\include\pngerror.c">
<Filter>Helpers\libpng</Filter>
</ClCompile>
<ClCompile Include="..\extern\libpng\include\pngget.c">
<Filter>Helpers\libpng</Filter>
</ClCompile>
<ClCompile Include="..\extern\libpng\include\pngmem.c">
<Filter>Helpers\libpng</Filter>
</ClCompile>
<ClCompile Include="..\extern\libpng\include\pngpread.c">
<Filter>Helpers\libpng</Filter>
</ClCompile>
<ClCompile Include="..\extern\libpng\include\pngread.c">
<Filter>Helpers\libpng</Filter>
</ClCompile>
<ClCompile Include="..\extern\libpng\include\pngrio.c">
<Filter>Helpers\libpng</Filter>
</ClCompile>
<ClCompile Include="..\extern\libpng\include\pngrtran.c">
<Filter>Helpers\libpng</Filter>
</ClCompile>
<ClCompile Include="..\extern\libpng\include\pngrutil.c">
<Filter>Helpers\libpng</Filter>
</ClCompile>
<ClCompile Include="..\extern\libpng\include\pngset.c">
<Filter>Helpers\libpng</Filter>
</ClCompile>
<ClCompile Include="..\extern\libpng\include\pngtrans.c">
<Filter>Helpers\libpng</Filter>
</ClCompile>
<ClCompile Include="..\extern\libpng\include\pngwio.c">
<Filter>Helpers\libpng</Filter>
</ClCompile>
<ClCompile Include="..\extern\libpng\include\pngwrite.c">
<Filter>Helpers\libpng</Filter>
</ClCompile>
<ClCompile Include="..\extern\libpng\include\pngwtran.c">
<Filter>Helpers\libpng</Filter>
</ClCompile>
<ClCompile Include="..\extern\libpng\include\pngwutil.c">
<Filter>Helpers\libpng</Filter>
</ClCompile>
<ClCompile Include="..\extern\lua-5.1\src\lapi.c">
<Filter>Helpers\Lua</Filter>
</ClCompile>
@@ -2885,27 +2837,6 @@
<ClInclude Include="glext.h">
<Filter>Helpers</Filter>
</ClInclude>
<ClInclude Include="..\extern\libpng\include\png.h">
<Filter>Helpers\libpng</Filter>
</ClInclude>
<ClInclude Include="..\extern\libpng\include\pngconf.h">
<Filter>Helpers\libpng</Filter>
</ClInclude>
<ClInclude Include="..\extern\libpng\include\pngdebug.h">
<Filter>Helpers\libpng</Filter>
</ClInclude>
<ClInclude Include="..\extern\libpng\include\pnginfo.h">
<Filter>Helpers\libpng</Filter>
</ClInclude>
<ClInclude Include="..\extern\libpng\include\scripts\pnglibconf.h">
<Filter>Helpers\libpng</Filter>
</ClInclude>
<ClInclude Include="..\extern\libpng\include\pngpriv.h">
<Filter>Helpers\libpng</Filter>
</ClInclude>
<ClInclude Include="..\extern\libpng\include\pngstruct.h">
<Filter>Helpers\libpng</Filter>
</ClInclude>
<ClInclude Include="..\extern\lua-5.1\src\lapi.h">
<Filter>Helpers\Lua</Filter>
</ClInclude>
+10
View File
@@ -9,6 +9,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtomcrypt", "libtomcrypt\
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpcre", "..\extern\pcre\libpcre-net2011.vcxproj", "{91920268-4395-419F-8CE5-DA7E11A5C1FD}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "..\extern\libpng\libpng-net2011.vcxproj", "{046C857A-41C5-4E87-AD44-462AB17BBF4F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -49,6 +51,14 @@ Global
{91920268-4395-419F-8CE5-DA7E11A5C1FD}.Release|Win32.Build.0 = Release|Win32
{91920268-4395-419F-8CE5-DA7E11A5C1FD}.Release-SSE2|Win32.ActiveCfg = Release|Win32
{91920268-4395-419F-8CE5-DA7E11A5C1FD}.Release-SSE2|Win32.Build.0 = Release|Win32
{046C857A-41C5-4E87-AD44-462AB17BBF4F}.Debug|Win32.ActiveCfg = Debug|Win32
{046C857A-41C5-4E87-AD44-462AB17BBF4F}.Debug|Win32.Build.0 = Debug|Win32
{046C857A-41C5-4E87-AD44-462AB17BBF4F}.FastDebug|Win32.ActiveCfg = Debug|Win32
{046C857A-41C5-4E87-AD44-462AB17BBF4F}.FastDebug|Win32.Build.0 = Debug|Win32
{046C857A-41C5-4E87-AD44-462AB17BBF4F}.Release|Win32.ActiveCfg = Release|Win32
{046C857A-41C5-4E87-AD44-462AB17BBF4F}.Release|Win32.Build.0 = Release|Win32
{046C857A-41C5-4E87-AD44-462AB17BBF4F}.Release-SSE2|Win32.ActiveCfg = Release|Win32
{046C857A-41C5-4E87-AD44-462AB17BBF4F}.Release-SSE2|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE