Mercurial > jdk8-mips64-public / changeset
changeset
8008022: Upgrade Direct X SDK used to build JDK
Thu, 12 Sep 2013 12:12:13 +0200
- author
- vadim
- date
- Thu, 12 Sep 2013 12:12:13 +0200
- changeset 796
- b1e9396fb8af
- parent 795
- 64f52ef175a4
- child 797
- 69da99676239
8008022: Upgrade Direct X SDK used to build JDK
Reviewed-by: erikj, prr, ihse
1.1 --- a/Makefile Thu Sep 12 10:42:19 2013 +0200 1.2 +++ b/Makefile Thu Sep 12 12:12:13 2013 +0200 1.3 @@ -404,7 +404,6 @@ 1.4 CACERTS_FILE.desc = Location of certificates file 1.5 DEVTOOLS_PATH.desc = Directory containing zip and gnumake 1.6 CUPS_HEADERS_PATH.desc = Include directory location for CUPS header files 1.7 -DXSDK_PATH.desc = Root directory of DirectX SDK 1.8 1.9 # Make variables to print out (description and value) 1.10 VARIABLE_PRINTVAL_LIST += \ 1.11 @@ -429,17 +428,6 @@ 1.12 VARIABLE_CHECKFIL_LIST += \ 1.13 CACERTS_FILE 1.14 1.15 -# Some are windows specific 1.16 -ifeq ($(PLATFORM), windows) 1.17 - 1.18 -VARIABLE_PRINTVAL_LIST += \ 1.19 - DXSDK_PATH 1.20 - 1.21 -VARIABLE_CHECKDIR_LIST += \ 1.22 - DXSDK_PATH 1.23 - 1.24 -endif 1.25 - 1.26 # For pattern rules below, so all are treated the same 1.27 DO_PRINTVAL_LIST=$(VARIABLE_PRINTVAL_LIST:%=%.printval) 1.28 DO_CHECKDIR_LIST=$(VARIABLE_CHECKDIR_LIST:%=%.checkdir)
2.1 --- a/README-builds.html Thu Sep 12 10:42:19 2013 +0200 2.2 +++ b/README-builds.html Thu Sep 12 12:12:13 2013 +0200 2.3 @@ -444,10 +444,6 @@ 2.4 Install 2.5 <a href="#vs2010">Visual Studio 2010</a> 2.6 </li> 2.7 - <li> 2.8 - Install the 2.9 - <a href="#dxsdk">Microsoft DirectX SDK</a> 2.10 - </li> 2.11 </ul> 2.12 </td> 2.13 <td> 2.14 @@ -972,25 +968,6 @@ 2.15 </td> 2.16 </tr> 2.17 <tr> 2.18 - <td><b><code>--with-dxsdk=</code></b><i>path</i></td> 2.19 - <td> 2.20 - select location of the Windows Direct X SDK install 2.21 - <br> 2.22 - The <a name="dxsdk">Microsoft DirectX 9.0 SDK</a> 2.23 - header files and libraries 2.24 - from the Summer 2004 edition 2.25 - are required for building OpenJDK. 2.26 - This SDK can be downloaded from 2.27 - <a href="http://www.microsoft.com/downloads/details.aspx?FamilyId=FD044A42-9912-42A3-9A9E-D857199F888E&displaylang=en" target="_blank"> 2.28 - Microsoft DirectX 9.0 SDK (Summer 2004)</a>. 2.29 - If the link above becomes obsolete, the SDK can be found from 2.30 - <a href="http://download.microsoft.com" target="_blank">the Microsoft Download Site</a> 2.31 - (search with "DirectX 9.0 SDK Update Summer 2004"). 2.32 - Installation usually will set the environment variable 2.33 - <code>DXSDK_DIR</code> to it's install location. 2.34 - </td> 2.35 - </tr> 2.36 - <tr> 2.37 <td><b><code>--with-freetype=</code></b><i>path</i></td> 2.38 <td> 2.39 select the freetype files to use.
3.1 --- a/common/autoconf/generated-configure.sh Thu Sep 12 10:42:19 2013 +0200 3.2 +++ b/common/autoconf/generated-configure.sh Thu Sep 12 12:12:13 2013 +0200 3.3 @@ -766,8 +766,6 @@ 3.4 BUILD_CXX 3.5 BUILD_CC 3.6 MSVCR_DLL 3.7 -DXSDK_INCLUDE_PATH 3.8 -DXSDK_LIB_PATH 3.9 VS_PATH 3.10 VS_LIB 3.11 VS_INCLUDE 3.12 @@ -1035,9 +1033,6 @@ 3.13 with_override_jdk 3.14 with_import_hotspot 3.15 with_msvcr_dll 3.16 -with_dxsdk 3.17 -with_dxsdk_lib 3.18 -with_dxsdk_include 3.19 with_jtreg 3.20 with_extra_cflags 3.21 with_extra_cxxflags 3.22 @@ -1792,11 +1787,6 @@ 3.23 source 3.24 --with-msvcr-dll copy this msvcr100.dll into the built JDK (Windows 3.25 only) [probed] 3.26 - --with-dxsdk the DirectX SDK (Windows only) [probed] 3.27 - --with-dxsdk-lib the DirectX SDK lib directory (Windows only) 3.28 - [probed] 3.29 - --with-dxsdk-include the DirectX SDK include directory (Windows only) 3.30 - [probed] 3.31 --with-jtreg Regression Test Harness [probed] 3.32 --with-extra-cflags extra flags to be used when compiling jdk c-files 3.33 --with-extra-cxxflags extra flags to be used when compiling jdk c++-files 3.34 @@ -3807,10 +3797,6 @@ 3.35 3.36 3.37 3.38 -# Setup the DXSDK paths 3.39 - 3.40 - 3.41 - 3.42 3.43 3.44 3.45 @@ -3820,7 +3806,7 @@ 3.46 #CUSTOM_AUTOCONF_INCLUDE 3.47 3.48 # Do not change or remove the following line, it is needed for consistency checks: 3.49 -DATE_WHEN_GENERATED=1378975246 3.50 +DATE_WHEN_GENERATED=1378980507 3.51 3.52 ############################################################################### 3.53 # 3.54 @@ -17599,441 +17585,6 @@ 3.55 fi 3.56 3.57 3.58 - 3.59 - 3.60 -# Check whether --with-dxsdk was given. 3.61 -if test "${with_dxsdk+set}" = set; then : 3.62 - withval=$with_dxsdk; 3.63 -fi 3.64 - 3.65 - 3.66 -# Check whether --with-dxsdk-lib was given. 3.67 -if test "${with_dxsdk_lib+set}" = set; then : 3.68 - withval=$with_dxsdk_lib; 3.69 -fi 3.70 - 3.71 - 3.72 -# Check whether --with-dxsdk-include was given. 3.73 -if test "${with_dxsdk_include+set}" = set; then : 3.74 - withval=$with_dxsdk_include; 3.75 -fi 3.76 - 3.77 - 3.78 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DirectX SDK" >&5 3.79 -$as_echo_n "checking for DirectX SDK... " >&6; } 3.80 - 3.81 - if test "x$with_dxsdk" != x; then 3.82 - dxsdk_path="$with_dxsdk" 3.83 - elif test "x$DXSDK_DIR" != x; then 3.84 - dxsdk_path="$DXSDK_DIR" 3.85 - elif test -d "C:/DXSDK"; then 3.86 - dxsdk_path="C:/DXSDK" 3.87 - else 3.88 - as_fn_error $? "Could not find the DirectX SDK" "$LINENO" 5 3.89 - fi 3.90 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dxsdk_path" >&5 3.91 -$as_echo "$dxsdk_path" >&6; } 3.92 - 3.93 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.94 - 3.95 - # Input might be given as Windows format, start by converting to 3.96 - # unix format. 3.97 - path="$dxsdk_path" 3.98 - new_path=`$CYGPATH -u "$path"` 3.99 - 3.100 - # Cygwin tries to hide some aspects of the Windows file system, such that binaries are 3.101 - # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered 3.102 - # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then 3.103 - # "foo.exe" is OK but "foo" is an error. 3.104 - # 3.105 - # This test is therefore slightly more accurate than "test -f" to check for file precense. 3.106 - # It is also a way to make sure we got the proper file name for the real test later on. 3.107 - test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null` 3.108 - if test "x$test_shortpath" = x; then 3.109 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of dxsdk_path, which resolves as \"$path\", is invalid." >&5 3.110 -$as_echo "$as_me: The path of dxsdk_path, which resolves as \"$path\", is invalid." >&6;} 3.111 - as_fn_error $? "Cannot locate the the path of dxsdk_path" "$LINENO" 5 3.112 - fi 3.113 - 3.114 - # Call helper function which possibly converts this using DOS-style short mode. 3.115 - # If so, the updated path is stored in $new_path. 3.116 - 3.117 - input_path="$new_path" 3.118 - # Check if we need to convert this using DOS-style short mode. If the path 3.119 - # contains just simple characters, use it. Otherwise (spaces, weird characters), 3.120 - # take no chances and rewrite it. 3.121 - # Note: m4 eats our [], so we need to use [ and ] instead. 3.122 - has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]` 3.123 - if test "x$has_forbidden_chars" != x; then 3.124 - # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \) 3.125 - shortmode_path=`$CYGPATH -s -m -a "$input_path"` 3.126 - path_after_shortmode=`$CYGPATH -u "$shortmode_path"` 3.127 - if test "x$path_after_shortmode" != "x$input_to_shortpath"; then 3.128 - # Going to short mode and back again did indeed matter. Since short mode is 3.129 - # case insensitive, let's make it lowercase to improve readability. 3.130 - shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 3.131 - # Now convert it back to Unix-stile (cygpath) 3.132 - input_path=`$CYGPATH -u "$shortmode_path"` 3.133 - new_path="$input_path" 3.134 - fi 3.135 - fi 3.136 - 3.137 - test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/` 3.138 - if test "x$test_cygdrive_prefix" = x; then 3.139 - # As a simple fix, exclude /usr/bin since it's not a real path. 3.140 - if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then 3.141 - # The path is in a Cygwin special directory (e.g. /home). We need this converted to 3.142 - # a path prefixed by /cygdrive for fixpath to work. 3.143 - new_path="$CYGWIN_ROOT_PATH$input_path" 3.144 - fi 3.145 - fi 3.146 - 3.147 - 3.148 - if test "x$path" != "x$new_path"; then 3.149 - dxsdk_path="$new_path" 3.150 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting dxsdk_path to \"$new_path\"" >&5 3.151 -$as_echo "$as_me: Rewriting dxsdk_path to \"$new_path\"" >&6;} 3.152 - fi 3.153 - 3.154 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.155 - 3.156 - path="$dxsdk_path" 3.157 - has_colon=`$ECHO $path | $GREP ^.:` 3.158 - new_path="$path" 3.159 - if test "x$has_colon" = x; then 3.160 - # Not in mixed or Windows style, start by that. 3.161 - new_path=`cmd //c echo $path` 3.162 - fi 3.163 - 3.164 - 3.165 - input_path="$new_path" 3.166 - # Check if we need to convert this using DOS-style short mode. If the path 3.167 - # contains just simple characters, use it. Otherwise (spaces, weird characters), 3.168 - # take no chances and rewrite it. 3.169 - # Note: m4 eats our [], so we need to use [ and ] instead. 3.170 - has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]` 3.171 - if test "x$has_forbidden_chars" != x; then 3.172 - # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \) 3.173 - new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 3.174 - fi 3.175 - 3.176 - 3.177 - windows_path="$new_path" 3.178 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.179 - unix_path=`$CYGPATH -u "$windows_path"` 3.180 - new_path="$unix_path" 3.181 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.182 - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 3.183 - new_path="$unix_path" 3.184 - fi 3.185 - 3.186 - if test "x$path" != "x$new_path"; then 3.187 - dxsdk_path="$new_path" 3.188 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting dxsdk_path to \"$new_path\"" >&5 3.189 -$as_echo "$as_me: Rewriting dxsdk_path to \"$new_path\"" >&6;} 3.190 - fi 3.191 - 3.192 - # Save the first 10 bytes of this path to the storage, so fixpath can work. 3.193 - all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}") 3.194 - 3.195 - else 3.196 - # We're on a posix platform. Hooray! :) 3.197 - path="$dxsdk_path" 3.198 - has_space=`$ECHO "$path" | $GREP " "` 3.199 - if test "x$has_space" != x; then 3.200 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of dxsdk_path, which resolves as \"$path\", is invalid." >&5 3.201 -$as_echo "$as_me: The path of dxsdk_path, which resolves as \"$path\", is invalid." >&6;} 3.202 - as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 3.203 - fi 3.204 - 3.205 - # Use eval to expand a potential ~ 3.206 - eval path="$path" 3.207 - if test ! -f "$path" && test ! -d "$path"; then 3.208 - as_fn_error $? "The path of dxsdk_path, which resolves as \"$path\", is not found." "$LINENO" 5 3.209 - fi 3.210 - 3.211 - dxsdk_path="`cd "$path"; $THEPWDCMD -L`" 3.212 - fi 3.213 - 3.214 - 3.215 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DirectX SDK lib dir" >&5 3.216 -$as_echo_n "checking for DirectX SDK lib dir... " >&6; } 3.217 - if test "x$with_dxsdk_lib" != x; then 3.218 - DXSDK_LIB_PATH="$with_dxsdk_lib" 3.219 - elif test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then 3.220 - DXSDK_LIB_PATH="$dxsdk_path/Lib/x64" 3.221 - else 3.222 - DXSDK_LIB_PATH="$dxsdk_path/Lib" 3.223 - fi 3.224 - # dsound.lib is linked to in jsoundds 3.225 - if test ! -f "$DXSDK_LIB_PATH/dsound.lib"; then 3.226 - as_fn_error $? "Invalid DirectX SDK lib dir" "$LINENO" 5 3.227 - fi 3.228 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DXSDK_LIB_PATH" >&5 3.229 -$as_echo "$DXSDK_LIB_PATH" >&6; } 3.230 - 3.231 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.232 - 3.233 - # Input might be given as Windows format, start by converting to 3.234 - # unix format. 3.235 - path="$DXSDK_LIB_PATH" 3.236 - new_path=`$CYGPATH -u "$path"` 3.237 - 3.238 - # Cygwin tries to hide some aspects of the Windows file system, such that binaries are 3.239 - # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered 3.240 - # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then 3.241 - # "foo.exe" is OK but "foo" is an error. 3.242 - # 3.243 - # This test is therefore slightly more accurate than "test -f" to check for file precense. 3.244 - # It is also a way to make sure we got the proper file name for the real test later on. 3.245 - test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null` 3.246 - if test "x$test_shortpath" = x; then 3.247 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of DXSDK_LIB_PATH, which resolves as \"$path\", is invalid." >&5 3.248 -$as_echo "$as_me: The path of DXSDK_LIB_PATH, which resolves as \"$path\", is invalid." >&6;} 3.249 - as_fn_error $? "Cannot locate the the path of DXSDK_LIB_PATH" "$LINENO" 5 3.250 - fi 3.251 - 3.252 - # Call helper function which possibly converts this using DOS-style short mode. 3.253 - # If so, the updated path is stored in $new_path. 3.254 - 3.255 - input_path="$new_path" 3.256 - # Check if we need to convert this using DOS-style short mode. If the path 3.257 - # contains just simple characters, use it. Otherwise (spaces, weird characters), 3.258 - # take no chances and rewrite it. 3.259 - # Note: m4 eats our [], so we need to use [ and ] instead. 3.260 - has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]` 3.261 - if test "x$has_forbidden_chars" != x; then 3.262 - # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \) 3.263 - shortmode_path=`$CYGPATH -s -m -a "$input_path"` 3.264 - path_after_shortmode=`$CYGPATH -u "$shortmode_path"` 3.265 - if test "x$path_after_shortmode" != "x$input_to_shortpath"; then 3.266 - # Going to short mode and back again did indeed matter. Since short mode is 3.267 - # case insensitive, let's make it lowercase to improve readability. 3.268 - shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 3.269 - # Now convert it back to Unix-stile (cygpath) 3.270 - input_path=`$CYGPATH -u "$shortmode_path"` 3.271 - new_path="$input_path" 3.272 - fi 3.273 - fi 3.274 - 3.275 - test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/` 3.276 - if test "x$test_cygdrive_prefix" = x; then 3.277 - # As a simple fix, exclude /usr/bin since it's not a real path. 3.278 - if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then 3.279 - # The path is in a Cygwin special directory (e.g. /home). We need this converted to 3.280 - # a path prefixed by /cygdrive for fixpath to work. 3.281 - new_path="$CYGWIN_ROOT_PATH$input_path" 3.282 - fi 3.283 - fi 3.284 - 3.285 - 3.286 - if test "x$path" != "x$new_path"; then 3.287 - DXSDK_LIB_PATH="$new_path" 3.288 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting DXSDK_LIB_PATH to \"$new_path\"" >&5 3.289 -$as_echo "$as_me: Rewriting DXSDK_LIB_PATH to \"$new_path\"" >&6;} 3.290 - fi 3.291 - 3.292 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.293 - 3.294 - path="$DXSDK_LIB_PATH" 3.295 - has_colon=`$ECHO $path | $GREP ^.:` 3.296 - new_path="$path" 3.297 - if test "x$has_colon" = x; then 3.298 - # Not in mixed or Windows style, start by that. 3.299 - new_path=`cmd //c echo $path` 3.300 - fi 3.301 - 3.302 - 3.303 - input_path="$new_path" 3.304 - # Check if we need to convert this using DOS-style short mode. If the path 3.305 - # contains just simple characters, use it. Otherwise (spaces, weird characters), 3.306 - # take no chances and rewrite it. 3.307 - # Note: m4 eats our [], so we need to use [ and ] instead. 3.308 - has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]` 3.309 - if test "x$has_forbidden_chars" != x; then 3.310 - # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \) 3.311 - new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 3.312 - fi 3.313 - 3.314 - 3.315 - windows_path="$new_path" 3.316 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.317 - unix_path=`$CYGPATH -u "$windows_path"` 3.318 - new_path="$unix_path" 3.319 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.320 - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 3.321 - new_path="$unix_path" 3.322 - fi 3.323 - 3.324 - if test "x$path" != "x$new_path"; then 3.325 - DXSDK_LIB_PATH="$new_path" 3.326 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting DXSDK_LIB_PATH to \"$new_path\"" >&5 3.327 -$as_echo "$as_me: Rewriting DXSDK_LIB_PATH to \"$new_path\"" >&6;} 3.328 - fi 3.329 - 3.330 - # Save the first 10 bytes of this path to the storage, so fixpath can work. 3.331 - all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}") 3.332 - 3.333 - else 3.334 - # We're on a posix platform. Hooray! :) 3.335 - path="$DXSDK_LIB_PATH" 3.336 - has_space=`$ECHO "$path" | $GREP " "` 3.337 - if test "x$has_space" != x; then 3.338 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of DXSDK_LIB_PATH, which resolves as \"$path\", is invalid." >&5 3.339 -$as_echo "$as_me: The path of DXSDK_LIB_PATH, which resolves as \"$path\", is invalid." >&6;} 3.340 - as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 3.341 - fi 3.342 - 3.343 - # Use eval to expand a potential ~ 3.344 - eval path="$path" 3.345 - if test ! -f "$path" && test ! -d "$path"; then 3.346 - as_fn_error $? "The path of DXSDK_LIB_PATH, which resolves as \"$path\", is not found." "$LINENO" 5 3.347 - fi 3.348 - 3.349 - DXSDK_LIB_PATH="`cd "$path"; $THEPWDCMD -L`" 3.350 - fi 3.351 - 3.352 - 3.353 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DirectX SDK include dir" >&5 3.354 -$as_echo_n "checking for DirectX SDK include dir... " >&6; } 3.355 - if test "x$with_dxsdk_include" != x; then 3.356 - DXSDK_INCLUDE_PATH="$with_dxsdk_include" 3.357 - else 3.358 - DXSDK_INCLUDE_PATH="$dxsdk_path/Include" 3.359 - fi 3.360 - # dsound.h is included in jsoundds 3.361 - if test ! -f "$DXSDK_INCLUDE_PATH/dsound.h"; then 3.362 - as_fn_error $? "Invalid DirectX SDK lib dir" "$LINENO" 5 3.363 - fi 3.364 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DXSDK_INCLUDE_PATH" >&5 3.365 -$as_echo "$DXSDK_INCLUDE_PATH" >&6; } 3.366 - 3.367 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.368 - 3.369 - # Input might be given as Windows format, start by converting to 3.370 - # unix format. 3.371 - path="$DXSDK_INCLUDE_PATH" 3.372 - new_path=`$CYGPATH -u "$path"` 3.373 - 3.374 - # Cygwin tries to hide some aspects of the Windows file system, such that binaries are 3.375 - # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered 3.376 - # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then 3.377 - # "foo.exe" is OK but "foo" is an error. 3.378 - # 3.379 - # This test is therefore slightly more accurate than "test -f" to check for file precense. 3.380 - # It is also a way to make sure we got the proper file name for the real test later on. 3.381 - test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null` 3.382 - if test "x$test_shortpath" = x; then 3.383 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of DXSDK_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5 3.384 -$as_echo "$as_me: The path of DXSDK_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;} 3.385 - as_fn_error $? "Cannot locate the the path of DXSDK_INCLUDE_PATH" "$LINENO" 5 3.386 - fi 3.387 - 3.388 - # Call helper function which possibly converts this using DOS-style short mode. 3.389 - # If so, the updated path is stored in $new_path. 3.390 - 3.391 - input_path="$new_path" 3.392 - # Check if we need to convert this using DOS-style short mode. If the path 3.393 - # contains just simple characters, use it. Otherwise (spaces, weird characters), 3.394 - # take no chances and rewrite it. 3.395 - # Note: m4 eats our [], so we need to use [ and ] instead. 3.396 - has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]` 3.397 - if test "x$has_forbidden_chars" != x; then 3.398 - # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \) 3.399 - shortmode_path=`$CYGPATH -s -m -a "$input_path"` 3.400 - path_after_shortmode=`$CYGPATH -u "$shortmode_path"` 3.401 - if test "x$path_after_shortmode" != "x$input_to_shortpath"; then 3.402 - # Going to short mode and back again did indeed matter. Since short mode is 3.403 - # case insensitive, let's make it lowercase to improve readability. 3.404 - shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 3.405 - # Now convert it back to Unix-stile (cygpath) 3.406 - input_path=`$CYGPATH -u "$shortmode_path"` 3.407 - new_path="$input_path" 3.408 - fi 3.409 - fi 3.410 - 3.411 - test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/` 3.412 - if test "x$test_cygdrive_prefix" = x; then 3.413 - # As a simple fix, exclude /usr/bin since it's not a real path. 3.414 - if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then 3.415 - # The path is in a Cygwin special directory (e.g. /home). We need this converted to 3.416 - # a path prefixed by /cygdrive for fixpath to work. 3.417 - new_path="$CYGWIN_ROOT_PATH$input_path" 3.418 - fi 3.419 - fi 3.420 - 3.421 - 3.422 - if test "x$path" != "x$new_path"; then 3.423 - DXSDK_INCLUDE_PATH="$new_path" 3.424 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting DXSDK_INCLUDE_PATH to \"$new_path\"" >&5 3.425 -$as_echo "$as_me: Rewriting DXSDK_INCLUDE_PATH to \"$new_path\"" >&6;} 3.426 - fi 3.427 - 3.428 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.429 - 3.430 - path="$DXSDK_INCLUDE_PATH" 3.431 - has_colon=`$ECHO $path | $GREP ^.:` 3.432 - new_path="$path" 3.433 - if test "x$has_colon" = x; then 3.434 - # Not in mixed or Windows style, start by that. 3.435 - new_path=`cmd //c echo $path` 3.436 - fi 3.437 - 3.438 - 3.439 - input_path="$new_path" 3.440 - # Check if we need to convert this using DOS-style short mode. If the path 3.441 - # contains just simple characters, use it. Otherwise (spaces, weird characters), 3.442 - # take no chances and rewrite it. 3.443 - # Note: m4 eats our [], so we need to use [ and ] instead. 3.444 - has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]` 3.445 - if test "x$has_forbidden_chars" != x; then 3.446 - # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \) 3.447 - new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 3.448 - fi 3.449 - 3.450 - 3.451 - windows_path="$new_path" 3.452 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.453 - unix_path=`$CYGPATH -u "$windows_path"` 3.454 - new_path="$unix_path" 3.455 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.456 - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 3.457 - new_path="$unix_path" 3.458 - fi 3.459 - 3.460 - if test "x$path" != "x$new_path"; then 3.461 - DXSDK_INCLUDE_PATH="$new_path" 3.462 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting DXSDK_INCLUDE_PATH to \"$new_path\"" >&5 3.463 -$as_echo "$as_me: Rewriting DXSDK_INCLUDE_PATH to \"$new_path\"" >&6;} 3.464 - fi 3.465 - 3.466 - # Save the first 10 bytes of this path to the storage, so fixpath can work. 3.467 - all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}") 3.468 - 3.469 - else 3.470 - # We're on a posix platform. Hooray! :) 3.471 - path="$DXSDK_INCLUDE_PATH" 3.472 - has_space=`$ECHO "$path" | $GREP " "` 3.473 - if test "x$has_space" != x; then 3.474 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of DXSDK_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5 3.475 -$as_echo "$as_me: The path of DXSDK_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;} 3.476 - as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 3.477 - fi 3.478 - 3.479 - # Use eval to expand a potential ~ 3.480 - eval path="$path" 3.481 - if test ! -f "$path" && test ! -d "$path"; then 3.482 - as_fn_error $? "The path of DXSDK_INCLUDE_PATH, which resolves as \"$path\", is not found." "$LINENO" 5 3.483 - fi 3.484 - 3.485 - DXSDK_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`" 3.486 - fi 3.487 - 3.488 - 3.489 - 3.490 - 3.491 - LDFLAGS_JDK="$LDFLAGS_JDK -libpath:$DXSDK_LIB_PATH" 3.492 - 3.493 fi 3.494 3.495
4.1 --- a/common/autoconf/spec.gmk.in Thu Sep 12 10:42:19 2013 +0200 4.2 +++ b/common/autoconf/spec.gmk.in Thu Sep 12 12:12:13 2013 +0200 4.3 @@ -291,10 +291,6 @@ 4.4 X_LIBS:=@X_LIBS@ 4.5 OPENWIN_HOME:=@OPENWIN_HOME@ 4.6 4.7 -# DirectX SDK 4.8 -DXSDK_LIB_PATH=@DXSDK_LIB_PATH@ 4.9 -DXSDK_INCLUDE_PATH=@DXSDK_INCLUDE_PATH@ 4.10 - 4.11 # The lowest required version of macosx to enforce compatiblity for 4.12 MACOSX_VERSION_MIN=@MACOSX_VERSION_MIN@ 4.13
5.1 --- a/common/autoconf/toolchain.m4 Thu Sep 12 10:42:19 2013 +0200 5.2 +++ b/common/autoconf/toolchain.m4 Thu Sep 12 12:12:13 2013 +0200 5.3 @@ -176,7 +176,6 @@ 5.4 [ 5.5 if test "x$OPENJDK_TARGET_OS" = "xwindows"; then 5.6 TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV 5.7 - TOOLCHAIN_SETUP_DXSDK 5.8 fi 5.9 5.10 AC_SUBST(MSVCR_DLL)
6.1 --- a/common/autoconf/toolchain_windows.m4 Thu Sep 12 10:42:19 2013 +0200 6.2 +++ b/common/autoconf/toolchain_windows.m4 Thu Sep 12 12:12:13 2013 +0200 6.3 @@ -277,61 +277,3 @@ 6.4 AC_MSG_RESULT([$MSVCR_DLL]) 6.5 BASIC_FIXUP_PATH(MSVCR_DLL) 6.6 ]) 6.7 - 6.8 - 6.9 -# Setup the DXSDK paths 6.10 -AC_DEFUN([TOOLCHAIN_SETUP_DXSDK], 6.11 -[ 6.12 - AC_ARG_WITH(dxsdk, [AS_HELP_STRING([--with-dxsdk], 6.13 - [the DirectX SDK (Windows only) @<:@probed@:>@])]) 6.14 - AC_ARG_WITH(dxsdk-lib, [AS_HELP_STRING([--with-dxsdk-lib], 6.15 - [the DirectX SDK lib directory (Windows only) @<:@probed@:>@])]) 6.16 - AC_ARG_WITH(dxsdk-include, [AS_HELP_STRING([--with-dxsdk-include], 6.17 - [the DirectX SDK include directory (Windows only) @<:@probed@:>@])]) 6.18 - 6.19 - AC_MSG_CHECKING([for DirectX SDK]) 6.20 - 6.21 - if test "x$with_dxsdk" != x; then 6.22 - dxsdk_path="$with_dxsdk" 6.23 - elif test "x$DXSDK_DIR" != x; then 6.24 - dxsdk_path="$DXSDK_DIR" 6.25 - elif test -d "C:/DXSDK"; then 6.26 - dxsdk_path="C:/DXSDK" 6.27 - else 6.28 - AC_MSG_ERROR([Could not find the DirectX SDK]) 6.29 - fi 6.30 - AC_MSG_RESULT([$dxsdk_path]) 6.31 - BASIC_FIXUP_PATH(dxsdk_path) 6.32 - 6.33 - AC_MSG_CHECKING([for DirectX SDK lib dir]) 6.34 - if test "x$with_dxsdk_lib" != x; then 6.35 - DXSDK_LIB_PATH="$with_dxsdk_lib" 6.36 - elif test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then 6.37 - DXSDK_LIB_PATH="$dxsdk_path/Lib/x64" 6.38 - else 6.39 - DXSDK_LIB_PATH="$dxsdk_path/Lib" 6.40 - fi 6.41 - # dsound.lib is linked to in jsoundds 6.42 - if test ! -f "$DXSDK_LIB_PATH/dsound.lib"; then 6.43 - AC_MSG_ERROR([Invalid DirectX SDK lib dir]) 6.44 - fi 6.45 - AC_MSG_RESULT([$DXSDK_LIB_PATH]) 6.46 - BASIC_FIXUP_PATH(DXSDK_LIB_PATH) 6.47 - 6.48 - AC_MSG_CHECKING([for DirectX SDK include dir]) 6.49 - if test "x$with_dxsdk_include" != x; then 6.50 - DXSDK_INCLUDE_PATH="$with_dxsdk_include" 6.51 - else 6.52 - DXSDK_INCLUDE_PATH="$dxsdk_path/Include" 6.53 - fi 6.54 - # dsound.h is included in jsoundds 6.55 - if test ! -f "$DXSDK_INCLUDE_PATH/dsound.h"; then 6.56 - AC_MSG_ERROR([Invalid DirectX SDK lib dir]) 6.57 - fi 6.58 - AC_MSG_RESULT([$DXSDK_INCLUDE_PATH]) 6.59 - BASIC_FIXUP_PATH(DXSDK_INCLUDE_PATH) 6.60 - 6.61 - AC_SUBST(DXSDK_LIB_PATH) 6.62 - AC_SUBST(DXSDK_INCLUDE_PATH) 6.63 - LDFLAGS_JDK="$LDFLAGS_JDK -libpath:$DXSDK_LIB_PATH" 6.64 -])
