equal
deleted
inserted
replaced
31 BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(VS100BASE) |
31 BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(VS100BASE) |
32 if test -d "$VS100BASE"; then |
32 if test -d "$VS100BASE"; then |
33 if test -f "$VS100BASE/$VCVARSFILE"; then |
33 if test -f "$VS100BASE/$VCVARSFILE"; then |
34 AC_MSG_NOTICE([Found Visual Studio installation at $VS100BASE using $METHOD]) |
34 AC_MSG_NOTICE([Found Visual Studio installation at $VS100BASE using $METHOD]) |
35 VS_ENV_CMD="$VS100BASE/$VCVARSFILE" |
35 VS_ENV_CMD="$VS100BASE/$VCVARSFILE" |
|
36 # PLATFORM_TOOLSET is used during the compilation of the freetype sources (see |
|
37 # 'LIB_BUILD_FREETYPE' in libraries.m4) and must be one of 'v100', 'v110' or 'v120' for VS 2010, 2012 or VS2013 |
|
38 # TODO: improve detection for other versions of VS |
|
39 PLATFORM_TOOLSET="v100" |
36 else |
40 else |
37 AC_MSG_NOTICE([Found Visual Studio installation at $VS100BASE using $METHOD]) |
41 AC_MSG_NOTICE([Found Visual Studio installation at $VS100BASE using $METHOD]) |
38 AC_MSG_NOTICE([Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring]) |
42 AC_MSG_NOTICE([Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring]) |
39 fi |
43 fi |
40 fi |
44 fi |
59 if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then |
63 if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then |
60 VS_ENV_ARGS="/x86" |
64 VS_ENV_ARGS="/x86" |
61 else |
65 else |
62 VS_ENV_ARGS="/x64" |
66 VS_ENV_ARGS="/x64" |
63 fi |
67 fi |
|
68 # PLATFORM_TOOLSET is used during the compilation of the freetype sources (see |
|
69 # 'LIB_BUILD_FREETYPE' in libraries.m4) and must be 'Windows7.1SDK' for Windows7.1SDK |
|
70 # TODO: improve detection for other versions of SDK |
|
71 PLATFORM_TOOLSET="Windows7.1SDK" |
64 else |
72 else |
65 AC_MSG_NOTICE([Found Windows SDK installation at $WIN_SDK_BASE using $METHOD]) |
73 AC_MSG_NOTICE([Found Windows SDK installation at $WIN_SDK_BASE using $METHOD]) |
66 AC_MSG_NOTICE([Warning: Installation is broken, SetEnv.Cmd is missing. Ignoring]) |
74 AC_MSG_NOTICE([Warning: Installation is broken, SetEnv.Cmd is missing. Ignoring]) |
67 fi |
75 fi |
68 fi |
76 fi |