diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2016-08-20 06:38:41 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2016-08-20 06:38:41 +0000 |
| commit | 8077ddaf62bdbff2169973eca565a5752501587d (patch) | |
| tree | 0532180e74cf5215736fd4e053216e291326fbcb /External | |
| parent | One more update to android build configuration (diff) | |
| download | DiligentTools-8077ddaf62bdbff2169973eca565a5752501587d.tar.gz DiligentTools-8077ddaf62bdbff2169973eca565a5752501587d.zip | |
Updated to Diligent Engine 2.0
Diffstat (limited to 'External')
84 files changed, 1353 insertions, 2032 deletions
diff --git a/External/libjpeg-9a/build/WindowsStore/libjpeg.Windows/libjpeg.Windows.vcxproj b/External/libjpeg-9a/build/UWP/libjpeg.vcxproj index e0fdc2c..cfb0441 100644 --- a/External/libjpeg-9a/build/WindowsStore/libjpeg.Windows/libjpeg.Windows.vcxproj +++ b/External/libjpeg-9a/build/UWP/libjpeg.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -27,82 +27,89 @@ </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> - <ProjectGuid>{3cce7ebc-96c9-4f40-8983-5c99f584b3b1}</ProjectGuid> - <RootNamespace>libjpeg</RootNamespace> + <ProjectGuid>{d74e2843-18a5-402f-8df3-be013a574ca7}</ProjectGuid> + <Keyword>StaticLibrary</Keyword> + <RootNamespace>Tools</RootNamespace> <DefaultLanguage>en-US</DefaultLanguage> - <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion> + <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion> <AppContainerApplication>true</AppContainerApplication> <ApplicationType>Windows Store</ApplicationType> - <ApplicationTypeRevision>8.1</ApplicationTypeRevision> - <ConvergedProjectType>CodeSharingStaticLibrary</ConvergedProjectType> + <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> + <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> + <ApplicationTypeRevision>10.0</ApplicationTypeRevision> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="..\libjpeg.Shared\libjpeg.Shared.vcxitems" Label="Shared" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + <Import Project="..\Windows.Shared\libjpeg.Shared.vcxitems" Label="Shared" /> + </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStore32Dbg.props" /> - <Import Project="..\..\Windows\libjpeg.props" /> + <Import Project="..\..\..\..\..\diligentcore\Shared\build\UWP\UWP_Win32Dbg.props" /> + <Import Project="..\Windows.Shared\libjpeg.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStore32Rel.props" /> - <Import Project="..\..\Windows\libjpeg.props" /> + <Import Project="..\..\..\..\..\diligentcore\Shared\build\UWP\UWP_Win32Rel.props" /> + <Import Project="..\Windows.Shared\libjpeg.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStoreArmDbg.props" /> - <Import Project="..\..\Windows\libjpeg.props" /> + <Import Project="..\..\..\..\..\diligentcore\Shared\build\UWP\UWP_ArmDbg.props" /> + <Import Project="..\Windows.Shared\libjpeg.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStoreArmRel.props" /> - <Import Project="..\..\Windows\libjpeg.props" /> + <Import Project="..\..\..\..\..\diligentcore\Shared\build\UWP\UWP_ArmRel.props" /> + <Import Project="..\Windows.Shared\libjpeg.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStore64Dbg.props" /> - <Import Project="..\..\Windows\libjpeg.props" /> + <Import Project="..\..\..\..\..\diligentcore\Shared\build\UWP\UWP_X64Dbg.props" /> + <Import Project="..\Windows.Shared\libjpeg.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStore64Rel.props" /> - <Import Project="..\..\Windows\libjpeg.props" /> + <Import Project="..\..\..\..\..\diligentcore\Shared\build\UWP\UWP_X64Rel.props" /> + <Import Project="..\Windows.Shared\libjpeg.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> + <PropertyGroup /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <GenerateManifest>false</GenerateManifest> </PropertyGroup> @@ -125,7 +132,7 @@ <ClCompile> <CompileAsWinRT>false</CompileAsWinRT> <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>NO_GETENV;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NO_GETENV;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -137,7 +144,7 @@ <ClCompile> <CompileAsWinRT>false</CompileAsWinRT> <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>NO_GETENV;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NO_GETENV;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -149,7 +156,7 @@ <ClCompile> <CompileAsWinRT>false</CompileAsWinRT> <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>NO_GETENV;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NO_GETENV;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -161,7 +168,7 @@ <ClCompile> <CompileAsWinRT>false</CompileAsWinRT> <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>NO_GETENV;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NO_GETENV;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -173,7 +180,7 @@ <ClCompile> <CompileAsWinRT>false</CompileAsWinRT> <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>NO_GETENV;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NO_GETENV;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -185,7 +192,7 @@ <ClCompile> <CompileAsWinRT>false</CompileAsWinRT> <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>NO_GETENV;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NO_GETENV;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> <SubSystem>Console</SubSystem> diff --git a/External/libjpeg-9a/build/UWP/libjpeg.vcxproj.filters b/External/libjpeg-9a/build/UWP/libjpeg.vcxproj.filters new file mode 100644 index 0000000..c31757e --- /dev/null +++ b/External/libjpeg-9a/build/UWP/libjpeg.vcxproj.filters @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />
\ No newline at end of file diff --git a/External/libjpeg-9a/build/Windows/jni/Android.mk b/External/libjpeg-9a/build/Win32/jni/Android.mk index 97f2a71..97f2a71 100644 --- a/External/libjpeg-9a/build/Windows/jni/Android.mk +++ b/External/libjpeg-9a/build/Win32/jni/Android.mk diff --git a/External/libjpeg-9a/build/Windows/jni/Application.mk b/External/libjpeg-9a/build/Win32/jni/Application.mk index 9069430..9069430 100644 --- a/External/libjpeg-9a/build/Windows/jni/Application.mk +++ b/External/libjpeg-9a/build/Win32/jni/Application.mk diff --git a/External/libjpeg-9a/build/Windows/libjpeg-Debug.vgdbsettings b/External/libjpeg-9a/build/Win32/libjpeg-Debug.vgdbsettings index 3f5b24b..3f5b24b 100644 --- a/External/libjpeg-9a/build/Windows/libjpeg-Debug.vgdbsettings +++ b/External/libjpeg-9a/build/Win32/libjpeg-Debug.vgdbsettings diff --git a/External/libjpeg-9a/build/Windows/libjpeg-Release.vgdbsettings b/External/libjpeg-9a/build/Win32/libjpeg-Release.vgdbsettings index 669691f..669691f 100644 --- a/External/libjpeg-9a/build/Windows/libjpeg-Release.vgdbsettings +++ b/External/libjpeg-9a/build/Win32/libjpeg-Release.vgdbsettings diff --git a/External/libjpeg-9a/build/Windows/libjpeg.vcxproj b/External/libjpeg-9a/build/Win32/libjpeg.vcxproj index 1fd7411..37af815 100644 --- a/External/libjpeg-9a/build/Windows/libjpeg.vcxproj +++ b/External/libjpeg-9a/build/Win32/libjpeg.vcxproj @@ -348,28 +348,28 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\WindowsStore\libjpeg.Shared\libjpeg.Shared.vcxitems" Label="Shared" Condition="Exists('..\WindowsStore\libjpeg.Shared\libjpeg.Shared.vcxitems')" /> + <Import Project="..\Windows.Shared\libjpeg.Shared.vcxitems" Label="Shared" Condition="Exists('..\Windows.Shared\libjpeg.Shared.vcxitems')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="..\..\..\..\..\diligentcore\Shared\build\Windows\Win32r.props" /> - <Import Project="libjpeg.props" /> + <Import Project="..\Windows.Shared\libjpeg.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="..\..\..\..\..\diligentcore\Shared\build\Windows\Win64r.props" /> - <Import Project="libjpeg.props" /> + <Import Project="..\Windows.Shared\libjpeg.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> <Import Project="..\..\..\..\..\diligentcore\Shared\build\Windows\Android32d.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="..\..\..\..\..\diligentcore\Shared\build\Windows\Win32d.props" /> - <Import Project="libjpeg.props" /> + <Import Project="..\Windows.Shared\libjpeg.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <Import Project="..\..\..\..\..\diligentcore\Shared\build\Windows\Win64d.props" /> - <Import Project="libjpeg.props" /> + <Import Project="..\Windows.Shared\libjpeg.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> <Import Project="..\..\..\..\..\diligentcore\Shared\build\Windows\Android32r.props" /> diff --git a/External/libjpeg-9a/build/Windows/libjpeg.vcxproj.filters b/External/libjpeg-9a/build/Win32/libjpeg.vcxproj.filters index 3ef9e6b..3ef9e6b 100644 --- a/External/libjpeg-9a/build/Windows/libjpeg.vcxproj.filters +++ b/External/libjpeg-9a/build/Win32/libjpeg.vcxproj.filters diff --git a/External/libjpeg-9a/build/Windows.Shared/libjpeg.Shared.vcxitems b/External/libjpeg-9a/build/Windows.Shared/libjpeg.Shared.vcxitems new file mode 100644 index 0000000..0f9938f --- /dev/null +++ b/External/libjpeg-9a/build/Windows.Shared/libjpeg.Shared.vcxitems @@ -0,0 +1,83 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup Label="Globals"> + <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects> + <HasSharedItems>true</HasSharedItems> + <ItemsProjectGuid>{e0ca2a6c-095a-454e-b566-31e81d91615d}</ItemsProjectGuid> + <ItemsRootNamespace>libjpeg</ItemsRootNamespace> + <ItemsProjectName>libjpeg.Shared</ItemsProjectName> + <CodeSharingProject>248F659F-DAC5-46E8-AC09-60EC9FC95053</CodeSharingProject> + </PropertyGroup> + <ItemDefinitionGroup> + <ClCompile> + <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)</AdditionalIncludeDirectories> + </ClCompile> + </ItemDefinitionGroup> + <ItemGroup> + <ProjectCapability Include="SourceItemsFromImports" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\jconfig.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\jdct.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\jerror.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\jinclude.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\jmemsys.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\jmorecfg.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\jpegint.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\jpeglib.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\jversion.h" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jaricom.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jcapimin.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jcapistd.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jcarith.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jccoefct.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jccolor.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jcdctmgr.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jchuff.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jcinit.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jcmainct.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jcmarker.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jcmaster.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jcomapi.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jcparam.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jcprepct.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jcsample.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jctrans.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jdapimin.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jdapistd.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jdarith.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jdatadst.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jdatasrc.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jdcoefct.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jdcolor.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jddctmgr.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jdhuff.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jdinput.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jdmainct.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jdmarker.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jdmaster.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jdmerge.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jdpostct.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jdsample.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jdtrans.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jerror.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jfdctflt.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jfdctfst.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jfdctint.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jidctflt.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jidctfst.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jidctint.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jmemmgr.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jmemnobs.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jquant1.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jquant2.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jutils.c" /> + </ItemGroup> + <ItemGroup> + <Text Include="$(MSBuildThisFileDirectory)..\..\CMakeLists.txt"> + <DeploymentContent>false</DeploymentContent> + </Text> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/External/libjpeg-9a/build/Windows.Shared/libjpeg.Shared.vcxitems.filters b/External/libjpeg-9a/build/Windows.Shared/libjpeg.Shared.vcxitems.filters new file mode 100644 index 0000000..e914f53 --- /dev/null +++ b/External/libjpeg-9a/build/Windows.Shared/libjpeg.Shared.vcxitems.filters @@ -0,0 +1,183 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="src"> + <UniqueIdentifier>{11a20d43-8d7e-426b-bcfe-4e3324c288e3}</UniqueIdentifier> + </Filter> + <Filter Include="include"> + <UniqueIdentifier>{20845c30-1392-4a02-b87c-e0d59d5b2245}</UniqueIdentifier> + </Filter> + </ItemGroup> + <ItemGroup> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\jconfig.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\jdct.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\jerror.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\jinclude.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\jmemsys.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\jmorecfg.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\jpegint.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\jpeglib.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\jversion.h"> + <Filter>include</Filter> + </ClInclude> + </ItemGroup> + <ItemGroup> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jaricom.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jcapimin.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jcapistd.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jcarith.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jccoefct.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jccolor.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jcdctmgr.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jchuff.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jcinit.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jcmainct.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jcmarker.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jcmaster.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jcomapi.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jcparam.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jcprepct.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jcsample.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jctrans.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jdapimin.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jdapistd.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jdarith.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jdatadst.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jdatasrc.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jdcoefct.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jdcolor.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jddctmgr.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jdhuff.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jdinput.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jdmainct.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jdmarker.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jdmaster.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jdmerge.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jdpostct.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jdsample.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jdtrans.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jerror.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jfdctflt.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jfdctfst.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jfdctint.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jidctflt.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jidctfst.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jidctint.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jmemmgr.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jmemnobs.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jquant1.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jquant2.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\jutils.c"> + <Filter>src</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <Text Include="$(MSBuildThisFileDirectory)..\..\CMakeLists.txt" /> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/External/libjpeg-9a/build/Windows/libjpeg.props b/External/libjpeg-9a/build/Windows.Shared/libjpeg.props index f75804a..ca5e223 100644 --- a/External/libjpeg-9a/build/Windows/libjpeg.props +++ b/External/libjpeg-9a/build/Windows.Shared/libjpeg.props @@ -7,6 +7,7 @@ <ClCompile> <PreprocessorDefinitions>_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeader>NotUsing</PrecompiledHeader> + <DisableSpecificWarnings>4100;4505;4244;4127</DisableSpecificWarnings> </ClCompile> </ItemDefinitionGroup> <ItemGroup /> diff --git a/External/libjpeg-9a/build/WindowsStore/libjpeg.Shared/libjpeg.Shared.vcxitems b/External/libjpeg-9a/build/WindowsStore/libjpeg.Shared/libjpeg.Shared.vcxitems deleted file mode 100644 index c43f27c..0000000 --- a/External/libjpeg-9a/build/WindowsStore/libjpeg.Shared/libjpeg.Shared.vcxitems +++ /dev/null @@ -1,78 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup Label="Globals"> - <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects> - <HasSharedItems>true</HasSharedItems> - <ItemsProjectGuid>{e0ca2a6c-095a-454e-b566-31e81d91615d}</ItemsProjectGuid> - <ItemsRootNamespace>libjpeg</ItemsRootNamespace> - <ItemsProjectName>libjpeg.Shared</ItemsProjectName> - <CodeSharingProject>248F659F-DAC5-46E8-AC09-60EC9FC95053</CodeSharingProject> - </PropertyGroup> - <ItemDefinitionGroup> - <ClCompile> - <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)</AdditionalIncludeDirectories> - </ClCompile> - </ItemDefinitionGroup> - <ItemGroup> - <ProjectCapability Include="SourceItemsFromImports" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\jconfig.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\jdct.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\jerror.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\jinclude.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\jmemsys.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\jmorecfg.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\jpegint.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\jpeglib.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\jversion.h" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jaricom.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jcapimin.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jcapistd.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jcarith.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jccoefct.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jccolor.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jcdctmgr.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jchuff.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jcinit.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jcmainct.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jcmarker.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jcmaster.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jcomapi.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jcparam.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jcprepct.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jcsample.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jctrans.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jdapimin.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jdapistd.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jdarith.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jdatadst.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jdatasrc.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jdcoefct.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jdcolor.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jddctmgr.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jdhuff.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jdinput.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jdmainct.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jdmarker.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jdmaster.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jdmerge.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jdpostct.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jdsample.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jdtrans.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jerror.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jfdctflt.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jfdctfst.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jfdctint.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jidctflt.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jidctfst.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jidctint.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jmemmgr.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jmemnobs.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jquant1.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jquant2.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jutils.c" /> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/External/libjpeg-9a/build/WindowsStore/libjpeg.Shared/libjpeg.Shared.vcxitems.filters b/External/libjpeg-9a/build/WindowsStore/libjpeg.Shared/libjpeg.Shared.vcxitems.filters deleted file mode 100644 index b28663c..0000000 --- a/External/libjpeg-9a/build/WindowsStore/libjpeg.Shared/libjpeg.Shared.vcxitems.filters +++ /dev/null @@ -1,180 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="src"> - <UniqueIdentifier>{11a20d43-8d7e-426b-bcfe-4e3324c288e3}</UniqueIdentifier> - </Filter> - <Filter Include="include"> - <UniqueIdentifier>{20845c30-1392-4a02-b87c-e0d59d5b2245}</UniqueIdentifier> - </Filter> - </ItemGroup> - <ItemGroup> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\jconfig.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\jdct.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\jerror.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\jinclude.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\jmemsys.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\jmorecfg.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\jpegint.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\jpeglib.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\jversion.h"> - <Filter>include</Filter> - </ClInclude> - </ItemGroup> - <ItemGroup> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jaricom.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jcapimin.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jcapistd.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jcarith.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jccoefct.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jccolor.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jcdctmgr.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jchuff.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jcinit.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jcmainct.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jcmarker.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jcmaster.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jcomapi.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jcparam.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jcprepct.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jcsample.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jctrans.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jdapimin.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jdapistd.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jdarith.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jdatadst.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jdatasrc.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jdcoefct.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jdcolor.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jddctmgr.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jdhuff.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jdinput.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jdmainct.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jdmarker.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jdmaster.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jdmerge.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jdpostct.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jdsample.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jdtrans.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jerror.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jfdctflt.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jfdctfst.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jfdctint.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jidctflt.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jidctfst.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jidctint.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jmemmgr.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jmemnobs.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jquant1.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jquant2.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\jutils.c"> - <Filter>src</Filter> - </ClCompile> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/External/libjpeg-9a/build/WindowsStore/libjpeg.Windows/libjpeg.Windows.vcxproj.filters b/External/libjpeg-9a/build/WindowsStore/libjpeg.Windows/libjpeg.Windows.vcxproj.filters deleted file mode 100644 index a7761ab..0000000 --- a/External/libjpeg-9a/build/WindowsStore/libjpeg.Windows/libjpeg.Windows.vcxproj.filters +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - </ItemGroup> -</Project> diff --git a/External/libjpeg-9a/build/WindowsStore/libjpeg.WindowsPhone/libjpeg.WindowsPhone.vcxproj b/External/libjpeg-9a/build/WindowsStore/libjpeg.WindowsPhone/libjpeg.WindowsPhone.vcxproj deleted file mode 100644 index 5b7f606..0000000 --- a/External/libjpeg-9a/build/WindowsStore/libjpeg.WindowsPhone/libjpeg.WindowsPhone.vcxproj +++ /dev/null @@ -1,140 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|ARM"> - <Configuration>Debug</Configuration> - <Platform>ARM</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|ARM"> - <Configuration>Release</Configuration> - <Platform>ARM</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{78f7acd1-114d-483d-b92a-bab53519f0d5}</ProjectGuid> - <RootNamespace>libjpeg</RootNamespace> - <DefaultLanguage>en-US</DefaultLanguage> - <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion> - <AppContainerApplication>true</AppContainerApplication> - <ApplicationType>Windows Phone</ApplicationType> - <ApplicationTypeRevision>8.1</ApplicationTypeRevision> - <ConvergedProjectType>CodeSharingStaticLibrary</ConvergedProjectType> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v120_wp81</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v120_wp81</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120_wp81</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120_wp81</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="..\libjpeg.Shared\libjpeg.Shared.vcxitems" Label="Shared" /> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStore32Dbg.props" /> - <Import Project="..\..\Windows\libjpeg.props" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStore32Rel.props" /> - <Import Project="..\..\Windows\libjpeg.props" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStoreArmDbg.props" /> - <Import Project="..\..\Windows\libjpeg.props" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStoreArmRel.props" /> - <Import Project="..\..\Windows\libjpeg.props" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>NO_GETENV;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> - <GenerateWindowsMetadata>false</GenerateWindowsMetadata> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>NO_GETENV;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> - <GenerateWindowsMetadata>false</GenerateWindowsMetadata> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'"> - <ClCompile> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>NO_GETENV;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> - <GenerateWindowsMetadata>false</GenerateWindowsMetadata> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'"> - <ClCompile> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>NO_GETENV;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> - <GenerateWindowsMetadata>false</GenerateWindowsMetadata> - </Link> - </ItemDefinitionGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/External/libjpeg-9a/build/WindowsStore/libjpeg.WindowsPhone/libjpeg.WindowsPhone.vcxproj.filters b/External/libjpeg-9a/build/WindowsStore/libjpeg.WindowsPhone/libjpeg.WindowsPhone.vcxproj.filters deleted file mode 100644 index a7761ab..0000000 --- a/External/libjpeg-9a/build/WindowsStore/libjpeg.WindowsPhone/libjpeg.WindowsPhone.vcxproj.filters +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - </ItemGroup> -</Project> diff --git a/External/libtiff-4.0.3/build/WindowsStore/LibTiff.Windows/LibTiff.Windows.vcxproj b/External/libtiff-4.0.3/build/UWP/LibTiff.vcxproj index 1229ea6..7fbb7f4 100644 --- a/External/libtiff-4.0.3/build/WindowsStore/LibTiff.Windows/LibTiff.Windows.vcxproj +++ b/External/libtiff-4.0.3/build/UWP/LibTiff.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -27,85 +27,92 @@ </ProjectConfiguration> </ItemGroup> <ItemGroup> - <ClCompile Include="..\..\..\libtiff\tif_unix.c" /> + <ClCompile Include="..\..\libtiff\tif_unix.c" /> </ItemGroup> <PropertyGroup Label="Globals"> - <ProjectGuid>{e9e719dd-05cf-4ad2-ac3b-1035ddadbb56}</ProjectGuid> + <ProjectGuid>{6c30470e-39a5-4a89-8f0a-254e3c84ee96}</ProjectGuid> + <Keyword>StaticLibrary</Keyword> <RootNamespace>LibTiff</RootNamespace> <DefaultLanguage>en-US</DefaultLanguage> - <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion> + <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion> <AppContainerApplication>true</AppContainerApplication> <ApplicationType>Windows Store</ApplicationType> - <ApplicationTypeRevision>8.1</ApplicationTypeRevision> - <ConvergedProjectType>CodeSharingStaticLibrary</ConvergedProjectType> + <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> + <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> + <ApplicationTypeRevision>10.0</ApplicationTypeRevision> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="..\LibTiff.Shared\LibTiff.Shared.vcxitems" Label="Shared" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + <Import Project="..\Windows.Shared\LibTiff.Shared.vcxitems" Label="Shared" /> + </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStore32Dbg.props" /> - <Import Project="..\..\Windows\LibTiff.props" /> + <Import Project="..\..\..\..\..\diligentcore\Shared\build\UWP\UWP_Win32Dbg.props" /> + <Import Project="..\Windows.Shared\LibTiff.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStore32Rel.props" /> - <Import Project="..\..\Windows\LibTiff.props" /> + <Import Project="..\..\..\..\..\diligentcore\Shared\build\UWP\UWP_Win32Rel.props" /> + <Import Project="..\Windows.Shared\LibTiff.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStoreArmDbg.props" /> - <Import Project="..\..\Windows\LibTiff.props" /> + <Import Project="..\..\..\..\..\diligentcore\Shared\build\UWP\UWP_ArmDbg.props" /> + <Import Project="..\Windows.Shared\LibTiff.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStoreArmRel.props" /> - <Import Project="..\..\Windows\LibTiff.props" /> + <Import Project="..\..\..\..\..\diligentcore\Shared\build\UWP\UWP_ArmRel.props" /> + <Import Project="..\Windows.Shared\LibTiff.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStore64Dbg.props" /> - <Import Project="..\..\Windows\LibTiff.props" /> + <Import Project="..\..\..\..\..\diligentcore\Shared\build\UWP\UWP_X64Dbg.props" /> + <Import Project="..\Windows.Shared\LibTiff.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStore64Rel.props" /> - <Import Project="..\..\Windows\LibTiff.props" /> + <Import Project="..\..\..\..\..\diligentcore\Shared\build\UWP\UWP_X64Rel.props" /> + <Import Project="..\Windows.Shared\LibTiff.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> + <PropertyGroup /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <GenerateManifest>false</GenerateManifest> </PropertyGroup> @@ -127,8 +134,8 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <CompileAsWinRT>false</CompileAsWinRT> - <PreprocessorDefinitions>PLATFORM_WINDOWS_STORE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <SDLCheck>false</SDLCheck> + <SDLCheck>true</SDLCheck> + <PreprocessorDefinitions>PLATFORM_WINDOWS_STORE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <DisableSpecificWarnings>4996</DisableSpecificWarnings> </ClCompile> <Link> @@ -140,8 +147,8 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> <CompileAsWinRT>false</CompileAsWinRT> - <PreprocessorDefinitions>PLATFORM_WINDOWS_STORE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <SDLCheck>false</SDLCheck> + <SDLCheck>true</SDLCheck> + <PreprocessorDefinitions>PLATFORM_WINDOWS_STORE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <DisableSpecificWarnings>4996</DisableSpecificWarnings> </ClCompile> <Link> @@ -153,8 +160,8 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'"> <ClCompile> <CompileAsWinRT>false</CompileAsWinRT> - <PreprocessorDefinitions>PLATFORM_WINDOWS_STORE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <SDLCheck>false</SDLCheck> + <SDLCheck>true</SDLCheck> + <PreprocessorDefinitions>PLATFORM_WINDOWS_STORE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <DisableSpecificWarnings>4996</DisableSpecificWarnings> </ClCompile> <Link> @@ -166,8 +173,8 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'"> <ClCompile> <CompileAsWinRT>false</CompileAsWinRT> - <PreprocessorDefinitions>PLATFORM_WINDOWS_STORE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <SDLCheck>false</SDLCheck> + <SDLCheck>true</SDLCheck> + <PreprocessorDefinitions>PLATFORM_WINDOWS_STORE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <DisableSpecificWarnings>4996</DisableSpecificWarnings> </ClCompile> <Link> @@ -179,9 +186,9 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> <CompileAsWinRT>false</CompileAsWinRT> - <PreprocessorDefinitions>PLATFORM_WINDOWS_STORE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <SDLCheck>false</SDLCheck> - <DisableSpecificWarnings>4996</DisableSpecificWarnings> + <SDLCheck>true</SDLCheck> + <PreprocessorDefinitions>PLATFORM_WINDOWS_STORE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <DisableSpecificWarnings>4996;4311;4312</DisableSpecificWarnings> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -192,9 +199,9 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> <CompileAsWinRT>false</CompileAsWinRT> - <PreprocessorDefinitions>PLATFORM_WINDOWS_STORE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <SDLCheck>false</SDLCheck> - <DisableSpecificWarnings>4996</DisableSpecificWarnings> + <SDLCheck>true</SDLCheck> + <PreprocessorDefinitions>PLATFORM_WINDOWS_STORE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <DisableSpecificWarnings>4996;4311;4312</DisableSpecificWarnings> </ClCompile> <Link> <SubSystem>Console</SubSystem> diff --git a/External/libtiff-4.0.3/build/UWP/LibTiff.vcxproj.filters b/External/libtiff-4.0.3/build/UWP/LibTiff.vcxproj.filters new file mode 100644 index 0000000..ea9b788 --- /dev/null +++ b/External/libtiff-4.0.3/build/UWP/LibTiff.vcxproj.filters @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <ClCompile Include="..\..\libtiff\tif_unix.c" /> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/External/libtiff-4.0.3/build/Windows/LibTiff-Debug.vgdbsettings b/External/libtiff-4.0.3/build/Win32/LibTiff-Debug.vgdbsettings index 3f5b24b..3f5b24b 100644 --- a/External/libtiff-4.0.3/build/Windows/LibTiff-Debug.vgdbsettings +++ b/External/libtiff-4.0.3/build/Win32/LibTiff-Debug.vgdbsettings diff --git a/External/libtiff-4.0.3/build/Windows/LibTiff-Release.vgdbsettings b/External/libtiff-4.0.3/build/Win32/LibTiff-Release.vgdbsettings index 669691f..669691f 100644 --- a/External/libtiff-4.0.3/build/Windows/LibTiff-Release.vgdbsettings +++ b/External/libtiff-4.0.3/build/Win32/LibTiff-Release.vgdbsettings diff --git a/External/libtiff-4.0.3/build/Windows/LibTiff.vcxproj b/External/libtiff-4.0.3/build/Win32/LibTiff.vcxproj index 44a308b..6744d00 100644 --- a/External/libtiff-4.0.3/build/Windows/LibTiff.vcxproj +++ b/External/libtiff-4.0.3/build/Win32/LibTiff.vcxproj @@ -312,25 +312,25 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\WindowsStore\LibTiff.Shared\LibTiff.Shared.vcxitems" Label="Shared" Condition="Exists('..\WindowsStore\LibTiff.Shared\LibTiff.Shared.vcxitems')" /> + <Import Project="..\Windows.Shared\LibTiff.Shared.vcxitems" Label="Shared" Condition="Exists('..\Windows.Shared\LibTiff.Shared.vcxitems')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="..\..\..\..\..\diligentcore\Shared\build\Windows\Win32d.props" /> - <Import Project="LibTiff.props" /> + <Import Project="..\Windows.Shared\LibTiff.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="..\..\..\..\..\diligentcore\Shared\build\Windows\Win32r.props" /> - <Import Project="LibTiff.props" /> + <Import Project="..\Windows.Shared\LibTiff.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <Import Project="..\..\..\..\..\diligentcore\Shared\build\Windows\Win64d.props" /> - <Import Project="LibTiff.props" /> + <Import Project="..\Windows.Shared\LibTiff.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <Import Project="..\..\..\..\..\diligentcore\Shared\build\Windows\Win64r.props" /> - <Import Project="LibTiff.props" /> + <Import Project="..\Windows.Shared\LibTiff.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> <Import Project="..\..\..\..\..\diligentcore\Shared\build\Windows\Android32d.props" /> @@ -342,7 +342,6 @@ <PropertyGroup /> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> - <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> <PreprocessorDefinitions>WIN32;PLATFORM_WINDOWS;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> @@ -353,7 +352,6 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <WarningLevel>Level3</WarningLevel> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> diff --git a/External/libtiff-4.0.3/build/Windows/LibTiff.vcxproj.filters b/External/libtiff-4.0.3/build/Win32/LibTiff.vcxproj.filters index b4a3ee8..b4a3ee8 100644 --- a/External/libtiff-4.0.3/build/Windows/LibTiff.vcxproj.filters +++ b/External/libtiff-4.0.3/build/Win32/LibTiff.vcxproj.filters diff --git a/External/libtiff-4.0.3/build/Windows/jni/Android.mk b/External/libtiff-4.0.3/build/Win32/jni/Android.mk index 9dfa012..9dfa012 100644 --- a/External/libtiff-4.0.3/build/Windows/jni/Android.mk +++ b/External/libtiff-4.0.3/build/Win32/jni/Android.mk diff --git a/External/libtiff-4.0.3/build/Windows/jni/Application.mk b/External/libtiff-4.0.3/build/Win32/jni/Application.mk index 123dcab..123dcab 100644 --- a/External/libtiff-4.0.3/build/Windows/jni/Application.mk +++ b/External/libtiff-4.0.3/build/Win32/jni/Application.mk diff --git a/External/libtiff-4.0.3/build/Windows.Shared/LibTiff.Shared.vcxitems b/External/libtiff-4.0.3/build/Windows.Shared/LibTiff.Shared.vcxitems new file mode 100644 index 0000000..14a4d9b --- /dev/null +++ b/External/libtiff-4.0.3/build/Windows.Shared/LibTiff.Shared.vcxitems @@ -0,0 +1,91 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup Label="Globals"> + <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects> + <HasSharedItems>true</HasSharedItems> + <ItemsProjectGuid>{0e12baa7-7b7d-406f-8374-075598833b2a}</ItemsProjectGuid> + <ItemsRootNamespace>LibTiff</ItemsRootNamespace> + <ItemsProjectName>LibTiff.Shared</ItemsProjectName> + <CodeSharingProject>248F659F-DAC5-46E8-AC09-60EC9FC95053</CodeSharingProject> + </PropertyGroup> + <ItemDefinitionGroup> + <ClCompile> + <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)</AdditionalIncludeDirectories> + </ClCompile> + </ItemDefinitionGroup> + <ItemGroup> + <ProjectCapability Include="SourceItemsFromImports" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\mkg3states.c"> + <ExcludedFromBuild>true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_aux.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_close.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_codec.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_color.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_compress.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_dir.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_dirinfo.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_dirread.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_dirwrite.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_dumpmode.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_error.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_extension.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_fax3.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_fax3sm.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_flush.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_getimage.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_jbig.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_jpeg.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_jpeg_12.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_luv.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_lzma.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_lzw.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_next.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_ojpeg.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_open.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_packbits.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_pixarlog.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_predict.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_print.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_read.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_stream.cxx" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_strip.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_swab.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_thunder.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_tile.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_version.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_warning.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_write.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_zip.c" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\libtiff\t4.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\libtiff\tiff.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\libtiff\tiffconf.android.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\libtiff\tiffconf.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\libtiff\tiffconf.vc.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\libtiff\tiffconf.wince.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\libtiff\tiffio.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\libtiff\tiffio.hxx" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\libtiff\tiffiop.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\libtiff\tiffvers.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_config.android.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_config.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_config.vc.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_config.wince.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_dir.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_fax3.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_predict.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\libtiff\uvcode.h" /> + </ItemGroup> + <ItemGroup> + <None Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_config.h-vms" /> + </ItemGroup> + <ItemGroup> + <Text Include="$(MSBuildThisFileDirectory)..\..\..\CMakeLists.txt"> + <DeploymentContent>false</DeploymentContent> + </Text> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/External/libtiff-4.0.3/build/Windows.Shared/LibTiff.Shared.vcxitems.filters b/External/libtiff-4.0.3/build/Windows.Shared/LibTiff.Shared.vcxitems.filters new file mode 100644 index 0000000..b90bfbe --- /dev/null +++ b/External/libtiff-4.0.3/build/Windows.Shared/LibTiff.Shared.vcxitems.filters @@ -0,0 +1,197 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="include"> + <UniqueIdentifier>{44e40e9c-de7c-47b8-a3bc-5951cd5a666a}</UniqueIdentifier> + </Filter> + <Filter Include="src"> + <UniqueIdentifier>{8d141b45-6d56-476d-b41b-77c14279f2d8}</UniqueIdentifier> + </Filter> + </ItemGroup> + <ItemGroup> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_compress.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_color.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_codec.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_close.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_aux.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\mkg3states.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_zip.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_write.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_warning.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_version.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_tile.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_thunder.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_swab.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_strip.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_stream.cxx"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_read.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_print.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_predict.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_pixarlog.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_packbits.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_open.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_ojpeg.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_next.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_lzw.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_lzma.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_luv.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_jpeg_12.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_jpeg.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_jbig.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_getimage.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_flush.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_fax3sm.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_fax3.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_extension.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_error.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_dumpmode.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_dirwrite.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_dirread.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_dirinfo.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_dir.c"> + <Filter>src</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\libtiff\tiffconf.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\libtiff\tiff.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_predict.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_fax3.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_dir.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_config.wince.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_config.vc.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_config.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\libtiff\t4.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\libtiff\uvcode.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\libtiff\tiffvers.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\libtiff\tiffiop.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\libtiff\tiffio.hxx"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\libtiff\tiffio.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\libtiff\tiffconf.wince.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\libtiff\tiffconf.vc.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_config.android.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\libtiff\tiffconf.android.h"> + <Filter>include</Filter> + </ClInclude> + </ItemGroup> + <ItemGroup> + <None Include="$(MSBuildThisFileDirectory)..\..\libtiff\tif_config.h-vms"> + <Filter>include</Filter> + </None> + </ItemGroup> + <ItemGroup> + <Text Include="$(MSBuildThisFileDirectory)..\..\..\CMakeLists.txt" /> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/External/libtiff-4.0.3/build/Windows/LibTiff.props b/External/libtiff-4.0.3/build/Windows.Shared/LibTiff.props index 8015e0f..4b485c0 100644 --- a/External/libtiff-4.0.3/build/Windows/LibTiff.props +++ b/External/libtiff-4.0.3/build/Windows.Shared/LibTiff.props @@ -7,6 +7,7 @@ <ClCompile> <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> </ClCompile> </ItemDefinitionGroup> <ItemGroup /> diff --git a/External/libtiff-4.0.3/build/WindowsStore/LibTiff.Shared/LibTiff.Shared.vcxitems b/External/libtiff-4.0.3/build/WindowsStore/LibTiff.Shared/LibTiff.Shared.vcxitems deleted file mode 100644 index 3e962cd..0000000 --- a/External/libtiff-4.0.3/build/WindowsStore/LibTiff.Shared/LibTiff.Shared.vcxitems +++ /dev/null @@ -1,86 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup Label="Globals"> - <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects> - <HasSharedItems>true</HasSharedItems> - <ItemsProjectGuid>{0e12baa7-7b7d-406f-8374-075598833b2a}</ItemsProjectGuid> - <ItemsRootNamespace>LibTiff</ItemsRootNamespace> - <ItemsProjectName>LibTiff.Shared</ItemsProjectName> - <CodeSharingProject>248F659F-DAC5-46E8-AC09-60EC9FC95053</CodeSharingProject> - </PropertyGroup> - <ItemDefinitionGroup> - <ClCompile> - <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)</AdditionalIncludeDirectories> - </ClCompile> - </ItemDefinitionGroup> - <ItemGroup> - <ProjectCapability Include="SourceItemsFromImports" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\mkg3states.c"> - <ExcludedFromBuild>true</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_aux.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_close.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_codec.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_color.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_compress.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_dir.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_dirinfo.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_dirread.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_dirwrite.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_dumpmode.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_error.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_extension.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_fax3.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_fax3sm.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_flush.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_getimage.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_jbig.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_jpeg.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_jpeg_12.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_luv.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_lzma.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_lzw.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_next.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_ojpeg.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_open.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_packbits.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_pixarlog.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_predict.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_print.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_read.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_stream.cxx" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_strip.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_swab.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_thunder.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_tile.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_version.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_warning.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_write.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_zip.c" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\t4.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tiff.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tiffconf.android.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tiffconf.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tiffconf.vc.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tiffconf.wince.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tiffio.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tiffio.hxx" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tiffiop.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tiffvers.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_config.android.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_config.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_config.vc.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_config.wince.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_dir.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_fax3.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_predict.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\uvcode.h" /> - </ItemGroup> - <ItemGroup> - <None Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_config.h-vms" /> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/External/libtiff-4.0.3/build/WindowsStore/LibTiff.Shared/LibTiff.Shared.vcxitems.filters b/External/libtiff-4.0.3/build/WindowsStore/LibTiff.Shared/LibTiff.Shared.vcxitems.filters deleted file mode 100644 index 852bb32..0000000 --- a/External/libtiff-4.0.3/build/WindowsStore/LibTiff.Shared/LibTiff.Shared.vcxitems.filters +++ /dev/null @@ -1,194 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="include"> - <UniqueIdentifier>{44e40e9c-de7c-47b8-a3bc-5951cd5a666a}</UniqueIdentifier> - </Filter> - <Filter Include="src"> - <UniqueIdentifier>{8d141b45-6d56-476d-b41b-77c14279f2d8}</UniqueIdentifier> - </Filter> - </ItemGroup> - <ItemGroup> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_compress.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_color.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_codec.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_close.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_aux.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\mkg3states.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_zip.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_write.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_warning.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_version.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_tile.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_thunder.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_swab.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_strip.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_stream.cxx"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_read.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_print.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_predict.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_pixarlog.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_packbits.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_open.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_ojpeg.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_next.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_lzw.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_lzma.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_luv.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_jpeg_12.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_jpeg.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_jbig.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_getimage.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_flush.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_fax3sm.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_fax3.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_extension.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_error.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_dumpmode.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_dirwrite.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_dirread.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_dirinfo.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_dir.c"> - <Filter>src</Filter> - </ClCompile> - </ItemGroup> - <ItemGroup> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tiffconf.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tiff.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_predict.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_fax3.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_dir.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_config.wince.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_config.vc.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_config.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\t4.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\uvcode.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tiffvers.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tiffiop.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tiffio.hxx"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tiffio.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tiffconf.wince.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tiffconf.vc.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_config.android.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tiffconf.android.h"> - <Filter>include</Filter> - </ClInclude> - </ItemGroup> - <ItemGroup> - <None Include="$(MSBuildThisFileDirectory)..\..\..\libtiff\tif_config.h-vms"> - <Filter>include</Filter> - </None> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/External/libtiff-4.0.3/build/WindowsStore/LibTiff.Windows/LibTiff.Windows.vcxproj.filters b/External/libtiff-4.0.3/build/WindowsStore/LibTiff.Windows/LibTiff.Windows.vcxproj.filters deleted file mode 100644 index ecd2222..0000000 --- a/External/libtiff-4.0.3/build/WindowsStore/LibTiff.Windows/LibTiff.Windows.vcxproj.filters +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="winrt_src"> - <UniqueIdentifier>{ea26bfa5-f43b-4ad2-bd0b-24fdad22ddab}</UniqueIdentifier> - </Filter> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\..\..\libtiff\tif_unix.c"> - <Filter>winrt_src</Filter> - </ClCompile> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/External/libtiff-4.0.3/build/WindowsStore/LibTiff.WindowsPhone/LibTiff.WindowsPhone.vcxproj b/External/libtiff-4.0.3/build/WindowsStore/LibTiff.WindowsPhone/LibTiff.WindowsPhone.vcxproj deleted file mode 100644 index 93221b2..0000000 --- a/External/libtiff-4.0.3/build/WindowsStore/LibTiff.WindowsPhone/LibTiff.WindowsPhone.vcxproj +++ /dev/null @@ -1,147 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|ARM"> - <Configuration>Debug</Configuration> - <Platform>ARM</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|ARM"> - <Configuration>Release</Configuration> - <Platform>ARM</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\..\..\libtiff\tif_unix.c" /> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{c589bb57-4e44-42e9-a77e-827f5e68eedb}</ProjectGuid> - <RootNamespace>LibTiff</RootNamespace> - <DefaultLanguage>en-US</DefaultLanguage> - <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion> - <AppContainerApplication>true</AppContainerApplication> - <ApplicationType>Windows Phone</ApplicationType> - <ApplicationTypeRevision>8.1</ApplicationTypeRevision> - <ConvergedProjectType>CodeSharingStaticLibrary</ConvergedProjectType> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v120_wp81</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v120_wp81</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120_wp81</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120_wp81</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="..\LibTiff.Shared\LibTiff.Shared.vcxitems" Label="Shared" /> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStore32Dbg.props" /> - <Import Project="..\..\Windows\LibTiff.props" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStore32Rel.props" /> - <Import Project="..\..\Windows\LibTiff.props" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStoreArmDbg.props" /> - <Import Project="..\..\Windows\LibTiff.props" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStoreArmRel.props" /> - <Import Project="..\..\Windows\LibTiff.props" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>false</SDLCheck> - <PreprocessorDefinitions>PLATFORM_WINDOWS_STORE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <DisableSpecificWarnings>4996</DisableSpecificWarnings> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> - <GenerateWindowsMetadata>false</GenerateWindowsMetadata> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>false</SDLCheck> - <PreprocessorDefinitions>PLATFORM_WINDOWS_STORE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <DisableSpecificWarnings>4996</DisableSpecificWarnings> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> - <GenerateWindowsMetadata>false</GenerateWindowsMetadata> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'"> - <ClCompile> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>false</SDLCheck> - <PreprocessorDefinitions>PLATFORM_WINDOWS_STORE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <DisableSpecificWarnings>4996</DisableSpecificWarnings> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> - <GenerateWindowsMetadata>false</GenerateWindowsMetadata> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'"> - <ClCompile> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>false</SDLCheck> - <PreprocessorDefinitions>PLATFORM_WINDOWS_STORE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <DisableSpecificWarnings>4996</DisableSpecificWarnings> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> - <GenerateWindowsMetadata>false</GenerateWindowsMetadata> - </Link> - </ItemDefinitionGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/External/libtiff-4.0.3/build/WindowsStore/LibTiff.WindowsPhone/LibTiff.WindowsPhone.vcxproj.filters b/External/libtiff-4.0.3/build/WindowsStore/LibTiff.WindowsPhone/LibTiff.WindowsPhone.vcxproj.filters deleted file mode 100644 index 7458feb..0000000 --- a/External/libtiff-4.0.3/build/WindowsStore/LibTiff.WindowsPhone/LibTiff.WindowsPhone.vcxproj.filters +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="winrt_src"> - <UniqueIdentifier>{5b011697-c139-4c28-af24-c20e91060fcf}</UniqueIdentifier> - </Filter> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\..\..\libtiff\tif_unix.c"> - <Filter>winrt_src</Filter> - </ClCompile> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/External/libtiff-4.0.3/libtiff/tif_config.h b/External/libtiff-4.0.3/libtiff/tif_config.h index d069607..8d039a1 100644 --- a/External/libtiff-4.0.3/libtiff/tif_config.h +++ b/External/libtiff-4.0.3/libtiff/tif_config.h @@ -1,4 +1,4 @@ -#if defined(PLATFORM_WINDOWS) || defined(PLATFORM_WINDOWS_STORE) +#if defined(PLATFORM_WIN32) || defined(PLATFORM_UNIVERSAL_WINDOWS) # include "tif_config.vc.h" diff --git a/External/libtiff-4.0.3/libtiff/tiffconf.h b/External/libtiff-4.0.3/libtiff/tiffconf.h index 0649d5e..cd026b2 100644 --- a/External/libtiff-4.0.3/libtiff/tiffconf.h +++ b/External/libtiff-4.0.3/libtiff/tiffconf.h @@ -1,4 +1,4 @@ -#if defined(PLATFORM_WINDOWS) || defined(PLATFORM_WINDOWS_STORE) +#if defined(PLATFORM_WIN32) || defined(PLATFORM_UNIVERSAL_WINDOWS) # include "tiffconf.vc.h" diff --git a/External/lpng-1.6.17/CMakeLists.txt b/External/lpng-1.6.17/CMakeLists.~txt index f062a23..f062a23 100644 --- a/External/lpng-1.6.17/CMakeLists.txt +++ b/External/lpng-1.6.17/CMakeLists.~txt diff --git a/External/lpng-1.6.17/build/WindowsStore/LibPng.Windows/LibPng.Windows.vcxproj b/External/lpng-1.6.17/build/UWP/LibPng.vcxproj index cc7d705..bf8e8ee 100644 --- a/External/lpng-1.6.17/build/WindowsStore/LibPng.Windows/LibPng.Windows.vcxproj +++ b/External/lpng-1.6.17/build/UWP/LibPng.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -27,111 +27,118 @@ </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> - <ProjectGuid>{f6f756f0-2704-4cb8-b2b2-56f09d0e23e8}</ProjectGuid> + <ProjectGuid>{fd9259e2-1645-46a7-aa26-3064fac7bbb5}</ProjectGuid> + <Keyword>StaticLibrary</Keyword> <RootNamespace>LibPng</RootNamespace> <DefaultLanguage>en-US</DefaultLanguage> - <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion> + <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion> <AppContainerApplication>true</AppContainerApplication> <ApplicationType>Windows Store</ApplicationType> - <ApplicationTypeRevision>8.1</ApplicationTypeRevision> - <ConvergedProjectType>CodeSharingStaticLibrary</ConvergedProjectType> + <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> + <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> + <ApplicationTypeRevision>10.0</ApplicationTypeRevision> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="..\LibPng.Shared\LibPng.Shared.vcxitems" Label="Shared" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + <Import Project="..\Windows.Shared\LibPng.Shared.vcxitems" Label="Shared" /> + </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStore32Dbg.props" /> - <Import Project="..\..\Windows\LibPng.props" /> + <Import Project="..\..\..\..\..\diligentcore\Shared\build\UWP\UWP_Win32Dbg.props" /> + <Import Project="..\Windows.Shared\LibPng.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStore32Rel.props" /> - <Import Project="..\..\Windows\LibPng.props" /> + <Import Project="..\..\..\..\..\diligentcore\Shared\build\UWP\UWP_Win32Rel.props" /> + <Import Project="..\Windows.Shared\LibPng.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStoreArmDbg.props" /> - <Import Project="..\..\Windows\LibPng.props" /> + <Import Project="..\..\..\..\..\diligentcore\Shared\build\UWP\UWP_ArmDbg.props" /> + <Import Project="..\Windows.Shared\LibPng.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStoreArmRel.props" /> - <Import Project="..\..\Windows\LibPng.props" /> + <Import Project="..\..\..\..\..\diligentcore\Shared\build\UWP\UWP_ArmRel.props" /> + <Import Project="..\Windows.Shared\LibPng.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStore64Dbg.props" /> - <Import Project="..\..\Windows\LibPng.props" /> + <Import Project="..\..\..\..\..\diligentcore\Shared\build\UWP\UWP_X64Dbg.props" /> + <Import Project="..\Windows.Shared\LibPng.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStore64Rel.props" /> - <Import Project="..\..\Windows\LibPng.props" /> + <Import Project="..\..\..\..\..\diligentcore\Shared\build\UWP\UWP_X64Rel.props" /> + <Import Project="..\Windows.Shared\LibPng.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> + <PropertyGroup /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <GenerateManifest>false</GenerateManifest> - <IncludePath>..\..\..\..\zlib-1.2.8;$(IncludePath)</IncludePath> + <IncludePath>..\..\..\zlib-1.2.8;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <GenerateManifest>false</GenerateManifest> - <IncludePath>..\..\..\..\zlib-1.2.8;$(IncludePath)</IncludePath> + <IncludePath>..\..\..\zlib-1.2.8;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> <GenerateManifest>false</GenerateManifest> - <IncludePath>..\..\..\..\zlib-1.2.8;$(IncludePath)</IncludePath> + <IncludePath>..\..\..\zlib-1.2.8;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> <GenerateManifest>false</GenerateManifest> - <IncludePath>..\..\..\..\zlib-1.2.8;$(IncludePath)</IncludePath> + <IncludePath>..\..\..\zlib-1.2.8;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <GenerateManifest>false</GenerateManifest> - <IncludePath>..\..\..\..\zlib-1.2.8;$(IncludePath)</IncludePath> + <IncludePath>..\..\..\zlib-1.2.8;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <GenerateManifest>false</GenerateManifest> - <IncludePath>..\..\..\..\zlib-1.2.8;$(IncludePath)</IncludePath> + <IncludePath>..\..\..\zlib-1.2.8;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <CompileAsWinRT>false</CompileAsWinRT> <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>PNG_ABORT=abort;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>PNG_ABORT=abort;_CRT_SECURE_NO_WARNINGS;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -143,7 +150,7 @@ <ClCompile> <CompileAsWinRT>false</CompileAsWinRT> <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>PNG_ABORT=abort;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>PNG_ABORT=abort;_CRT_SECURE_NO_WARNINGS;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -155,7 +162,7 @@ <ClCompile> <CompileAsWinRT>false</CompileAsWinRT> <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>PNG_ABORT=abort;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>PNG_ABORT=abort;_CRT_SECURE_NO_WARNINGS;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -167,7 +174,7 @@ <ClCompile> <CompileAsWinRT>false</CompileAsWinRT> <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>PNG_ABORT=abort;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>PNG_ABORT=abort;_CRT_SECURE_NO_WARNINGS;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -179,7 +186,7 @@ <ClCompile> <CompileAsWinRT>false</CompileAsWinRT> <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>PNG_ABORT=abort;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>PNG_ABORT=abort;_CRT_SECURE_NO_WARNINGS;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -191,7 +198,7 @@ <ClCompile> <CompileAsWinRT>false</CompileAsWinRT> <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>PNG_ABORT=abort;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>PNG_ABORT=abort;_CRT_SECURE_NO_WARNINGS;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> <SubSystem>Console</SubSystem> diff --git a/External/lpng-1.6.17/build/UWP/LibPng.vcxproj.filters b/External/lpng-1.6.17/build/UWP/LibPng.vcxproj.filters new file mode 100644 index 0000000..c31757e --- /dev/null +++ b/External/lpng-1.6.17/build/UWP/LibPng.vcxproj.filters @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />
\ No newline at end of file diff --git a/External/lpng-1.6.17/build/Windows/LibPng-Debug.vgdbsettings b/External/lpng-1.6.17/build/Win32/LibPng-Debug.vgdbsettings index 3f5b24b..3f5b24b 100644 --- a/External/lpng-1.6.17/build/Windows/LibPng-Debug.vgdbsettings +++ b/External/lpng-1.6.17/build/Win32/LibPng-Debug.vgdbsettings diff --git a/External/lpng-1.6.17/build/Windows/LibPng-Release.vgdbsettings b/External/lpng-1.6.17/build/Win32/LibPng-Release.vgdbsettings index 669691f..669691f 100644 --- a/External/lpng-1.6.17/build/Windows/LibPng-Release.vgdbsettings +++ b/External/lpng-1.6.17/build/Win32/LibPng-Release.vgdbsettings diff --git a/External/lpng-1.6.17/build/Windows/LibPng.vcxproj b/External/lpng-1.6.17/build/Win32/LibPng.vcxproj index d501707..bd1ec7b 100644 --- a/External/lpng-1.6.17/build/Windows/LibPng.vcxproj +++ b/External/lpng-1.6.17/build/Win32/LibPng.vcxproj @@ -164,27 +164,27 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\WindowsStore\LibPng.Shared\LibPng.Shared.vcxitems" Label="Shared" Condition="Exists('..\WindowsStore\LibPng.Shared\LibPng.Shared.vcxitems')" /> + <Import Project="..\Windows.Shared\LibPng.Shared.vcxitems" Label="Shared" Condition="Exists('..\Windows.Shared\LibPng.Shared.vcxitems')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="..\..\..\..\..\diligentcore\Shared\build\Windows\Win32d.props" /> - <Import Project="LibPng.props" /> + <Import Project="..\Windows.Shared\LibPng.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="..\..\..\..\..\diligentcore\Shared\build\Windows\Win64d.props" /> - <Import Project="LibPng.props" /> + <Import Project="..\Windows.Shared\LibPng.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="..\..\..\..\..\diligentcore\Shared\build\Windows\Win32r.props" /> - <Import Project="LibPng.props" /> + <Import Project="..\Windows.Shared\LibPng.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="..\..\..\..\..\diligentcore\Shared\build\Windows\Win64r.props" /> - <Import Project="LibPng.props" /> + <Import Project="..\Windows.Shared\LibPng.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> <Import Project="..\..\..\..\..\diligentcore\Shared\build\Windows\Android32d.props" /> diff --git a/External/lpng-1.6.17/build/Windows/LibPng.vcxproj.filters b/External/lpng-1.6.17/build/Win32/LibPng.vcxproj.filters index 6a847dd..6a847dd 100644 --- a/External/lpng-1.6.17/build/Windows/LibPng.vcxproj.filters +++ b/External/lpng-1.6.17/build/Win32/LibPng.vcxproj.filters diff --git a/External/lpng-1.6.17/build/Windows/jni/Android.mk b/External/lpng-1.6.17/build/Win32/jni/Android.mk index df2135c..df2135c 100644 --- a/External/lpng-1.6.17/build/Windows/jni/Android.mk +++ b/External/lpng-1.6.17/build/Win32/jni/Android.mk diff --git a/External/lpng-1.6.17/build/Windows/jni/Application.mk b/External/lpng-1.6.17/build/Win32/jni/Application.mk index c4ead58..c4ead58 100644 --- a/External/lpng-1.6.17/build/Windows/jni/Application.mk +++ b/External/lpng-1.6.17/build/Win32/jni/Application.mk diff --git a/External/lpng-1.6.17/build/Windows.Shared/LibPng.Shared.vcxitems b/External/lpng-1.6.17/build/Windows.Shared/LibPng.Shared.vcxitems new file mode 100644 index 0000000..083556e --- /dev/null +++ b/External/lpng-1.6.17/build/Windows.Shared/LibPng.Shared.vcxitems @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup Label="Globals"> + <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects> + <HasSharedItems>true</HasSharedItems> + <ItemsProjectGuid>{8c6b12d1-7972-451f-a612-e7ac3443cb72}</ItemsProjectGuid> + <ItemsRootNamespace>LibPng</ItemsRootNamespace> + <ItemsProjectName>LibPng.Shared</ItemsProjectName> + <CodeSharingProject>248F659F-DAC5-46E8-AC09-60EC9FC95053</CodeSharingProject> + </PropertyGroup> + <ItemDefinitionGroup> + <ClCompile> + <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)</AdditionalIncludeDirectories> + </ClCompile> + </ItemDefinitionGroup> + <ItemGroup> + <ProjectCapability Include="SourceItemsFromImports" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\png.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\pngconf.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\pngdebug.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\pnginfo.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\pngpriv.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\pngstruct.h" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\png.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\pngerror.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\pngget.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\pngmem.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\pngpread.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\pngread.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\pngrio.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\pngrtran.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\pngrutil.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\pngset.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\pngtrans.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\pngwio.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\pngwrite.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\pngwtran.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\pngwutil.c" /> + </ItemGroup> + <ItemGroup> + <Text Include="$(MSBuildThisFileDirectory)..\..\CMakeLists.txt"> + <DeploymentContent>false</DeploymentContent> + </Text> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/External/lpng-1.6.17/build/Windows.Shared/LibPng.Shared.vcxitems.filters b/External/lpng-1.6.17/build/Windows.Shared/LibPng.Shared.vcxitems.filters new file mode 100644 index 0000000..0825b7e --- /dev/null +++ b/External/lpng-1.6.17/build/Windows.Shared/LibPng.Shared.vcxitems.filters @@ -0,0 +1,81 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="include"> + <UniqueIdentifier>{8e647e23-9c6d-44c8-9527-3e071791bafb}</UniqueIdentifier> + </Filter> + <Filter Include="src"> + <UniqueIdentifier>{5d91d619-2cdd-4ed7-9612-c13527904de5}</UniqueIdentifier> + </Filter> + </ItemGroup> + <ItemGroup> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\png.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\pngconf.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\pngdebug.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\pnginfo.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\pngpriv.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\pngstruct.h"> + <Filter>include</Filter> + </ClInclude> + </ItemGroup> + <ItemGroup> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\png.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\pngerror.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\pngget.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\pngmem.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\pngpread.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\pngread.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\pngrio.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\pngrtran.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\pngrutil.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\pngset.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\pngtrans.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\pngwio.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\pngwrite.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\pngwtran.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\pngwutil.c"> + <Filter>src</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <Text Include="$(MSBuildThisFileDirectory)..\..\CMakeLists.txt" /> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/External/lpng-1.6.17/build/Windows/LibPng.props b/External/lpng-1.6.17/build/Windows.Shared/LibPng.props index a1303fa..a1303fa 100644 --- a/External/lpng-1.6.17/build/Windows/LibPng.props +++ b/External/lpng-1.6.17/build/Windows.Shared/LibPng.props diff --git a/External/lpng-1.6.17/build/WindowsStore/LibPng.Shared/LibPng.Shared.vcxitems b/External/lpng-1.6.17/build/WindowsStore/LibPng.Shared/LibPng.Shared.vcxitems deleted file mode 100644 index 30717f3..0000000 --- a/External/lpng-1.6.17/build/WindowsStore/LibPng.Shared/LibPng.Shared.vcxitems +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup Label="Globals"> - <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects> - <HasSharedItems>true</HasSharedItems> - <ItemsProjectGuid>{8c6b12d1-7972-451f-a612-e7ac3443cb72}</ItemsProjectGuid> - <ItemsRootNamespace>LibPng</ItemsRootNamespace> - <ItemsProjectName>LibPng.Shared</ItemsProjectName> - <CodeSharingProject>248F659F-DAC5-46E8-AC09-60EC9FC95053</CodeSharingProject> - </PropertyGroup> - <ItemDefinitionGroup> - <ClCompile> - <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)</AdditionalIncludeDirectories> - </ClCompile> - </ItemDefinitionGroup> - <ItemGroup> - <ProjectCapability Include="SourceItemsFromImports" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\png.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\pngconf.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\pngdebug.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\pnginfo.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\pngpriv.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\pngstruct.h" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\png.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\pngerror.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\pngget.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\pngmem.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\pngpread.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\pngread.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\pngrio.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\pngrtran.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\pngrutil.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\pngset.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\pngtrans.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\pngwio.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\pngwrite.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\pngwtran.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\pngwutil.c" /> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/External/lpng-1.6.17/build/WindowsStore/LibPng.Shared/LibPng.Shared.vcxitems.filters b/External/lpng-1.6.17/build/WindowsStore/LibPng.Shared/LibPng.Shared.vcxitems.filters deleted file mode 100644 index 7022e9c..0000000 --- a/External/lpng-1.6.17/build/WindowsStore/LibPng.Shared/LibPng.Shared.vcxitems.filters +++ /dev/null @@ -1,78 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="include"> - <UniqueIdentifier>{8e647e23-9c6d-44c8-9527-3e071791bafb}</UniqueIdentifier> - </Filter> - <Filter Include="src"> - <UniqueIdentifier>{5d91d619-2cdd-4ed7-9612-c13527904de5}</UniqueIdentifier> - </Filter> - </ItemGroup> - <ItemGroup> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\png.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\pngconf.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\pngdebug.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\pnginfo.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\pngpriv.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\pngstruct.h"> - <Filter>include</Filter> - </ClInclude> - </ItemGroup> - <ItemGroup> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\png.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\pngerror.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\pngget.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\pngmem.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\pngpread.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\pngread.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\pngrio.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\pngrtran.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\pngrutil.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\pngset.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\pngtrans.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\pngwio.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\pngwrite.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\pngwtran.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\pngwutil.c"> - <Filter>src</Filter> - </ClCompile> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/External/lpng-1.6.17/build/WindowsStore/LibPng.Windows/LibPng.Windows.vcxproj.filters b/External/lpng-1.6.17/build/WindowsStore/LibPng.Windows/LibPng.Windows.vcxproj.filters deleted file mode 100644 index a7761ab..0000000 --- a/External/lpng-1.6.17/build/WindowsStore/LibPng.Windows/LibPng.Windows.vcxproj.filters +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - </ItemGroup> -</Project> diff --git a/External/lpng-1.6.17/build/WindowsStore/LibPng.WindowsPhone/LibPng.WindowsPhone.vcxproj b/External/lpng-1.6.17/build/WindowsStore/LibPng.WindowsPhone/LibPng.WindowsPhone.vcxproj deleted file mode 100644 index 0b76867..0000000 --- a/External/lpng-1.6.17/build/WindowsStore/LibPng.WindowsPhone/LibPng.WindowsPhone.vcxproj +++ /dev/null @@ -1,144 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|ARM"> - <Configuration>Debug</Configuration> - <Platform>ARM</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|ARM"> - <Configuration>Release</Configuration> - <Platform>ARM</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{adf2ffd9-7dd1-49d7-b79c-f7c8f21efa3a}</ProjectGuid> - <RootNamespace>LibPng</RootNamespace> - <DefaultLanguage>en-US</DefaultLanguage> - <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion> - <AppContainerApplication>true</AppContainerApplication> - <ApplicationType>Windows Phone</ApplicationType> - <ApplicationTypeRevision>8.1</ApplicationTypeRevision> - <ConvergedProjectType>CodeSharingStaticLibrary</ConvergedProjectType> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v120_wp81</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v120_wp81</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120_wp81</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120_wp81</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="..\LibPng.Shared\LibPng.Shared.vcxitems" Label="Shared" /> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStore32Dbg.props" /> - <Import Project="..\..\Windows\LibPng.props" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStore32Rel.props" /> - <Import Project="..\..\Windows\LibPng.props" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStoreArmDbg.props" /> - <Import Project="..\..\Windows\LibPng.props" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStoreArmRel.props" /> - <Import Project="..\..\Windows\LibPng.props" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <GenerateManifest>false</GenerateManifest> - <IncludePath>..\..\..\..\zlib-1.2.8;$(IncludePath)</IncludePath> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <GenerateManifest>false</GenerateManifest> - <IncludePath>..\..\..\..\zlib-1.2.8;$(IncludePath)</IncludePath> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> - <GenerateManifest>false</GenerateManifest> - <IncludePath>..\..\..\..\zlib-1.2.8;$(IncludePath)</IncludePath> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> - <GenerateManifest>false</GenerateManifest> - <IncludePath>..\..\..\..\zlib-1.2.8;$(IncludePath)</IncludePath> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>PNG_ABORT=abort;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> - <GenerateWindowsMetadata>false</GenerateWindowsMetadata> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>PNG_ABORT=abort;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> - <GenerateWindowsMetadata>false</GenerateWindowsMetadata> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'"> - <ClCompile> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>PNG_ABORT=abort;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> - <GenerateWindowsMetadata>false</GenerateWindowsMetadata> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'"> - <ClCompile> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>PNG_ABORT=abort;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> - <GenerateWindowsMetadata>false</GenerateWindowsMetadata> - </Link> - </ItemDefinitionGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/External/lpng-1.6.17/build/WindowsStore/LibPng.WindowsPhone/LibPng.WindowsPhone.vcxproj.filters b/External/lpng-1.6.17/build/WindowsStore/LibPng.WindowsPhone/LibPng.WindowsPhone.vcxproj.filters deleted file mode 100644 index a7761ab..0000000 --- a/External/lpng-1.6.17/build/WindowsStore/LibPng.WindowsPhone/LibPng.WindowsPhone.vcxproj.filters +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - </ItemGroup> -</Project> diff --git a/External/lua-5.2.3/build/WindowsStore/Lua.Windows/Lua.Windows.vcxproj b/External/lua-5.2.3/build/UWP/Lua.vcxproj index a88c87e..5c2e3ad 100644 --- a/External/lua-5.2.3/build/WindowsStore/Lua.Windows/Lua.Windows.vcxproj +++ b/External/lua-5.2.3/build/UWP/Lua.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -27,76 +27,83 @@ </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> - <ProjectGuid>{5110a62b-172f-48fe-a268-4931577d9aad}</ProjectGuid> + <ProjectGuid>{25ec9b99-84dc-488b-b175-7888a6fda6a2}</ProjectGuid> + <Keyword>StaticLibrary</Keyword> <RootNamespace>Lua</RootNamespace> <DefaultLanguage>en-US</DefaultLanguage> - <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion> + <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion> <AppContainerApplication>true</AppContainerApplication> <ApplicationType>Windows Store</ApplicationType> - <ApplicationTypeRevision>8.1</ApplicationTypeRevision> - <ConvergedProjectType>CodeSharingStaticLibrary</ConvergedProjectType> + <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> + <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> + <ApplicationTypeRevision>10.0</ApplicationTypeRevision> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="..\Lua.Shared\Lua.Shared.vcxitems" Label="Shared" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + <Import Project="..\Windows.Shared\Lua.Shared.vcxitems" Label="Shared" /> + </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStore32Dbg.props" /> + <Import Project="..\..\..\..\..\diligentcore\Shared\build\UWP\UWP_Win32Dbg.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStore32Rel.props" /> + <Import Project="..\..\..\..\..\diligentcore\Shared\build\UWP\UWP_Win32Rel.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStoreArmDbg.props" /> + <Import Project="..\..\..\..\..\diligentcore\Shared\build\UWP\UWP_ArmDbg.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStoreArmRel.props" /> + <Import Project="..\..\..\..\..\diligentcore\Shared\build\UWP\UWP_ArmRel.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStore64Dbg.props" /> + <Import Project="..\..\..\..\..\diligentcore\Shared\build\UWP\UWP_X64Dbg.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStore64Rel.props" /> + <Import Project="..\..\..\..\..\diligentcore\Shared\build\UWP\UWP_X64Rel.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> + <PropertyGroup /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <GenerateManifest>false</GenerateManifest> </PropertyGroup> @@ -117,11 +124,11 @@ </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> - <PrecompiledHeader>NotUsing</PrecompiledHeader> <CompileAsWinRT>false</CompileAsWinRT> <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>_WINDOWS_APP;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PrecompiledHeader>NotUsing</PrecompiledHeader> <CompileAs>CompileAsCpp</CompileAs> + <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -131,11 +138,11 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <PrecompiledHeader>NotUsing</PrecompiledHeader> <CompileAsWinRT>false</CompileAsWinRT> <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>_WINDOWS_APP;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PrecompiledHeader>NotUsing</PrecompiledHeader> <CompileAs>CompileAsCpp</CompileAs> + <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -145,11 +152,11 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'"> <ClCompile> - <PrecompiledHeader>NotUsing</PrecompiledHeader> <CompileAsWinRT>false</CompileAsWinRT> <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>_WINDOWS_APP;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PrecompiledHeader>NotUsing</PrecompiledHeader> <CompileAs>CompileAsCpp</CompileAs> + <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -159,11 +166,11 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'"> <ClCompile> - <PrecompiledHeader>NotUsing</PrecompiledHeader> <CompileAsWinRT>false</CompileAsWinRT> <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>_WINDOWS_APP;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PrecompiledHeader>NotUsing</PrecompiledHeader> <CompileAs>CompileAsCpp</CompileAs> + <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -173,11 +180,12 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> - <PrecompiledHeader>NotUsing</PrecompiledHeader> <CompileAsWinRT>false</CompileAsWinRT> <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>_WINDOWS_APP;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PrecompiledHeader>NotUsing</PrecompiledHeader> <CompileAs>CompileAsCpp</CompileAs> + <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <DisableSpecificWarnings>4334</DisableSpecificWarnings> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -187,11 +195,12 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> - <PrecompiledHeader>NotUsing</PrecompiledHeader> <CompileAsWinRT>false</CompileAsWinRT> <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>_WINDOWS_APP;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PrecompiledHeader>NotUsing</PrecompiledHeader> <CompileAs>CompileAsCpp</CompileAs> + <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <DisableSpecificWarnings>4334</DisableSpecificWarnings> </ClCompile> <Link> <SubSystem>Console</SubSystem> diff --git a/External/lua-5.2.3/build/UWP/Lua.vcxproj.filters b/External/lua-5.2.3/build/UWP/Lua.vcxproj.filters new file mode 100644 index 0000000..c31757e --- /dev/null +++ b/External/lua-5.2.3/build/UWP/Lua.vcxproj.filters @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />
\ No newline at end of file diff --git a/External/lua-5.2.3/build/Windows/Lua-Debug.vgdbsettings b/External/lua-5.2.3/build/Win32/Lua-Debug.vgdbsettings index 3f5b24b..3f5b24b 100644 --- a/External/lua-5.2.3/build/Windows/Lua-Debug.vgdbsettings +++ b/External/lua-5.2.3/build/Win32/Lua-Debug.vgdbsettings diff --git a/External/lua-5.2.3/build/Windows/Lua-Release.vgdbsettings b/External/lua-5.2.3/build/Win32/Lua-Release.vgdbsettings index 669691f..669691f 100644 --- a/External/lua-5.2.3/build/Windows/Lua-Release.vgdbsettings +++ b/External/lua-5.2.3/build/Win32/Lua-Release.vgdbsettings diff --git a/External/lua-5.2.3/build/Windows/Lua.vcxproj b/External/lua-5.2.3/build/Win32/Lua.vcxproj index 67ff315..50ce1b8 100644 --- a/External/lua-5.2.3/build/Windows/Lua.vcxproj +++ b/External/lua-5.2.3/build/Win32/Lua.vcxproj @@ -67,7 +67,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\WindowsStore\Lua.Shared\Lua.Shared.vcxitems" Label="Shared" Condition="Exists('..\WindowsStore\Lua.Shared\Lua.Shared.vcxitems')" /> + <Import Project="..\Windows.Shared\Lua.Shared.vcxitems" Label="Shared" Condition="Exists('..\Windows.Shared\Lua.Shared.vcxitems')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -125,6 +125,7 @@ <CompileAs>CompileAsCpp</CompileAs> <PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeaderFile /> + <DisableSpecificWarnings>4100;4505;4334</DisableSpecificWarnings> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -159,6 +160,7 @@ <CompileAs>CompileAsCpp</CompileAs> <PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeaderFile /> + <DisableSpecificWarnings>4100;4505;4334</DisableSpecificWarnings> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> diff --git a/External/lua-5.2.3/build/Windows/Lua.vcxproj.filters b/External/lua-5.2.3/build/Win32/Lua.vcxproj.filters index 7995534..7995534 100644 --- a/External/lua-5.2.3/build/Windows/Lua.vcxproj.filters +++ b/External/lua-5.2.3/build/Win32/Lua.vcxproj.filters diff --git a/External/lua-5.2.3/build/Windows/jni/Android.mk b/External/lua-5.2.3/build/Win32/jni/Android.mk index e37ae2b..e37ae2b 100644 --- a/External/lua-5.2.3/build/Windows/jni/Android.mk +++ b/External/lua-5.2.3/build/Win32/jni/Android.mk diff --git a/External/lua-5.2.3/build/Windows/jni/Application.mk b/External/lua-5.2.3/build/Win32/jni/Application.mk index 40e89bb..40e89bb 100644 --- a/External/lua-5.2.3/build/Windows/jni/Application.mk +++ b/External/lua-5.2.3/build/Win32/jni/Application.mk diff --git a/External/lua-5.2.3/build/Windows.Shared/Lua.Shared.vcxitems b/External/lua-5.2.3/build/Windows.Shared/Lua.Shared.vcxitems new file mode 100644 index 0000000..893301e --- /dev/null +++ b/External/lua-5.2.3/build/Windows.Shared/Lua.Shared.vcxitems @@ -0,0 +1,85 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup Label="Globals"> + <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects> + <HasSharedItems>true</HasSharedItems> + <ItemsProjectGuid>{4703c34c-1a7f-4bb2-8ff8-007c55c015d5}</ItemsProjectGuid> + <ItemsRootNamespace>Lua</ItemsRootNamespace> + <ItemsProjectName>Lua.Shared</ItemsProjectName> + <CodeSharingProject>248F659F-DAC5-46E8-AC09-60EC9FC95053</CodeSharingProject> + </PropertyGroup> + <ItemDefinitionGroup> + <ClCompile> + <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)</AdditionalIncludeDirectories> + </ClCompile> + </ItemDefinitionGroup> + <ItemGroup> + <ProjectCapability Include="SourceItemsFromImports" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lapi.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lauxlib.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lbaselib.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lbitlib.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lcode.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lcorolib.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lctype.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\ldblib.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\ldebug.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\ldo.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\ldump.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lfunc.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lgc.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\linit.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\liolib.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\llex.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lmathlib.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lmem.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\loadlib.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lobject.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lopcodes.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\loslib.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lparser.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lstate.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lstring.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lstrlib.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\ltable.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\ltablib.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\ltm.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lundump.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lvm.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lzio.c" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lapi.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lauxlib.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lcode.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lctype.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\ldebug.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\ldo.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lfunc.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lgc.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\llex.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\llimits.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lmem.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lobject.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lopcodes.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lparser.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lstate.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lstring.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\ltable.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\ltm.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lua.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lua.hpp" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\luaconf.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lualib.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lundump.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lvm.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\winappstubs.h" /> + </ItemGroup> + <ItemGroup> + <Text Include="$(MSBuildThisFileDirectory)..\..\CMakeLists.txt"> + <DeploymentContent>false</DeploymentContent> + </Text> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/External/lua-5.2.3/build/Windows.Shared/Lua.Shared.vcxitems.filters b/External/lua-5.2.3/build/Windows.Shared/Lua.Shared.vcxitems.filters new file mode 100644 index 0000000..c637b23 --- /dev/null +++ b/External/lua-5.2.3/build/Windows.Shared/Lua.Shared.vcxitems.filters @@ -0,0 +1,189 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="include"> + <UniqueIdentifier>{49cb749b-a0fb-4a8c-ae92-c64623bcc2ab}</UniqueIdentifier> + </Filter> + <Filter Include="src"> + <UniqueIdentifier>{914d194a-480c-4f8d-a190-bd036d9622e9}</UniqueIdentifier> + </Filter> + </ItemGroup> + <ItemGroup> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lundump.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lvm.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lzio.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\ltm.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lstring.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lstrlib.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\ltable.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\ltablib.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lopcodes.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\loslib.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lparser.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lstate.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lmathlib.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lmem.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\loadlib.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lobject.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lgc.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\linit.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\liolib.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\llex.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\ldebug.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\ldo.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\ldump.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lfunc.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\ldblib.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lctype.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lcorolib.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lcode.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lbitlib.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lapi.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lauxlib.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lbaselib.c"> + <Filter>src</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lcode.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lapi.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lauxlib.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\luaconf.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lualib.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lundump.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lvm.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\ltm.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lua.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lua.hpp"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lstate.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lstring.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\ltable.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lopcodes.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lparser.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lmem.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lobject.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lgc.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\llex.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\llimits.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\ldebug.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\ldo.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lfunc.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lctype.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\winappstubs.h"> + <Filter>include</Filter> + </ClInclude> + </ItemGroup> + <ItemGroup> + <Text Include="$(MSBuildThisFileDirectory)..\..\CMakeLists.txt" /> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/External/lua-5.2.3/build/WindowsStore/Lua.Shared/Lua.Shared.vcxitems b/External/lua-5.2.3/build/WindowsStore/Lua.Shared/Lua.Shared.vcxitems deleted file mode 100644 index fba2720..0000000 --- a/External/lua-5.2.3/build/WindowsStore/Lua.Shared/Lua.Shared.vcxitems +++ /dev/null @@ -1,80 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup Label="Globals"> - <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects> - <HasSharedItems>true</HasSharedItems> - <ItemsProjectGuid>{4703c34c-1a7f-4bb2-8ff8-007c55c015d5}</ItemsProjectGuid> - <ItemsRootNamespace>Lua</ItemsRootNamespace> - <ItemsProjectName>Lua.Shared</ItemsProjectName> - <CodeSharingProject>248F659F-DAC5-46E8-AC09-60EC9FC95053</CodeSharingProject> - </PropertyGroup> - <ItemDefinitionGroup> - <ClCompile> - <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)</AdditionalIncludeDirectories> - </ClCompile> - </ItemDefinitionGroup> - <ItemGroup> - <ProjectCapability Include="SourceItemsFromImports" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lapi.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lauxlib.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lbaselib.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lbitlib.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lcode.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lcorolib.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lctype.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\ldblib.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\ldebug.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\ldo.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\ldump.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lfunc.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lgc.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\linit.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\liolib.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\llex.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lmathlib.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lmem.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\loadlib.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lobject.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lopcodes.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\loslib.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lparser.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lstate.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lstring.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lstrlib.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\ltable.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\ltablib.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\ltm.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lundump.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lvm.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lzio.c" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lapi.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lauxlib.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lcode.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lctype.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\ldebug.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\ldo.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lfunc.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lgc.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\llex.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\llimits.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lmem.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lobject.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lopcodes.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lparser.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lstate.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lstring.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\ltable.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\ltm.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lua.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lua.hpp" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\luaconf.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lualib.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lundump.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lvm.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\winappstubs.h" /> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/External/lua-5.2.3/build/WindowsStore/Lua.Shared/Lua.Shared.vcxitems.filters b/External/lua-5.2.3/build/WindowsStore/Lua.Shared/Lua.Shared.vcxitems.filters deleted file mode 100644 index 27d88a9..0000000 --- a/External/lua-5.2.3/build/WindowsStore/Lua.Shared/Lua.Shared.vcxitems.filters +++ /dev/null @@ -1,186 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="include"> - <UniqueIdentifier>{49cb749b-a0fb-4a8c-ae92-c64623bcc2ab}</UniqueIdentifier> - </Filter> - <Filter Include="src"> - <UniqueIdentifier>{914d194a-480c-4f8d-a190-bd036d9622e9}</UniqueIdentifier> - </Filter> - </ItemGroup> - <ItemGroup> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lundump.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lvm.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lzio.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\ltm.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lstring.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lstrlib.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\ltable.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\ltablib.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lopcodes.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\loslib.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lparser.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lstate.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lmathlib.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lmem.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\loadlib.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lobject.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lgc.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\linit.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\liolib.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\llex.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\ldebug.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\ldo.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\ldump.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lfunc.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\ldblib.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lctype.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lcorolib.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lcode.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lbitlib.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lapi.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lauxlib.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lbaselib.c"> - <Filter>src</Filter> - </ClCompile> - </ItemGroup> - <ItemGroup> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lcode.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lapi.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lauxlib.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\luaconf.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lualib.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lundump.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lvm.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\ltm.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lua.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lua.hpp"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lstate.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lstring.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\ltable.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lopcodes.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lparser.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lmem.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lobject.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lgc.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\llex.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\llimits.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\ldebug.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\ldo.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lfunc.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lctype.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\winappstubs.h"> - <Filter>include</Filter> - </ClInclude> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/External/lua-5.2.3/build/WindowsStore/Lua.Windows/Lua.Windows.vcxproj.filters b/External/lua-5.2.3/build/WindowsStore/Lua.Windows/Lua.Windows.vcxproj.filters deleted file mode 100644 index a7761ab..0000000 --- a/External/lua-5.2.3/build/WindowsStore/Lua.Windows/Lua.Windows.vcxproj.filters +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - </ItemGroup> -</Project> diff --git a/External/lua-5.2.3/build/WindowsStore/Lua.WindowsPhone/Lua.WindowsPhone.vcxproj b/External/lua-5.2.3/build/WindowsStore/Lua.WindowsPhone/Lua.WindowsPhone.vcxproj deleted file mode 100644 index ec044d3..0000000 --- a/External/lua-5.2.3/build/WindowsStore/Lua.WindowsPhone/Lua.WindowsPhone.vcxproj +++ /dev/null @@ -1,144 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|ARM"> - <Configuration>Debug</Configuration> - <Platform>ARM</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|ARM"> - <Configuration>Release</Configuration> - <Platform>ARM</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{6536c1f5-4ea4-49a3-92f1-810c4750bf10}</ProjectGuid> - <RootNamespace>Lua</RootNamespace> - <DefaultLanguage>en-US</DefaultLanguage> - <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion> - <AppContainerApplication>true</AppContainerApplication> - <ApplicationType>Windows Phone</ApplicationType> - <ApplicationTypeRevision>8.1</ApplicationTypeRevision> - <ConvergedProjectType>CodeSharingStaticLibrary</ConvergedProjectType> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v120_wp81</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v120_wp81</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120_wp81</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120_wp81</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="..\Lua.Shared\Lua.Shared.vcxitems" Label="Shared" /> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStore32Dbg.props" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStore32Rel.props" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStoreArmDbg.props" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStoreArmRel.props" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <PrecompiledHeader>NotUsing</PrecompiledHeader> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>_WINDOWS_APP;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <CompileAs>CompileAsCpp</CompileAs> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> - <GenerateWindowsMetadata>false</GenerateWindowsMetadata> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <PrecompiledHeader>NotUsing</PrecompiledHeader> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>_WINDOWS_APP;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <CompileAs>CompileAsCpp</CompileAs> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> - <GenerateWindowsMetadata>false</GenerateWindowsMetadata> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'"> - <ClCompile> - <PrecompiledHeader>NotUsing</PrecompiledHeader> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>_WINDOWS_APP;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <CompileAs>CompileAsCpp</CompileAs> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> - <GenerateWindowsMetadata>false</GenerateWindowsMetadata> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'"> - <ClCompile> - <PrecompiledHeader>NotUsing</PrecompiledHeader> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>_WINDOWS_APP;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <CompileAs>CompileAsCpp</CompileAs> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> - <GenerateWindowsMetadata>false</GenerateWindowsMetadata> - </Link> - </ItemDefinitionGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/External/lua-5.2.3/build/WindowsStore/Lua.WindowsPhone/Lua.WindowsPhone.vcxproj.filters b/External/lua-5.2.3/build/WindowsStore/Lua.WindowsPhone/Lua.WindowsPhone.vcxproj.filters deleted file mode 100644 index a7761ab..0000000 --- a/External/lua-5.2.3/build/WindowsStore/Lua.WindowsPhone/Lua.WindowsPhone.vcxproj.filters +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - </ItemGroup> -</Project> diff --git a/External/lua-5.2.3/src/luaconf.h b/External/lua-5.2.3/src/luaconf.h index 73bac22..19989bf 100644 --- a/External/lua-5.2.3/src/luaconf.h +++ b/External/lua-5.2.3/src/luaconf.h @@ -549,7 +549,7 @@ # define getlocaledecpoint() '.' #endif -#ifdef _WINDOWS_STORE +#ifdef PLATFORM_UNIVERSAL_WINDOWS # include "winappstubs.h" #endif diff --git a/External/zlib-1.2.8/CMakeLists.txt b/External/zlib-1.2.8/CMakeLists.~txt index 0c0247c..d5c5942 100644 --- a/External/zlib-1.2.8/CMakeLists.txt +++ b/External/zlib-1.2.8/CMakeLists.~txt @@ -183,8 +183,13 @@ if(MINGW) set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj) endif(MINGW) -add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) + + + return() # Delete this line to generate dynamic library and example binaries + + +add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL) set_target_properties(zlib PROPERTIES SOVERSION 1) diff --git a/External/zlib-1.2.8/build/WindowsStore/zlib.Windows/zlib.Windows.vcxproj b/External/zlib-1.2.8/build/UWP/zlib.vcxproj index 1f487b1..e54bfc7 100644 --- a/External/zlib-1.2.8/build/WindowsStore/zlib.Windows/zlib.Windows.vcxproj +++ b/External/zlib-1.2.8/build/UWP/zlib.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -27,82 +27,89 @@ </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> - <ProjectGuid>{e9b3069f-ca6c-4c5c-91b6-df112c5b290e}</ProjectGuid> + <ProjectGuid>{e1220c25-285f-4d0f-a2b3-3871a37cd904}</ProjectGuid> + <Keyword>StaticLibrary</Keyword> <RootNamespace>zlib</RootNamespace> <DefaultLanguage>en-US</DefaultLanguage> - <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion> + <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion> <AppContainerApplication>true</AppContainerApplication> <ApplicationType>Windows Store</ApplicationType> - <ApplicationTypeRevision>8.1</ApplicationTypeRevision> - <ConvergedProjectType>CodeSharingStaticLibrary</ConvergedProjectType> + <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> + <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion> + <ApplicationTypeRevision>10.0</ApplicationTypeRevision> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="..\zlib.Shared\zlib.Shared.vcxitems" Label="Shared" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + <Import Project="..\Windows.Shared\zlib.Shared.vcxitems" Label="Shared" /> + </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStore32Dbg.props" /> - <Import Project="..\..\Windows\zlib.props" /> + <Import Project="..\..\..\..\..\diligentcore\Shared\build\UWP\UWP_Win32Dbg.props" /> + <Import Project="..\Windows.Shared\zlib.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStore32Rel.props" /> - <Import Project="..\..\Windows\zlib.props" /> + <Import Project="..\..\..\..\..\diligentcore\Shared\build\UWP\UWP_Win32Rel.props" /> + <Import Project="..\Windows.Shared\zlib.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStoreArmDbg.props" /> - <Import Project="..\..\Windows\zlib.props" /> + <Import Project="..\..\..\..\..\diligentcore\Shared\build\UWP\UWP_ArmDbg.props" /> + <Import Project="..\Windows.Shared\zlib.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStoreArmRel.props" /> - <Import Project="..\..\Windows\zlib.props" /> + <Import Project="..\..\..\..\..\diligentcore\Shared\build\UWP\UWP_ArmRel.props" /> + <Import Project="..\Windows.Shared\zlib.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStore64Dbg.props" /> - <Import Project="..\..\Windows\zlib.props" /> + <Import Project="..\..\..\..\..\diligentcore\Shared\build\UWP\UWP_X64Dbg.props" /> + <Import Project="..\Windows.Shared\zlib.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStore64Rel.props" /> - <Import Project="..\..\Windows\zlib.props" /> + <Import Project="..\..\..\..\..\diligentcore\Shared\build\UWP\UWP_X64Rel.props" /> + <Import Project="..\Windows.Shared\zlib.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> + <PropertyGroup /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <GenerateManifest>false</GenerateManifest> </PropertyGroup> diff --git a/External/zlib-1.2.8/build/UWP/zlib.vcxproj.filters b/External/zlib-1.2.8/build/UWP/zlib.vcxproj.filters new file mode 100644 index 0000000..c31757e --- /dev/null +++ b/External/zlib-1.2.8/build/UWP/zlib.vcxproj.filters @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />
\ No newline at end of file diff --git a/External/zlib-1.2.8/build/Windows/jni/Android.mk b/External/zlib-1.2.8/build/Win32/jni/Android.mk index 04b9911..04b9911 100644 --- a/External/zlib-1.2.8/build/Windows/jni/Android.mk +++ b/External/zlib-1.2.8/build/Win32/jni/Android.mk diff --git a/External/zlib-1.2.8/build/Windows/jni/Application.mk b/External/zlib-1.2.8/build/Win32/jni/Application.mk index 2bd7481..2bd7481 100644 --- a/External/zlib-1.2.8/build/Windows/jni/Application.mk +++ b/External/zlib-1.2.8/build/Win32/jni/Application.mk diff --git a/External/zlib-1.2.8/build/Windows/zlib-Debug.vgdbsettings b/External/zlib-1.2.8/build/Win32/zlib-Debug.vgdbsettings index 3f5b24b..3f5b24b 100644 --- a/External/zlib-1.2.8/build/Windows/zlib-Debug.vgdbsettings +++ b/External/zlib-1.2.8/build/Win32/zlib-Debug.vgdbsettings diff --git a/External/zlib-1.2.8/build/Windows/zlib-Release.vgdbsettings b/External/zlib-1.2.8/build/Win32/zlib-Release.vgdbsettings index 669691f..669691f 100644 --- a/External/zlib-1.2.8/build/Windows/zlib-Release.vgdbsettings +++ b/External/zlib-1.2.8/build/Win32/zlib-Release.vgdbsettings diff --git a/External/zlib-1.2.8/build/Windows/zlib.vcxproj b/External/zlib-1.2.8/build/Win32/zlib.vcxproj index f66fcbd..125ee06 100644 --- a/External/zlib-1.2.8/build/Windows/zlib.vcxproj +++ b/External/zlib-1.2.8/build/Win32/zlib.vcxproj @@ -164,27 +164,27 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> - <Import Project="..\WindowsStore\zlib.Shared\zlib.Shared.vcxitems" Label="Shared" Condition="Exists('..\WindowsStore\zlib.Shared\zlib.Shared.vcxitems')" /> + <Import Project="..\Windows.Shared\zlib.Shared.vcxitems" Label="Shared" Condition="Exists('..\Windows.Shared\zlib.Shared.vcxitems')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="..\..\..\..\..\diligentcore\Shared\build\Windows\Win32d.props" /> - <Import Project="zlib.props" /> + <Import Project="..\Windows.Shared\zlib.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="..\..\..\..\..\diligentcore\Shared\build\Windows\Win64d.props" /> - <Import Project="zlib.props" /> + <Import Project="..\Windows.Shared\zlib.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="..\..\..\..\..\diligentcore\Shared\build\Windows\Win32r.props" /> - <Import Project="zlib.props" /> + <Import Project="..\Windows.Shared\zlib.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="..\..\..\..\..\diligentcore\Shared\build\Windows\Win64r.props" /> - <Import Project="zlib.props" /> + <Import Project="..\Windows.Shared\zlib.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> <Import Project="..\..\..\..\..\diligentcore\Shared\build\Windows\Android32d.props" /> diff --git a/External/zlib-1.2.8/build/Windows/zlib.vcxproj.filters b/External/zlib-1.2.8/build/Win32/zlib.vcxproj.filters index 6eacac7..6eacac7 100644 --- a/External/zlib-1.2.8/build/Windows/zlib.vcxproj.filters +++ b/External/zlib-1.2.8/build/Win32/zlib.vcxproj.filters diff --git a/External/zlib-1.2.8/build/Windows.Shared/zlib.Shared.vcxitems b/External/zlib-1.2.8/build/Windows.Shared/zlib.Shared.vcxitems new file mode 100644 index 0000000..ec43deb --- /dev/null +++ b/External/zlib-1.2.8/build/Windows.Shared/zlib.Shared.vcxitems @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup Label="Globals"> + <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects> + <HasSharedItems>true</HasSharedItems> + <ItemsProjectGuid>{40ccced6-03e5-4ca9-a235-990c055dfe70}</ItemsProjectGuid> + <ItemsRootNamespace>zlib</ItemsRootNamespace> + <ItemsProjectName>zlib.Shared</ItemsProjectName> + <CodeSharingProject>248F659F-DAC5-46E8-AC09-60EC9FC95053</CodeSharingProject> + </PropertyGroup> + <ItemDefinitionGroup> + <ClCompile> + <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)</AdditionalIncludeDirectories> + </ClCompile> + </ItemDefinitionGroup> + <ItemGroup> + <ProjectCapability Include="SourceItemsFromImports" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\crc32.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\deflate.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\gzguts.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\inffast.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\inffixed.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\inflate.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\inftrees.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\trees.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\zconf.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\zlib.h" /> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\zutil.h" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\adler32.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\compress.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\crc32.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\deflate.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\gzclose.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\gzlib.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\gzread.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\gzwrite.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\infback.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\inffast.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\inflate.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\inftrees.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\trees.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\uncompr.c" /> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\zutil.c" /> + </ItemGroup> + <ItemGroup> + <Text Include="$(MSBuildThisFileDirectory)..\..\CMakeLists.txt"> + <DeploymentContent>false</DeploymentContent> + </Text> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/External/zlib-1.2.8/build/Windows.Shared/zlib.Shared.vcxitems.filters b/External/zlib-1.2.8/build/Windows.Shared/zlib.Shared.vcxitems.filters new file mode 100644 index 0000000..3a90790 --- /dev/null +++ b/External/zlib-1.2.8/build/Windows.Shared/zlib.Shared.vcxitems.filters @@ -0,0 +1,96 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="include"> + <UniqueIdentifier>{ca411b76-03a7-4e29-baae-972b8df0d995}</UniqueIdentifier> + </Filter> + <Filter Include="src"> + <UniqueIdentifier>{2177d97c-edf5-4a22-bcdb-f06854beceef}</UniqueIdentifier> + </Filter> + </ItemGroup> + <ItemGroup> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\crc32.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\deflate.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\gzguts.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\inffast.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\inffixed.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\inflate.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\inftrees.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\trees.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\zconf.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\zlib.h"> + <Filter>include</Filter> + </ClInclude> + <ClInclude Include="$(MSBuildThisFileDirectory)..\..\zutil.h"> + <Filter>include</Filter> + </ClInclude> + </ItemGroup> + <ItemGroup> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\adler32.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\compress.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\crc32.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\deflate.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\gzclose.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\gzlib.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\gzread.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\gzwrite.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\infback.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\inffast.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\inflate.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\inftrees.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\trees.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\uncompr.c"> + <Filter>src</Filter> + </ClCompile> + <ClCompile Include="$(MSBuildThisFileDirectory)..\..\zutil.c"> + <Filter>src</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <Text Include="$(MSBuildThisFileDirectory)..\..\CMakeLists.txt" /> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/External/zlib-1.2.8/build/Windows/zlib.props b/External/zlib-1.2.8/build/Windows.Shared/zlib.props index a1303fa..a1303fa 100644 --- a/External/zlib-1.2.8/build/Windows/zlib.props +++ b/External/zlib-1.2.8/build/Windows.Shared/zlib.props diff --git a/External/zlib-1.2.8/build/WindowsStore/zlib.Shared/zlib.Shared.vcxitems b/External/zlib-1.2.8/build/WindowsStore/zlib.Shared/zlib.Shared.vcxitems deleted file mode 100644 index 218df4a..0000000 --- a/External/zlib-1.2.8/build/WindowsStore/zlib.Shared/zlib.Shared.vcxitems +++ /dev/null @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup Label="Globals"> - <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects> - <HasSharedItems>true</HasSharedItems> - <ItemsProjectGuid>{40ccced6-03e5-4ca9-a235-990c055dfe70}</ItemsProjectGuid> - <ItemsRootNamespace>zlib</ItemsRootNamespace> - <ItemsProjectName>zlib.Shared</ItemsProjectName> - <CodeSharingProject>248F659F-DAC5-46E8-AC09-60EC9FC95053</CodeSharingProject> - </PropertyGroup> - <ItemDefinitionGroup> - <ClCompile> - <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)</AdditionalIncludeDirectories> - </ClCompile> - </ItemDefinitionGroup> - <ItemGroup> - <ProjectCapability Include="SourceItemsFromImports" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\crc32.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\deflate.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\gzguts.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\inffast.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\inffixed.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\inflate.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\inftrees.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\trees.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\zconf.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\zlib.h" /> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\zutil.h" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\adler32.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\compress.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\crc32.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\deflate.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\gzclose.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\gzlib.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\gzread.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\gzwrite.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\infback.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\inffast.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\inflate.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\inftrees.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\trees.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\uncompr.c" /> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\zutil.c" /> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/External/zlib-1.2.8/build/WindowsStore/zlib.Shared/zlib.Shared.vcxitems.filters b/External/zlib-1.2.8/build/WindowsStore/zlib.Shared/zlib.Shared.vcxitems.filters deleted file mode 100644 index faf7f31..0000000 --- a/External/zlib-1.2.8/build/WindowsStore/zlib.Shared/zlib.Shared.vcxitems.filters +++ /dev/null @@ -1,93 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="include"> - <UniqueIdentifier>{ca411b76-03a7-4e29-baae-972b8df0d995}</UniqueIdentifier> - </Filter> - <Filter Include="src"> - <UniqueIdentifier>{2177d97c-edf5-4a22-bcdb-f06854beceef}</UniqueIdentifier> - </Filter> - </ItemGroup> - <ItemGroup> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\crc32.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\deflate.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\gzguts.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\inffast.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\inffixed.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\inflate.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\inftrees.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\trees.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\zconf.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\zlib.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\zutil.h"> - <Filter>include</Filter> - </ClInclude> - </ItemGroup> - <ItemGroup> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\adler32.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\compress.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\crc32.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\deflate.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\gzclose.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\gzlib.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\gzread.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\gzwrite.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\infback.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\inffast.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\inflate.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\inftrees.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\trees.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\uncompr.c"> - <Filter>src</Filter> - </ClCompile> - <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\zutil.c"> - <Filter>src</Filter> - </ClCompile> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/External/zlib-1.2.8/build/WindowsStore/zlib.Windows/zlib.Windows.vcxproj.filters b/External/zlib-1.2.8/build/WindowsStore/zlib.Windows/zlib.Windows.vcxproj.filters deleted file mode 100644 index a7761ab..0000000 --- a/External/zlib-1.2.8/build/WindowsStore/zlib.Windows/zlib.Windows.vcxproj.filters +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - </ItemGroup> -</Project> diff --git a/External/zlib-1.2.8/build/WindowsStore/zlib.WindowsPhone/zlib.WindowsPhone.vcxproj b/External/zlib-1.2.8/build/WindowsStore/zlib.WindowsPhone/zlib.WindowsPhone.vcxproj deleted file mode 100644 index 6065a19..0000000 --- a/External/zlib-1.2.8/build/WindowsStore/zlib.WindowsPhone/zlib.WindowsPhone.vcxproj +++ /dev/null @@ -1,136 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|ARM"> - <Configuration>Debug</Configuration> - <Platform>ARM</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|ARM"> - <Configuration>Release</Configuration> - <Platform>ARM</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{faa06bfc-3248-4338-97c4-7a1ca6db7c9c}</ProjectGuid> - <RootNamespace>zlib</RootNamespace> - <DefaultLanguage>en-US</DefaultLanguage> - <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion> - <AppContainerApplication>true</AppContainerApplication> - <ApplicationType>Windows Phone</ApplicationType> - <ApplicationTypeRevision>8.1</ApplicationTypeRevision> - <ConvergedProjectType>CodeSharingStaticLibrary</ConvergedProjectType> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v120_wp81</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v120_wp81</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120_wp81</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120_wp81</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="..\zlib.Shared\zlib.Shared.vcxitems" Label="Shared" /> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStore32Dbg.props" /> - <Import Project="..\..\Windows\zlib.props" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStore32Rel.props" /> - <Import Project="..\..\Windows\zlib.props" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStoreArmDbg.props" /> - <Import Project="..\..\Windows\zlib.props" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStoreArmRel.props" /> - <Import Project="..\..\Windows\zlib.props" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> - <GenerateManifest>false</GenerateManifest> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> - <GenerateWindowsMetadata>false</GenerateWindowsMetadata> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> - <GenerateWindowsMetadata>false</GenerateWindowsMetadata> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'"> - <ClCompile> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> - <GenerateWindowsMetadata>false</GenerateWindowsMetadata> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'"> - <ClCompile> - <CompileAsWinRT>false</CompileAsWinRT> - <SDLCheck>true</SDLCheck> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> - <GenerateWindowsMetadata>false</GenerateWindowsMetadata> - </Link> - </ItemDefinitionGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/External/zlib-1.2.8/build/WindowsStore/zlib.WindowsPhone/zlib.WindowsPhone.vcxproj.filters b/External/zlib-1.2.8/build/WindowsStore/zlib.WindowsPhone/zlib.WindowsPhone.vcxproj.filters deleted file mode 100644 index a7761ab..0000000 --- a/External/zlib-1.2.8/build/WindowsStore/zlib.WindowsPhone/zlib.WindowsPhone.vcxproj.filters +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - </ItemGroup> -</Project> |