diff options
Diffstat (limited to 'projects/winrt')
| -rw-r--r-- | projects/winrt/windows/build/All.vcxproj | 16 | ||||
| -rw-r--r-- | projects/winrt/windows/src/commit_id.vcxproj | 20 | ||||
| -rw-r--r-- | projects/winrt/windows/src/copy_compiler_dll.vcxproj | 20 | ||||
| -rw-r--r-- | projects/winrt/windows/src/copy_scripts.vcxproj | 20 | ||||
| -rw-r--r-- | projects/winrt/windows/src/libANGLE.vcxproj | 32 | ||||
| -rw-r--r-- | projects/winrt/windows/src/libEGL.vcxproj | 28 | ||||
| -rw-r--r-- | projects/winrt/windows/src/libGLESv2.vcxproj | 20 | ||||
| -rw-r--r-- | projects/winrt/windows/src/libGLESv2_static.vcxproj | 20 | ||||
| -rw-r--r-- | projects/winrt/windows/src/preprocessor.vcxproj | 20 | ||||
| -rw-r--r-- | projects/winrt/windows/src/translator.vcxproj | 20 | ||||
| -rw-r--r-- | projects/winrt/windows/src/translator_lib.vcxproj | 20 | ||||
| -rw-r--r-- | projects/winrt/windows/src/translator_static.vcxproj | 20 |
12 files changed, 146 insertions, 110 deletions
diff --git a/projects/winrt/windows/build/All.vcxproj b/projects/winrt/windows/build/All.vcxproj index 931a5a40..79e7206b 100644 --- a/projects/winrt/windows/build/All.vcxproj +++ b/projects/winrt/windows/build/All.vcxproj @@ -78,12 +78,10 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <TargetMachine>MachineX86</TargetMachine> </Lib> <Link> <AdditionalDependencies></AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>$(OutDir)lib\$(TargetName).lib</ImportLibrary> @@ -117,11 +115,10 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <TargetMachine>MachineARM</TargetMachine> </Lib> <Link> <AdditionalDependencies></AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>$(OutDir)lib\$(TargetName).lib</ImportLibrary> @@ -155,11 +152,10 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <TargetMachine>MachineX64</TargetMachine> </Lib> <Link> <AdditionalDependencies></AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>$(OutDir)lib\$(TargetName).lib</ImportLibrary> @@ -192,12 +188,10 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <TargetMachine>MachineX86</TargetMachine> </Lib> <Link> <AdditionalDependencies></AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>false</GenerateDebugInformation> <ImportLibrary>$(OutDir)lib\$(TargetName).lib</ImportLibrary> @@ -230,11 +224,10 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <TargetMachine>MachineARM</TargetMachine> </Lib> <Link> <AdditionalDependencies></AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>false</GenerateDebugInformation> <ImportLibrary>$(OutDir)lib\$(TargetName).lib</ImportLibrary> @@ -267,11 +260,10 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <TargetMachine>MachineX64</TargetMachine> </Lib> <Link> <AdditionalDependencies></AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>false</GenerateDebugInformation> <ImportLibrary>$(OutDir)lib\$(TargetName).lib</ImportLibrary> diff --git a/projects/winrt/windows/src/commit_id.vcxproj b/projects/winrt/windows/src/commit_id.vcxproj index 4cf587ee..a2e804d5 100644 --- a/projects/winrt/windows/src/commit_id.vcxproj +++ b/projects/winrt/windows/src/commit_id.vcxproj @@ -127,11 +127,12 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <TargetMachine>MachineARM</TargetMachine> </Lib> <Link> <AdditionalDependencies>%(AdditionalDependencies);uuid.lib</AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>$(OutDir)lib\$(TargetName).lib</ImportLibrary> @@ -170,11 +171,12 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <TargetMachine>MachineX64</TargetMachine> </Lib> <Link> <AdditionalDependencies>%(AdditionalDependencies);uuid.lib</AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>$(OutDir)lib\$(TargetName).lib</ImportLibrary> @@ -255,11 +257,12 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <TargetMachine>MachineARM</TargetMachine> </Lib> <Link> <AdditionalDependencies>%(AdditionalDependencies);uuid.lib</AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>false</GenerateDebugInformation> <ImportLibrary>$(OutDir)lib\$(TargetName).lib</ImportLibrary> @@ -297,11 +300,12 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <TargetMachine>MachineX64</TargetMachine> </Lib> <Link> <AdditionalDependencies>%(AdditionalDependencies);uuid.lib</AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>false</GenerateDebugInformation> <ImportLibrary>$(OutDir)lib\$(TargetName).lib</ImportLibrary> diff --git a/projects/winrt/windows/src/copy_compiler_dll.vcxproj b/projects/winrt/windows/src/copy_compiler_dll.vcxproj index 816464e2..fe78266a 100644 --- a/projects/winrt/windows/src/copy_compiler_dll.vcxproj +++ b/projects/winrt/windows/src/copy_compiler_dll.vcxproj @@ -127,11 +127,12 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <TargetMachine>MachineARM</TargetMachine> </Lib> <Link> <AdditionalDependencies>%(AdditionalDependencies);uuid.lib</AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>$(OutDir)lib\$(TargetName).lib</ImportLibrary> @@ -170,11 +171,12 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <TargetMachine>MachineX64</TargetMachine> </Lib> <Link> <AdditionalDependencies>%(AdditionalDependencies);uuid.lib</AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>$(OutDir)lib\$(TargetName).lib</ImportLibrary> @@ -255,11 +257,12 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <TargetMachine>MachineARM</TargetMachine> </Lib> <Link> <AdditionalDependencies>%(AdditionalDependencies);uuid.lib</AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>false</GenerateDebugInformation> <ImportLibrary>$(OutDir)lib\$(TargetName).lib</ImportLibrary> @@ -297,11 +300,12 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <TargetMachine>MachineX64</TargetMachine> </Lib> <Link> <AdditionalDependencies>%(AdditionalDependencies);uuid.lib</AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>false</GenerateDebugInformation> <ImportLibrary>$(OutDir)lib\$(TargetName).lib</ImportLibrary> diff --git a/projects/winrt/windows/src/copy_scripts.vcxproj b/projects/winrt/windows/src/copy_scripts.vcxproj index 09b44901..296c479d 100644 --- a/projects/winrt/windows/src/copy_scripts.vcxproj +++ b/projects/winrt/windows/src/copy_scripts.vcxproj @@ -127,11 +127,12 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <TargetMachine>MachineARM</TargetMachine> </Lib> <Link> <AdditionalDependencies>%(AdditionalDependencies);uuid.lib</AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>$(OutDir)lib\$(TargetName).lib</ImportLibrary> @@ -170,11 +171,12 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <TargetMachine>MachineX64</TargetMachine> </Lib> <Link> <AdditionalDependencies>%(AdditionalDependencies);uuid.lib</AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>$(OutDir)lib\$(TargetName).lib</ImportLibrary> @@ -255,11 +257,12 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <TargetMachine>MachineARM</TargetMachine> </Lib> <Link> <AdditionalDependencies>%(AdditionalDependencies);uuid.lib</AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>false</GenerateDebugInformation> <ImportLibrary>$(OutDir)lib\$(TargetName).lib</ImportLibrary> @@ -297,11 +300,12 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <TargetMachine>MachineX64</TargetMachine> </Lib> <Link> <AdditionalDependencies>%(AdditionalDependencies);uuid.lib</AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>false</GenerateDebugInformation> <ImportLibrary>$(OutDir)lib\$(TargetName).lib</ImportLibrary> diff --git a/projects/winrt/windows/src/libANGLE.vcxproj b/projects/winrt/windows/src/libANGLE.vcxproj index cdffd405..a57a54d8 100644 --- a/projects/winrt/windows/src/libANGLE.vcxproj +++ b/projects/winrt/windows/src/libANGLE.vcxproj @@ -123,19 +123,20 @@ <MinimalRebuild>false</MinimalRebuild> <Optimization>Disabled</Optimization> <PrecompiledHeader>NotUsing</PrecompiledHeader> - <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;NOMINMAX;GL_APICALL=;GL_GLEXT_PROTOTYPES=;EGLAPI=;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ "d3dcompiler_46.dll", "d3dcompiler_43.dll" };ANGLE_ENABLE_D3D11;NTDDI_VERSION=NTDDI_WINBLUE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;NOMINMAX;GL_APICALL=;GL_GLEXT_PROTOTYPES=;EGLAPI=;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ "d3dcompiler_46.dll", "d3dcompiler_43.dll" };ANGLE_ENABLE_D3D11;NTDDI_VERSION=NTDDI_WINBLUE;_DEBUG;ANGLE_ENABLE_PERF;ANGLE_GENERATE_SHADER_DEBUG_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <RuntimeTypeInfo>true</RuntimeTypeInfo> <TreatWarningAsError>true</TreatWarningAsError> <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <OutputFile>$(OutDir)lib\$(ProjectName)$(TargetExt)</OutputFile> + <TargetMachine>MachineARM</TargetMachine> </Lib> <Link> - <AdditionalDependencies>%(AdditionalDependencies);uuid.lib</AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalDependencies>%(AdditionalDependencies);uuid.lib;d3d9.lib</AdditionalDependencies> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <EnableCOMDATFolding>false</EnableCOMDATFolding> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -151,7 +152,7 @@ <ResourceCompile> <AdditionalIncludeDirectories>..\..\..\..\src;..\..\..\..\include;..\..\..\..\src\libGLESv2;$(OutDir)obj\global_intermediate\angle;C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;C:\Program Files (x86)\Windows Kits\8.1\Include\shared;C:\Program Files (x86)\Windows Kits\8.1\Include\um;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <Culture>0x0409</Culture> - <PreprocessorDefinitions>GL_APICALL=;GL_GLEXT_PROTOTYPES=;EGLAPI=;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ "d3dcompiler_46.dll", "d3dcompiler_43.dll" };ANGLE_ENABLE_D3D11;NTDDI_VERSION=NTDDI_WINBLUE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>GL_APICALL=;GL_GLEXT_PROTOTYPES=;EGLAPI=;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ "d3dcompiler_46.dll", "d3dcompiler_43.dll" };ANGLE_ENABLE_D3D11;NTDDI_VERSION=NTDDI_WINBLUE;_DEBUG;ANGLE_ENABLE_PERF;ANGLE_GENERATE_SHADER_DEBUG_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ResourceCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -168,19 +169,20 @@ <MinimalRebuild>false</MinimalRebuild> <Optimization>Disabled</Optimization> <PrecompiledHeader>NotUsing</PrecompiledHeader> - <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;NOMINMAX;GL_APICALL=;GL_GLEXT_PROTOTYPES=;EGLAPI=;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ "d3dcompiler_46.dll", "d3dcompiler_43.dll" };ANGLE_ENABLE_D3D11;NTDDI_VERSION=NTDDI_WINBLUE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;NOMINMAX;GL_APICALL=;GL_GLEXT_PROTOTYPES=;EGLAPI=;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ "d3dcompiler_46.dll", "d3dcompiler_43.dll" };ANGLE_ENABLE_D3D11;NTDDI_VERSION=NTDDI_WINBLUE;_DEBUG;ANGLE_ENABLE_PERF;ANGLE_GENERATE_SHADER_DEBUG_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <RuntimeTypeInfo>true</RuntimeTypeInfo> <TreatWarningAsError>true</TreatWarningAsError> <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <OutputFile>$(OutDir)lib\$(ProjectName)$(TargetExt)</OutputFile> + <TargetMachine>MachineX64</TargetMachine> </Lib> <Link> - <AdditionalDependencies>%(AdditionalDependencies);uuid.lib</AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalDependencies>%(AdditionalDependencies);uuid.lib;d3d9.lib</AdditionalDependencies> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <EnableCOMDATFolding>false</EnableCOMDATFolding> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -196,7 +198,7 @@ <ResourceCompile> <AdditionalIncludeDirectories>..\..\..\..\src;..\..\..\..\include;..\..\..\..\src\libGLESv2;$(OutDir)obj\global_intermediate\angle;C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;C:\Program Files (x86)\Windows Kits\8.1\Include\shared;C:\Program Files (x86)\Windows Kits\8.1\Include\um;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <Culture>0x0409</Culture> - <PreprocessorDefinitions>GL_APICALL=;GL_GLEXT_PROTOTYPES=;EGLAPI=;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ "d3dcompiler_46.dll", "d3dcompiler_43.dll" };ANGLE_ENABLE_D3D11;NTDDI_VERSION=NTDDI_WINBLUE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>GL_APICALL=;GL_GLEXT_PROTOTYPES=;EGLAPI=;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ "d3dcompiler_46.dll", "d3dcompiler_43.dll" };ANGLE_ENABLE_D3D11;NTDDI_VERSION=NTDDI_WINBLUE;_DEBUG;ANGLE_ENABLE_PERF;ANGLE_GENERATE_SHADER_DEBUG_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ResourceCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -264,12 +266,13 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <OutputFile>$(OutDir)lib\$(ProjectName)$(TargetExt)</OutputFile> + <TargetMachine>MachineARM</TargetMachine> </Lib> <Link> <AdditionalDependencies>%(AdditionalDependencies);uuid.lib</AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <EnableCOMDATFolding>false</EnableCOMDATFolding> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>false</GenerateDebugInformation> @@ -308,12 +311,13 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <OutputFile>$(OutDir)lib\$(ProjectName)$(TargetExt)</OutputFile> + <TargetMachine>MachineX64</TargetMachine> </Lib> <Link> <AdditionalDependencies>%(AdditionalDependencies);uuid.lib</AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <EnableCOMDATFolding>false</EnableCOMDATFolding> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>false</GenerateDebugInformation> diff --git a/projects/winrt/windows/src/libEGL.vcxproj b/projects/winrt/windows/src/libEGL.vcxproj index 6272bd0f..714c5e1f 100644 --- a/projects/winrt/windows/src/libEGL.vcxproj +++ b/projects/winrt/windows/src/libEGL.vcxproj @@ -124,18 +124,19 @@ <MinimalRebuild>false</MinimalRebuild> <Optimization>Disabled</Optimization> <PrecompiledHeader>NotUsing</PrecompiledHeader> - <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;NOMINMAX;GL_APICALL=;GL_GLEXT_PROTOTYPES=;EGLAPI=;ANGLE_ENABLE_D3D11;NTDDI_VERSION=NTDDI_WINBLUE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;NOMINMAX;GL_APICALL=;GL_GLEXT_PROTOTYPES=;EGLAPI=;ANGLE_ENABLE_D3D11;NTDDI_VERSION=NTDDI_WINBLUE;_DEBUG;ANGLE_ENABLE_PERF;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <RuntimeTypeInfo>true</RuntimeTypeInfo> <TreatWarningAsError>true</TreatWarningAsError> <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <TargetMachine>MachineARM</TargetMachine> </Lib> <Link> <AdditionalDependencies>%(AdditionalDependencies);uuid.lib</AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <EnableCOMDATFolding>false</EnableCOMDATFolding> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -153,7 +154,7 @@ <ResourceCompile> <AdditionalIncludeDirectories>..\..\..\..\src;..\..\..\..\include;..\..\..\..\src\libGLESv2;$(OutDir)obj\global_intermediate\angle;C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;C:\Program Files (x86)\Windows Kits\8.1\Include\shared;C:\Program Files (x86)\Windows Kits\8.1\Include\um;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <Culture>0x0409</Culture> - <PreprocessorDefinitions>GL_APICALL=;GL_GLEXT_PROTOTYPES=;EGLAPI=;ANGLE_ENABLE_D3D11;NTDDI_VERSION=NTDDI_WINBLUE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>GL_APICALL=;GL_GLEXT_PROTOTYPES=;EGLAPI=;ANGLE_ENABLE_D3D11;NTDDI_VERSION=NTDDI_WINBLUE;_DEBUG;ANGLE_ENABLE_PERF;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ResourceCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -170,18 +171,19 @@ <MinimalRebuild>false</MinimalRebuild> <Optimization>Disabled</Optimization> <PrecompiledHeader>NotUsing</PrecompiledHeader> - <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;NOMINMAX;GL_APICALL=;GL_GLEXT_PROTOTYPES=;EGLAPI=;ANGLE_ENABLE_D3D11;NTDDI_VERSION=NTDDI_WINBLUE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;NOMINMAX;GL_APICALL=;GL_GLEXT_PROTOTYPES=;EGLAPI=;ANGLE_ENABLE_D3D11;NTDDI_VERSION=NTDDI_WINBLUE;_DEBUG;ANGLE_ENABLE_PERF;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <RuntimeTypeInfo>true</RuntimeTypeInfo> <TreatWarningAsError>true</TreatWarningAsError> <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <TargetMachine>MachineX64</TargetMachine> </Lib> <Link> <AdditionalDependencies>%(AdditionalDependencies);uuid.lib</AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <EnableCOMDATFolding>false</EnableCOMDATFolding> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -199,7 +201,7 @@ <ResourceCompile> <AdditionalIncludeDirectories>..\..\..\..\src;..\..\..\..\include;..\..\..\..\src\libGLESv2;$(OutDir)obj\global_intermediate\angle;C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;C:\Program Files (x86)\Windows Kits\8.1\Include\shared;C:\Program Files (x86)\Windows Kits\8.1\Include\um;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <Culture>0x0409</Culture> - <PreprocessorDefinitions>GL_APICALL=;GL_GLEXT_PROTOTYPES=;EGLAPI=;ANGLE_ENABLE_D3D11;NTDDI_VERSION=NTDDI_WINBLUE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>GL_APICALL=;GL_GLEXT_PROTOTYPES=;EGLAPI=;ANGLE_ENABLE_D3D11;NTDDI_VERSION=NTDDI_WINBLUE;_DEBUG;ANGLE_ENABLE_PERF;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ResourceCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -268,11 +270,12 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <TargetMachine>MachineARM</TargetMachine> </Lib> <Link> <AdditionalDependencies>%(AdditionalDependencies);uuid.lib</AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <EnableCOMDATFolding>false</EnableCOMDATFolding> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>false</GenerateDebugInformation> @@ -313,11 +316,12 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <TargetMachine>MachineX64</TargetMachine> </Lib> <Link> <AdditionalDependencies>%(AdditionalDependencies);uuid.lib</AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <EnableCOMDATFolding>false</EnableCOMDATFolding> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>false</GenerateDebugInformation> diff --git a/projects/winrt/windows/src/libGLESv2.vcxproj b/projects/winrt/windows/src/libGLESv2.vcxproj index 3f8afcb3..58a0bf14 100644 --- a/projects/winrt/windows/src/libGLESv2.vcxproj +++ b/projects/winrt/windows/src/libGLESv2.vcxproj @@ -131,11 +131,12 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <TargetMachine>MachineARM</TargetMachine> </Lib> <Link> <AdditionalDependencies>%(AdditionalDependencies);uuid.lib;dxguid.lib;d3d11.lib;d3dcompiler.lib</AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <EnableCOMDATFolding>false</EnableCOMDATFolding> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -177,11 +178,12 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <TargetMachine>MachineX64</TargetMachine> </Lib> <Link> <AdditionalDependencies>%(AdditionalDependencies);uuid.lib;dxguid.lib;d3d11.lib;d3dcompiler.lib</AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <EnableCOMDATFolding>false</EnableCOMDATFolding> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -268,11 +270,12 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <TargetMachine>MachineARM</TargetMachine> </Lib> <Link> <AdditionalDependencies>%(AdditionalDependencies);uuid.lib;dxguid.lib;d3d11.lib;d3dcompiler.lib</AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <EnableCOMDATFolding>false</EnableCOMDATFolding> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>false</GenerateDebugInformation> @@ -313,11 +316,12 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <TargetMachine>MachineX64</TargetMachine> </Lib> <Link> <AdditionalDependencies>%(AdditionalDependencies);uuid.lib;dxguid.lib;d3d11.lib;d3dcompiler.lib</AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <EnableCOMDATFolding>false</EnableCOMDATFolding> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>false</GenerateDebugInformation> diff --git a/projects/winrt/windows/src/libGLESv2_static.vcxproj b/projects/winrt/windows/src/libGLESv2_static.vcxproj index c072c879..8470fb39 100644 --- a/projects/winrt/windows/src/libGLESv2_static.vcxproj +++ b/projects/winrt/windows/src/libGLESv2_static.vcxproj @@ -130,12 +130,13 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <OutputFile>$(OutDir)lib\$(ProjectName)$(TargetExt)</OutputFile> + <TargetMachine>MachineARM</TargetMachine> </Lib> <Link> <AdditionalDependencies>%(AdditionalDependencies);uuid.lib</AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <EnableCOMDATFolding>false</EnableCOMDATFolding> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -175,12 +176,13 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <OutputFile>$(OutDir)lib\$(ProjectName)$(TargetExt)</OutputFile> + <TargetMachine>MachineX64</TargetMachine> </Lib> <Link> <AdditionalDependencies>%(AdditionalDependencies);uuid.lib</AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <EnableCOMDATFolding>false</EnableCOMDATFolding> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -264,12 +266,13 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <OutputFile>$(OutDir)lib\$(ProjectName)$(TargetExt)</OutputFile> + <TargetMachine>MachineARM</TargetMachine> </Lib> <Link> <AdditionalDependencies>%(AdditionalDependencies);uuid.lib</AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <EnableCOMDATFolding>false</EnableCOMDATFolding> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>false</GenerateDebugInformation> @@ -308,12 +311,13 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <OutputFile>$(OutDir)lib\$(ProjectName)$(TargetExt)</OutputFile> + <TargetMachine>MachineX64</TargetMachine> </Lib> <Link> <AdditionalDependencies>%(AdditionalDependencies);uuid.lib</AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <EnableCOMDATFolding>false</EnableCOMDATFolding> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>false</GenerateDebugInformation> diff --git a/projects/winrt/windows/src/preprocessor.vcxproj b/projects/winrt/windows/src/preprocessor.vcxproj index 66aff721..1a2afbf0 100644 --- a/projects/winrt/windows/src/preprocessor.vcxproj +++ b/projects/winrt/windows/src/preprocessor.vcxproj @@ -127,12 +127,13 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <OutputFile>$(OutDir)lib\$(ProjectName)$(TargetExt)</OutputFile> + <TargetMachine>MachineARM</TargetMachine> </Lib> <Link> <AdditionalDependencies>%(AdditionalDependencies);uuid.lib</AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>$(OutDir)lib\$(TargetName).lib</ImportLibrary> @@ -170,12 +171,13 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <OutputFile>$(OutDir)lib\$(ProjectName)$(TargetExt)</OutputFile> + <TargetMachine>MachineX64</TargetMachine> </Lib> <Link> <AdditionalDependencies>%(AdditionalDependencies);uuid.lib</AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>$(OutDir)lib\$(TargetName).lib</ImportLibrary> @@ -255,12 +257,13 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <OutputFile>$(OutDir)lib\$(ProjectName)$(TargetExt)</OutputFile> + <TargetMachine>MachineARM</TargetMachine> </Lib> <Link> <AdditionalDependencies>%(AdditionalDependencies);uuid.lib</AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>false</GenerateDebugInformation> <ImportLibrary>$(OutDir)lib\$(TargetName).lib</ImportLibrary> @@ -297,12 +300,13 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <OutputFile>$(OutDir)lib\$(ProjectName)$(TargetExt)</OutputFile> + <TargetMachine>MachineX64</TargetMachine> </Lib> <Link> <AdditionalDependencies>%(AdditionalDependencies);uuid.lib</AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>false</GenerateDebugInformation> <ImportLibrary>$(OutDir)lib\$(TargetName).lib</ImportLibrary> diff --git a/projects/winrt/windows/src/translator.vcxproj b/projects/winrt/windows/src/translator.vcxproj index 1541b85c..644ac39c 100644 --- a/projects/winrt/windows/src/translator.vcxproj +++ b/projects/winrt/windows/src/translator.vcxproj @@ -127,12 +127,13 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <OutputFile>$(OutDir)lib\$(ProjectName)$(TargetExt)</OutputFile> + <TargetMachine>MachineARM</TargetMachine> </Lib> <Link> <AdditionalDependencies>%(AdditionalDependencies);uuid.lib</AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>$(OutDir)lib\$(TargetName).lib</ImportLibrary> @@ -170,12 +171,13 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <OutputFile>$(OutDir)lib\$(ProjectName)$(TargetExt)</OutputFile> + <TargetMachine>MachineX64</TargetMachine> </Lib> <Link> <AdditionalDependencies>%(AdditionalDependencies);uuid.lib</AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>$(OutDir)lib\$(TargetName).lib</ImportLibrary> @@ -255,12 +257,13 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <OutputFile>$(OutDir)lib\$(ProjectName)$(TargetExt)</OutputFile> + <TargetMachine>MachineARM</TargetMachine> </Lib> <Link> <AdditionalDependencies>%(AdditionalDependencies);uuid.lib</AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>false</GenerateDebugInformation> <ImportLibrary>$(OutDir)lib\$(TargetName).lib</ImportLibrary> @@ -297,12 +300,13 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <OutputFile>$(OutDir)lib\$(ProjectName)$(TargetExt)</OutputFile> + <TargetMachine>MachineX64</TargetMachine> </Lib> <Link> <AdditionalDependencies>%(AdditionalDependencies);uuid.lib</AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>false</GenerateDebugInformation> <ImportLibrary>$(OutDir)lib\$(TargetName).lib</ImportLibrary> diff --git a/projects/winrt/windows/src/translator_lib.vcxproj b/projects/winrt/windows/src/translator_lib.vcxproj index 7f2c461d..a74b27ae 100644 --- a/projects/winrt/windows/src/translator_lib.vcxproj +++ b/projects/winrt/windows/src/translator_lib.vcxproj @@ -128,13 +128,14 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> <OutputFile>$(OutDir)lib\$(ProjectName)$(TargetExt)</OutputFile> + <TargetMachine>MachineARM</TargetMachine> </Lib> <Link> <AdditionalDependencies>%(AdditionalDependencies);uuid.lib</AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>$(OutDir)lib\$(TargetName).lib</ImportLibrary> @@ -172,13 +173,14 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> <OutputFile>$(OutDir)lib\$(ProjectName)$(TargetExt)</OutputFile> + <TargetMachine>MachineX64</TargetMachine> </Lib> <Link> <AdditionalDependencies>%(AdditionalDependencies);uuid.lib</AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>$(OutDir)lib\$(TargetName).lib</ImportLibrary> @@ -259,13 +261,14 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> <OutputFile>$(OutDir)lib\$(ProjectName)$(TargetExt)</OutputFile> + <TargetMachine>MachineARM</TargetMachine> </Lib> <Link> <AdditionalDependencies>%(AdditionalDependencies);uuid.lib</AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>false</GenerateDebugInformation> <ImportLibrary>$(OutDir)lib\$(TargetName).lib</ImportLibrary> @@ -302,13 +305,14 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions> <OutputFile>$(OutDir)lib\$(ProjectName)$(TargetExt)</OutputFile> + <TargetMachine>MachineX64</TargetMachine> </Lib> <Link> <AdditionalDependencies>%(AdditionalDependencies);uuid.lib</AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>false</GenerateDebugInformation> <ImportLibrary>$(OutDir)lib\$(TargetName).lib</ImportLibrary> diff --git a/projects/winrt/windows/src/translator_static.vcxproj b/projects/winrt/windows/src/translator_static.vcxproj index 85953be6..11015702 100644 --- a/projects/winrt/windows/src/translator_static.vcxproj +++ b/projects/winrt/windows/src/translator_static.vcxproj @@ -127,12 +127,13 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <OutputFile>$(OutDir)lib\$(ProjectName)$(TargetExt)</OutputFile> + <TargetMachine>MachineARM</TargetMachine> </Lib> <Link> <AdditionalDependencies>%(AdditionalDependencies);uuid.lib</AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>$(OutDir)lib\$(TargetName).lib</ImportLibrary> @@ -170,12 +171,13 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <OutputFile>$(OutDir)lib\$(ProjectName)$(TargetExt)</OutputFile> + <TargetMachine>MachineX64</TargetMachine> </Lib> <Link> <AdditionalDependencies>%(AdditionalDependencies);uuid.lib</AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>true</GenerateDebugInformation> <ImportLibrary>$(OutDir)lib\$(TargetName).lib</ImportLibrary> @@ -255,12 +257,13 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <OutputFile>$(OutDir)lib\$(ProjectName)$(TargetExt)</OutputFile> + <TargetMachine>MachineARM</TargetMachine> </Lib> <Link> <AdditionalDependencies>%(AdditionalDependencies);uuid.lib</AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/win8/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>false</GenerateDebugInformation> <ImportLibrary>$(OutDir)lib\$(TargetName).lib</ImportLibrary> @@ -297,12 +300,13 @@ <WarningLevel>Level4</WarningLevel> </ClCompile> <Lib> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <OutputFile>$(OutDir)lib\$(ProjectName)$(TargetExt)</OutputFile> + <TargetMachine>MachineX64</TargetMachine> </Lib> <Link> <AdditionalDependencies>%(AdditionalDependencies);uuid.lib</AdditionalDependencies> - <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>false</GenerateDebugInformation> <ImportLibrary>$(OutDir)lib\$(TargetName).lib</ImportLibrary> |