commit bd91bebe480b304b01b0f6fe7d83df440aef7967
author Martin Storsjo <martin@martin.st> Fri May 17 00:57:57 2013 +0300
committer Martin Storsjo <martin@martin.st> Tue May 21 09:57:02 2013 +0300
tree 31bf20f758baeb824bd1f97972d0f23ee5599e4b
parent cbc8089a1e313a54cdec460f223b798b8def03a9

configure: Add x86*-vs10/11 targets

Change-Id: I4be8ca12ccdce86d1409b7121cff94b4784ab31c

build/make/configure.sh

diff --git a/build/make/configure.sh b/build/make/configure.sh
index 7070ec0..5c38c81 100755
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -416,6 +416,7 @@
 BUILD_PFX=${BUILD_PFX}
 TOOLCHAIN=${toolchain}
 ASM_CONVERSION=${asm_conversion_cmd:-${source_path}/build/make/ads2gas.pl}
+GEN_VCPROJ=${gen_vcproj_cmd}
 
 CC=${CC}
 CXX=${CXX}
@@ -433,6 +434,7 @@
 extralibs = ${extralibs}
 AS_SFX    = ${AS_SFX:-.asm}
 EXE_SFX   = ${EXE_SFX}
+VCPROJ_SFX = ${VCPROJ_SFX}
 RTCD_OPTIONS = ${RTCD_OPTIONS}
 EOF
 

configure

diff --git a/configure b/configure
index f10e6ad..eda16e6 100755
--- a/configure
+++ b/configure
@@ -122,6 +122,8 @@
 all_platforms="${all_platforms} x86-win32-vs7"
 all_platforms="${all_platforms} x86-win32-vs8"
 all_platforms="${all_platforms} x86-win32-vs9"
+all_platforms="${all_platforms} x86-win32-vs10"
+all_platforms="${all_platforms} x86-win32-vs11"
 all_platforms="${all_platforms} x86_64-darwin9-gcc"
 all_platforms="${all_platforms} x86_64-darwin10-gcc"
 all_platforms="${all_platforms} x86_64-darwin11-gcc"
@@ -132,6 +134,8 @@
 all_platforms="${all_platforms} x86_64-win64-gcc"
 all_platforms="${all_platforms} x86_64-win64-vs8"
 all_platforms="${all_platforms} x86_64-win64-vs9"
+all_platforms="${all_platforms} x86_64-win64-vs10"
+all_platforms="${all_platforms} x86_64-win64-vs11"
 all_platforms="${all_platforms} universal-darwin8-gcc"
 all_platforms="${all_platforms} universal-darwin9-gcc"
 all_platforms="${all_platforms} universal-darwin10-gcc"
@@ -648,6 +652,16 @@
         vs*) enable msvs
              enable solution
              vs_version=${tgt_cc##vs}
+             case $vs_version in
+             [789])
+                 VCPROJ_SFX=vcproj
+                 gen_vcproj_cmd=${source_path}/build/make/gen_msvs_proj.sh
+                 ;;
+             10|11)
+                 VCPROJ_SFX=vcxproj
+                 gen_vcproj_cmd=${source_path}/build/make/gen_msvs_vcxproj.sh
+                 ;;
+             esac
              all_targets="${all_targets} solution"
              INLINE="__forceinline"
         ;;