Index: source/libvpx/build/make/gen_msvs_vcxproj.sh |
=================================================================== |
--- source/libvpx/build/make/gen_msvs_vcxproj.sh (revision 240950) |
+++ source/libvpx/build/make/gen_msvs_vcxproj.sh (working copy) |
@@ -33,7 +33,7 @@ |
--name=project_name Name of the project (required) |
--proj-guid=GUID GUID to use for the project |
--module-def=filename File containing export definitions (for DLLs) |
- --ver=version Version (10,11) of visual studio to generate for |
+ --ver=version Version (10,11,12) of visual studio to generate for |
--src-path-bare=dir Path to root of source tree |
-Ipath/to/include Additional include directories |
-DFLAG[=value] Preprocessor macros to define |
@@ -228,7 +228,7 @@ |
--ver=*) |
vs_ver="$optval" |
case "$optval" in |
- 10|11) |
+ 10|11|12) |
;; |
*) die Unrecognized Visual Studio Version in $opt |
;; |
@@ -269,7 +269,7 @@ |
asm_use_custom_step=false |
uses_asm=${uses_asm:-false} |
case "${vs_ver:-11}" in |
- 10|11) |
+ 10|11|12) |
asm_use_custom_step=$uses_asm |
;; |
esac |
@@ -383,6 +383,20 @@ |
tag_content PlatformToolset v110 |
fi |
fi |
+ if [ "$vs_ver" = "12" ]; then |
+ if [ "$plat" = "ARM" ]; then |
+ # Setting the wp80 toolchain automatically sets the |
+ # WINAPI_FAMILY define, which is required for building |
+ # code for arm with the windows headers. Alternatively, |
+ # one could add AppContainerApplication=true in the Globals |
+ # section and add PrecompiledHeader=NotUsing and |
+ # CompileAsWinRT=false in ClCompile and SubSystem=Console |
+ # in Link. |
+ tag_content PlatformToolset v120_wp80 |
+ else |
+ tag_content PlatformToolset v120 |
+ fi |
+ fi |
tag_content CharacterSet Unicode |
if [ "$config" = "Release" ]; then |
tag_content WholeProgramOptimization true |