Commit 0d28133b authored by Yaowu Xu's avatar Yaowu Xu Committed by Johann

Add support for VC++2013

Change-Id: I5f979135d371c3fc7b9485e29479f112baa5fa3b
parent 81c4a42e
...@@ -64,6 +64,7 @@ COMPILING THE APPLICATIONS/LIBRARIES: ...@@ -64,6 +64,7 @@ COMPILING THE APPLICATIONS/LIBRARIES:
armv7-linux-gcc armv7-linux-gcc
armv7-none-rvct armv7-none-rvct
armv7-win32-vs11 armv7-win32-vs11
armv7-win32-vs12
mips32-linux-gcc mips32-linux-gcc
ppc32-darwin8-gcc ppc32-darwin8-gcc
ppc32-darwin9-gcc ppc32-darwin9-gcc
...@@ -91,6 +92,7 @@ COMPILING THE APPLICATIONS/LIBRARIES: ...@@ -91,6 +92,7 @@ COMPILING THE APPLICATIONS/LIBRARIES:
x86-win32-vs9 x86-win32-vs9
x86-win32-vs10 x86-win32-vs10
x86-win32-vs11 x86-win32-vs11
x86-win32-vs12
x86_64-darwin9-gcc x86_64-darwin9-gcc
x86_64-darwin10-gcc x86_64-darwin10-gcc
x86_64-darwin11-gcc x86_64-darwin11-gcc
...@@ -104,6 +106,7 @@ COMPILING THE APPLICATIONS/LIBRARIES: ...@@ -104,6 +106,7 @@ COMPILING THE APPLICATIONS/LIBRARIES:
x86_64-win64-vs9 x86_64-win64-vs9
x86_64-win64-vs10 x86_64-win64-vs10
x86_64-win64-vs11 x86_64-win64-vs11
x86_64-win64-vs12
universal-darwin8-gcc universal-darwin8-gcc
universal-darwin9-gcc universal-darwin9-gcc
universal-darwin10-gcc universal-darwin10-gcc
......
...@@ -255,7 +255,7 @@ for opt in "$@"; do ...@@ -255,7 +255,7 @@ for opt in "$@"; do
;; ;;
--ver=*) vs_ver="$optval" --ver=*) vs_ver="$optval"
case $optval in case $optval in
[789]|10|11) [789]|10|11|12)
;; ;;
*) die Unrecognized Visual Studio Version in $opt *) die Unrecognized Visual Studio Version in $opt
;; ;;
...@@ -297,12 +297,15 @@ case "${vs_ver:-8}" in ...@@ -297,12 +297,15 @@ case "${vs_ver:-8}" in
11) sln_vers="12.00" 11) sln_vers="12.00"
sln_vers_str="Visual Studio 2012" sln_vers_str="Visual Studio 2012"
;; ;;
12) sln_vers="12.00"
sln_vers_str="Visual Studio 2013"
;;
esac esac
case "${vs_ver:-8}" in case "${vs_ver:-8}" in
[789]) [789])
sfx=vcproj sfx=vcproj
;; ;;
10|11) 10|11|12)
sfx=vcxproj sfx=vcxproj
;; ;;
esac esac
......
...@@ -33,7 +33,7 @@ Options: ...@@ -33,7 +33,7 @@ Options:
--name=project_name Name of the project (required) --name=project_name Name of the project (required)
--proj-guid=GUID GUID to use for the project --proj-guid=GUID GUID to use for the project
--module-def=filename File containing export definitions (for DLLs) --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 --src-path-bare=dir Path to root of source tree
-Ipath/to/include Additional include directories -Ipath/to/include Additional include directories
-DFLAG[=value] Preprocessor macros to define -DFLAG[=value] Preprocessor macros to define
...@@ -228,7 +228,7 @@ for opt in "$@"; do ...@@ -228,7 +228,7 @@ for opt in "$@"; do
--ver=*) --ver=*)
vs_ver="$optval" vs_ver="$optval"
case "$optval" in case "$optval" in
10|11) 10|11|12)
;; ;;
*) die Unrecognized Visual Studio Version in $opt *) die Unrecognized Visual Studio Version in $opt
;; ;;
...@@ -269,7 +269,7 @@ guid=${guid:-`generate_uuid`} ...@@ -269,7 +269,7 @@ guid=${guid:-`generate_uuid`}
asm_use_custom_step=false asm_use_custom_step=false
uses_asm=${uses_asm:-false} uses_asm=${uses_asm:-false}
case "${vs_ver:-11}" in case "${vs_ver:-11}" in
10|11) 10|11|12)
asm_use_custom_step=$uses_asm asm_use_custom_step=$uses_asm
;; ;;
esac esac
...@@ -383,6 +383,20 @@ generate_vcxproj() { ...@@ -383,6 +383,20 @@ generate_vcxproj() {
tag_content PlatformToolset v110 tag_content PlatformToolset v110
fi fi
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 tag_content CharacterSet Unicode
if [ "$config" = "Release" ]; then if [ "$config" = "Release" ]; then
tag_content WholeProgramOptimization true tag_content WholeProgramOptimization true
......
...@@ -100,6 +100,7 @@ all_platforms="${all_platforms} armv7-linux-rvct" #neon Cortex-A8 ...@@ -100,6 +100,7 @@ all_platforms="${all_platforms} armv7-linux-rvct" #neon Cortex-A8
all_platforms="${all_platforms} armv7-linux-gcc" #neon Cortex-A8 all_platforms="${all_platforms} armv7-linux-gcc" #neon Cortex-A8
all_platforms="${all_platforms} armv7-none-rvct" #neon Cortex-A8 all_platforms="${all_platforms} armv7-none-rvct" #neon Cortex-A8
all_platforms="${all_platforms} armv7-win32-vs11" all_platforms="${all_platforms} armv7-win32-vs11"
all_platforms="${all_platforms} armv7-win32-vs12"
all_platforms="${all_platforms} mips32-linux-gcc" all_platforms="${all_platforms} mips32-linux-gcc"
all_platforms="${all_platforms} ppc32-darwin8-gcc" all_platforms="${all_platforms} ppc32-darwin8-gcc"
all_platforms="${all_platforms} ppc32-darwin9-gcc" all_platforms="${all_platforms} ppc32-darwin9-gcc"
...@@ -127,6 +128,7 @@ all_platforms="${all_platforms} x86-win32-vs8" ...@@ -127,6 +128,7 @@ all_platforms="${all_platforms} x86-win32-vs8"
all_platforms="${all_platforms} x86-win32-vs9" all_platforms="${all_platforms} x86-win32-vs9"
all_platforms="${all_platforms} x86-win32-vs10" all_platforms="${all_platforms} x86-win32-vs10"
all_platforms="${all_platforms} x86-win32-vs11" all_platforms="${all_platforms} x86-win32-vs11"
all_platforms="${all_platforms} x86-win32-vs12"
all_platforms="${all_platforms} x86_64-darwin9-gcc" all_platforms="${all_platforms} x86_64-darwin9-gcc"
all_platforms="${all_platforms} x86_64-darwin10-gcc" all_platforms="${all_platforms} x86_64-darwin10-gcc"
all_platforms="${all_platforms} x86_64-darwin11-gcc" all_platforms="${all_platforms} x86_64-darwin11-gcc"
...@@ -140,6 +142,7 @@ all_platforms="${all_platforms} x86_64-win64-vs8" ...@@ -140,6 +142,7 @@ all_platforms="${all_platforms} x86_64-win64-vs8"
all_platforms="${all_platforms} x86_64-win64-vs9" all_platforms="${all_platforms} x86_64-win64-vs9"
all_platforms="${all_platforms} x86_64-win64-vs10" all_platforms="${all_platforms} x86_64-win64-vs10"
all_platforms="${all_platforms} x86_64-win64-vs11" all_platforms="${all_platforms} x86_64-win64-vs11"
all_platforms="${all_platforms} x86_64-win64-vs12"
all_platforms="${all_platforms} universal-darwin8-gcc" all_platforms="${all_platforms} universal-darwin8-gcc"
all_platforms="${all_platforms} universal-darwin9-gcc" all_platforms="${all_platforms} universal-darwin9-gcc"
all_platforms="${all_platforms} universal-darwin10-gcc" all_platforms="${all_platforms} universal-darwin10-gcc"
...@@ -670,7 +673,7 @@ process_toolchain() { ...@@ -670,7 +673,7 @@ process_toolchain() {
VCPROJ_SFX=vcproj VCPROJ_SFX=vcproj
gen_vcproj_cmd=${source_path}/build/make/gen_msvs_proj.sh gen_vcproj_cmd=${source_path}/build/make/gen_msvs_proj.sh
;; ;;
10|11) 10|11|12)
VCPROJ_SFX=vcxproj VCPROJ_SFX=vcxproj
gen_vcproj_cmd=${source_path}/build/make/gen_msvs_vcxproj.sh gen_vcproj_cmd=${source_path}/build/make/gen_msvs_vcxproj.sh
;; ;;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment