8008022: Upgrade Direct X SDK used to build JDK
Reviewed-by: erikj, prr, ihse
This commit is contained in:
parent
df8c6df8a8
commit
57ed4a7edf
12
Makefile
12
Makefile
@ -404,7 +404,6 @@ COMPILER_PATH.desc = Compiler install directory
|
|||||||
CACERTS_FILE.desc = Location of certificates file
|
CACERTS_FILE.desc = Location of certificates file
|
||||||
DEVTOOLS_PATH.desc = Directory containing zip and gnumake
|
DEVTOOLS_PATH.desc = Directory containing zip and gnumake
|
||||||
CUPS_HEADERS_PATH.desc = Include directory location for CUPS header files
|
CUPS_HEADERS_PATH.desc = Include directory location for CUPS header files
|
||||||
DXSDK_PATH.desc = Root directory of DirectX SDK
|
|
||||||
|
|
||||||
# Make variables to print out (description and value)
|
# Make variables to print out (description and value)
|
||||||
VARIABLE_PRINTVAL_LIST += \
|
VARIABLE_PRINTVAL_LIST += \
|
||||||
@ -429,17 +428,6 @@ VARIABLE_CHECKDIR_LIST += \
|
|||||||
VARIABLE_CHECKFIL_LIST += \
|
VARIABLE_CHECKFIL_LIST += \
|
||||||
CACERTS_FILE
|
CACERTS_FILE
|
||||||
|
|
||||||
# Some are windows specific
|
|
||||||
ifeq ($(PLATFORM), windows)
|
|
||||||
|
|
||||||
VARIABLE_PRINTVAL_LIST += \
|
|
||||||
DXSDK_PATH
|
|
||||||
|
|
||||||
VARIABLE_CHECKDIR_LIST += \
|
|
||||||
DXSDK_PATH
|
|
||||||
|
|
||||||
endif
|
|
||||||
|
|
||||||
# For pattern rules below, so all are treated the same
|
# For pattern rules below, so all are treated the same
|
||||||
DO_PRINTVAL_LIST=$(VARIABLE_PRINTVAL_LIST:%=%.printval)
|
DO_PRINTVAL_LIST=$(VARIABLE_PRINTVAL_LIST:%=%.printval)
|
||||||
DO_CHECKDIR_LIST=$(VARIABLE_CHECKDIR_LIST:%=%.checkdir)
|
DO_CHECKDIR_LIST=$(VARIABLE_CHECKDIR_LIST:%=%.checkdir)
|
||||||
|
@ -444,10 +444,6 @@
|
|||||||
Install
|
Install
|
||||||
<a href="#vs2010">Visual Studio 2010</a>
|
<a href="#vs2010">Visual Studio 2010</a>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
|
||||||
Install the
|
|
||||||
<a href="#dxsdk">Microsoft DirectX SDK</a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
</ul>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
@ -971,25 +967,6 @@
|
|||||||
developer install location
|
developer install location
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
|
||||||
<td><b><code>--with-dxsdk=</code></b><i>path</i></td>
|
|
||||||
<td>
|
|
||||||
select location of the Windows Direct X SDK install
|
|
||||||
<br>
|
|
||||||
The <a name="dxsdk">Microsoft DirectX 9.0 SDK</a>
|
|
||||||
header files and libraries
|
|
||||||
from the Summer 2004 edition
|
|
||||||
are required for building OpenJDK.
|
|
||||||
This SDK can be downloaded from
|
|
||||||
<a href="http://www.microsoft.com/downloads/details.aspx?FamilyId=FD044A42-9912-42A3-9A9E-D857199F888E&displaylang=en" target="_blank">
|
|
||||||
Microsoft DirectX 9.0 SDK (Summer 2004)</a>.
|
|
||||||
If the link above becomes obsolete, the SDK can be found from
|
|
||||||
<a href="http://download.microsoft.com" target="_blank">the Microsoft Download Site</a>
|
|
||||||
(search with "DirectX 9.0 SDK Update Summer 2004").
|
|
||||||
Installation usually will set the environment variable
|
|
||||||
<code>DXSDK_DIR</code> to it's install location.
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
<tr>
|
||||||
<td><b><code>--with-freetype=</code></b><i>path</i></td>
|
<td><b><code>--with-freetype=</code></b><i>path</i></td>
|
||||||
<td>
|
<td>
|
||||||
|
@ -766,8 +766,6 @@ BUILD_LD
|
|||||||
BUILD_CXX
|
BUILD_CXX
|
||||||
BUILD_CC
|
BUILD_CC
|
||||||
MSVCR_DLL
|
MSVCR_DLL
|
||||||
DXSDK_INCLUDE_PATH
|
|
||||||
DXSDK_LIB_PATH
|
|
||||||
VS_PATH
|
VS_PATH
|
||||||
VS_LIB
|
VS_LIB
|
||||||
VS_INCLUDE
|
VS_INCLUDE
|
||||||
@ -1035,9 +1033,6 @@ with_override_nashorn
|
|||||||
with_override_jdk
|
with_override_jdk
|
||||||
with_import_hotspot
|
with_import_hotspot
|
||||||
with_msvcr_dll
|
with_msvcr_dll
|
||||||
with_dxsdk
|
|
||||||
with_dxsdk_lib
|
|
||||||
with_dxsdk_include
|
|
||||||
with_jtreg
|
with_jtreg
|
||||||
with_extra_cflags
|
with_extra_cflags
|
||||||
with_extra_cxxflags
|
with_extra_cxxflags
|
||||||
@ -1792,11 +1787,6 @@ Optional Packages:
|
|||||||
source
|
source
|
||||||
--with-msvcr-dll copy this msvcr100.dll into the built JDK (Windows
|
--with-msvcr-dll copy this msvcr100.dll into the built JDK (Windows
|
||||||
only) [probed]
|
only) [probed]
|
||||||
--with-dxsdk the DirectX SDK (Windows only) [probed]
|
|
||||||
--with-dxsdk-lib the DirectX SDK lib directory (Windows only)
|
|
||||||
[probed]
|
|
||||||
--with-dxsdk-include the DirectX SDK include directory (Windows only)
|
|
||||||
[probed]
|
|
||||||
--with-jtreg Regression Test Harness [probed]
|
--with-jtreg Regression Test Harness [probed]
|
||||||
--with-extra-cflags extra flags to be used when compiling jdk c-files
|
--with-extra-cflags extra flags to be used when compiling jdk c-files
|
||||||
--with-extra-cxxflags extra flags to be used when compiling jdk c++-files
|
--with-extra-cxxflags extra flags to be used when compiling jdk c++-files
|
||||||
@ -3807,10 +3797,6 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Setup the DXSDK paths
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -3820,7 +3806,7 @@ fi
|
|||||||
#CUSTOM_AUTOCONF_INCLUDE
|
#CUSTOM_AUTOCONF_INCLUDE
|
||||||
|
|
||||||
# Do not change or remove the following line, it is needed for consistency checks:
|
# Do not change or remove the following line, it is needed for consistency checks:
|
||||||
DATE_WHEN_GENERATED=1378975246
|
DATE_WHEN_GENERATED=1378980507
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
#
|
#
|
||||||
@ -17599,441 +17585,6 @@ $as_echo "$as_me: The path of MSVCR_DLL, which resolves as \"$path\", is invalid
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Check whether --with-dxsdk was given.
|
|
||||||
if test "${with_dxsdk+set}" = set; then :
|
|
||||||
withval=$with_dxsdk;
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
# Check whether --with-dxsdk-lib was given.
|
|
||||||
if test "${with_dxsdk_lib+set}" = set; then :
|
|
||||||
withval=$with_dxsdk_lib;
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
# Check whether --with-dxsdk-include was given.
|
|
||||||
if test "${with_dxsdk_include+set}" = set; then :
|
|
||||||
withval=$with_dxsdk_include;
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DirectX SDK" >&5
|
|
||||||
$as_echo_n "checking for DirectX SDK... " >&6; }
|
|
||||||
|
|
||||||
if test "x$with_dxsdk" != x; then
|
|
||||||
dxsdk_path="$with_dxsdk"
|
|
||||||
elif test "x$DXSDK_DIR" != x; then
|
|
||||||
dxsdk_path="$DXSDK_DIR"
|
|
||||||
elif test -d "C:/DXSDK"; then
|
|
||||||
dxsdk_path="C:/DXSDK"
|
|
||||||
else
|
|
||||||
as_fn_error $? "Could not find the DirectX SDK" "$LINENO" 5
|
|
||||||
fi
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dxsdk_path" >&5
|
|
||||||
$as_echo "$dxsdk_path" >&6; }
|
|
||||||
|
|
||||||
if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
|
|
||||||
|
|
||||||
# Input might be given as Windows format, start by converting to
|
|
||||||
# unix format.
|
|
||||||
path="$dxsdk_path"
|
|
||||||
new_path=`$CYGPATH -u "$path"`
|
|
||||||
|
|
||||||
# Cygwin tries to hide some aspects of the Windows file system, such that binaries are
|
|
||||||
# named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
|
|
||||||
# the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
|
|
||||||
# "foo.exe" is OK but "foo" is an error.
|
|
||||||
#
|
|
||||||
# This test is therefore slightly more accurate than "test -f" to check for file precense.
|
|
||||||
# It is also a way to make sure we got the proper file name for the real test later on.
|
|
||||||
test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
|
|
||||||
if test "x$test_shortpath" = x; then
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: The path of dxsdk_path, which resolves as \"$path\", is invalid." >&5
|
|
||||||
$as_echo "$as_me: The path of dxsdk_path, which resolves as \"$path\", is invalid." >&6;}
|
|
||||||
as_fn_error $? "Cannot locate the the path of dxsdk_path" "$LINENO" 5
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Call helper function which possibly converts this using DOS-style short mode.
|
|
||||||
# If so, the updated path is stored in $new_path.
|
|
||||||
|
|
||||||
input_path="$new_path"
|
|
||||||
# Check if we need to convert this using DOS-style short mode. If the path
|
|
||||||
# contains just simple characters, use it. Otherwise (spaces, weird characters),
|
|
||||||
# take no chances and rewrite it.
|
|
||||||
# Note: m4 eats our [], so we need to use [ and ] instead.
|
|
||||||
has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
|
|
||||||
if test "x$has_forbidden_chars" != x; then
|
|
||||||
# Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
|
|
||||||
shortmode_path=`$CYGPATH -s -m -a "$input_path"`
|
|
||||||
path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
|
|
||||||
if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
|
|
||||||
# Going to short mode and back again did indeed matter. Since short mode is
|
|
||||||
# case insensitive, let's make it lowercase to improve readability.
|
|
||||||
shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
|
|
||||||
# Now convert it back to Unix-stile (cygpath)
|
|
||||||
input_path=`$CYGPATH -u "$shortmode_path"`
|
|
||||||
new_path="$input_path"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
|
|
||||||
if test "x$test_cygdrive_prefix" = x; then
|
|
||||||
# As a simple fix, exclude /usr/bin since it's not a real path.
|
|
||||||
if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
|
|
||||||
# The path is in a Cygwin special directory (e.g. /home). We need this converted to
|
|
||||||
# a path prefixed by /cygdrive for fixpath to work.
|
|
||||||
new_path="$CYGWIN_ROOT_PATH$input_path"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
if test "x$path" != "x$new_path"; then
|
|
||||||
dxsdk_path="$new_path"
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting dxsdk_path to \"$new_path\"" >&5
|
|
||||||
$as_echo "$as_me: Rewriting dxsdk_path to \"$new_path\"" >&6;}
|
|
||||||
fi
|
|
||||||
|
|
||||||
elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
|
|
||||||
|
|
||||||
path="$dxsdk_path"
|
|
||||||
has_colon=`$ECHO $path | $GREP ^.:`
|
|
||||||
new_path="$path"
|
|
||||||
if test "x$has_colon" = x; then
|
|
||||||
# Not in mixed or Windows style, start by that.
|
|
||||||
new_path=`cmd //c echo $path`
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
input_path="$new_path"
|
|
||||||
# Check if we need to convert this using DOS-style short mode. If the path
|
|
||||||
# contains just simple characters, use it. Otherwise (spaces, weird characters),
|
|
||||||
# take no chances and rewrite it.
|
|
||||||
# Note: m4 eats our [], so we need to use [ and ] instead.
|
|
||||||
has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
|
|
||||||
if test "x$has_forbidden_chars" != x; then
|
|
||||||
# Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
|
|
||||||
new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
windows_path="$new_path"
|
|
||||||
if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
|
|
||||||
unix_path=`$CYGPATH -u "$windows_path"`
|
|
||||||
new_path="$unix_path"
|
|
||||||
elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
|
|
||||||
unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
|
|
||||||
new_path="$unix_path"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "x$path" != "x$new_path"; then
|
|
||||||
dxsdk_path="$new_path"
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting dxsdk_path to \"$new_path\"" >&5
|
|
||||||
$as_echo "$as_me: Rewriting dxsdk_path to \"$new_path\"" >&6;}
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Save the first 10 bytes of this path to the storage, so fixpath can work.
|
|
||||||
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
|
|
||||||
|
|
||||||
else
|
|
||||||
# We're on a posix platform. Hooray! :)
|
|
||||||
path="$dxsdk_path"
|
|
||||||
has_space=`$ECHO "$path" | $GREP " "`
|
|
||||||
if test "x$has_space" != x; then
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: The path of dxsdk_path, which resolves as \"$path\", is invalid." >&5
|
|
||||||
$as_echo "$as_me: The path of dxsdk_path, which resolves as \"$path\", is invalid." >&6;}
|
|
||||||
as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Use eval to expand a potential ~
|
|
||||||
eval path="$path"
|
|
||||||
if test ! -f "$path" && test ! -d "$path"; then
|
|
||||||
as_fn_error $? "The path of dxsdk_path, which resolves as \"$path\", is not found." "$LINENO" 5
|
|
||||||
fi
|
|
||||||
|
|
||||||
dxsdk_path="`cd "$path"; $THEPWDCMD -L`"
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DirectX SDK lib dir" >&5
|
|
||||||
$as_echo_n "checking for DirectX SDK lib dir... " >&6; }
|
|
||||||
if test "x$with_dxsdk_lib" != x; then
|
|
||||||
DXSDK_LIB_PATH="$with_dxsdk_lib"
|
|
||||||
elif test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then
|
|
||||||
DXSDK_LIB_PATH="$dxsdk_path/Lib/x64"
|
|
||||||
else
|
|
||||||
DXSDK_LIB_PATH="$dxsdk_path/Lib"
|
|
||||||
fi
|
|
||||||
# dsound.lib is linked to in jsoundds
|
|
||||||
if test ! -f "$DXSDK_LIB_PATH/dsound.lib"; then
|
|
||||||
as_fn_error $? "Invalid DirectX SDK lib dir" "$LINENO" 5
|
|
||||||
fi
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $DXSDK_LIB_PATH" >&5
|
|
||||||
$as_echo "$DXSDK_LIB_PATH" >&6; }
|
|
||||||
|
|
||||||
if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
|
|
||||||
|
|
||||||
# Input might be given as Windows format, start by converting to
|
|
||||||
# unix format.
|
|
||||||
path="$DXSDK_LIB_PATH"
|
|
||||||
new_path=`$CYGPATH -u "$path"`
|
|
||||||
|
|
||||||
# Cygwin tries to hide some aspects of the Windows file system, such that binaries are
|
|
||||||
# named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
|
|
||||||
# the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
|
|
||||||
# "foo.exe" is OK but "foo" is an error.
|
|
||||||
#
|
|
||||||
# This test is therefore slightly more accurate than "test -f" to check for file precense.
|
|
||||||
# It is also a way to make sure we got the proper file name for the real test later on.
|
|
||||||
test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
|
|
||||||
if test "x$test_shortpath" = x; then
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: The path of DXSDK_LIB_PATH, which resolves as \"$path\", is invalid." >&5
|
|
||||||
$as_echo "$as_me: The path of DXSDK_LIB_PATH, which resolves as \"$path\", is invalid." >&6;}
|
|
||||||
as_fn_error $? "Cannot locate the the path of DXSDK_LIB_PATH" "$LINENO" 5
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Call helper function which possibly converts this using DOS-style short mode.
|
|
||||||
# If so, the updated path is stored in $new_path.
|
|
||||||
|
|
||||||
input_path="$new_path"
|
|
||||||
# Check if we need to convert this using DOS-style short mode. If the path
|
|
||||||
# contains just simple characters, use it. Otherwise (spaces, weird characters),
|
|
||||||
# take no chances and rewrite it.
|
|
||||||
# Note: m4 eats our [], so we need to use [ and ] instead.
|
|
||||||
has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
|
|
||||||
if test "x$has_forbidden_chars" != x; then
|
|
||||||
# Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
|
|
||||||
shortmode_path=`$CYGPATH -s -m -a "$input_path"`
|
|
||||||
path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
|
|
||||||
if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
|
|
||||||
# Going to short mode and back again did indeed matter. Since short mode is
|
|
||||||
# case insensitive, let's make it lowercase to improve readability.
|
|
||||||
shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
|
|
||||||
# Now convert it back to Unix-stile (cygpath)
|
|
||||||
input_path=`$CYGPATH -u "$shortmode_path"`
|
|
||||||
new_path="$input_path"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
|
|
||||||
if test "x$test_cygdrive_prefix" = x; then
|
|
||||||
# As a simple fix, exclude /usr/bin since it's not a real path.
|
|
||||||
if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
|
|
||||||
# The path is in a Cygwin special directory (e.g. /home). We need this converted to
|
|
||||||
# a path prefixed by /cygdrive for fixpath to work.
|
|
||||||
new_path="$CYGWIN_ROOT_PATH$input_path"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
if test "x$path" != "x$new_path"; then
|
|
||||||
DXSDK_LIB_PATH="$new_path"
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting DXSDK_LIB_PATH to \"$new_path\"" >&5
|
|
||||||
$as_echo "$as_me: Rewriting DXSDK_LIB_PATH to \"$new_path\"" >&6;}
|
|
||||||
fi
|
|
||||||
|
|
||||||
elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
|
|
||||||
|
|
||||||
path="$DXSDK_LIB_PATH"
|
|
||||||
has_colon=`$ECHO $path | $GREP ^.:`
|
|
||||||
new_path="$path"
|
|
||||||
if test "x$has_colon" = x; then
|
|
||||||
# Not in mixed or Windows style, start by that.
|
|
||||||
new_path=`cmd //c echo $path`
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
input_path="$new_path"
|
|
||||||
# Check if we need to convert this using DOS-style short mode. If the path
|
|
||||||
# contains just simple characters, use it. Otherwise (spaces, weird characters),
|
|
||||||
# take no chances and rewrite it.
|
|
||||||
# Note: m4 eats our [], so we need to use [ and ] instead.
|
|
||||||
has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
|
|
||||||
if test "x$has_forbidden_chars" != x; then
|
|
||||||
# Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
|
|
||||||
new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
windows_path="$new_path"
|
|
||||||
if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
|
|
||||||
unix_path=`$CYGPATH -u "$windows_path"`
|
|
||||||
new_path="$unix_path"
|
|
||||||
elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
|
|
||||||
unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
|
|
||||||
new_path="$unix_path"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "x$path" != "x$new_path"; then
|
|
||||||
DXSDK_LIB_PATH="$new_path"
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting DXSDK_LIB_PATH to \"$new_path\"" >&5
|
|
||||||
$as_echo "$as_me: Rewriting DXSDK_LIB_PATH to \"$new_path\"" >&6;}
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Save the first 10 bytes of this path to the storage, so fixpath can work.
|
|
||||||
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
|
|
||||||
|
|
||||||
else
|
|
||||||
# We're on a posix platform. Hooray! :)
|
|
||||||
path="$DXSDK_LIB_PATH"
|
|
||||||
has_space=`$ECHO "$path" | $GREP " "`
|
|
||||||
if test "x$has_space" != x; then
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: The path of DXSDK_LIB_PATH, which resolves as \"$path\", is invalid." >&5
|
|
||||||
$as_echo "$as_me: The path of DXSDK_LIB_PATH, which resolves as \"$path\", is invalid." >&6;}
|
|
||||||
as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Use eval to expand a potential ~
|
|
||||||
eval path="$path"
|
|
||||||
if test ! -f "$path" && test ! -d "$path"; then
|
|
||||||
as_fn_error $? "The path of DXSDK_LIB_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
|
|
||||||
fi
|
|
||||||
|
|
||||||
DXSDK_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DirectX SDK include dir" >&5
|
|
||||||
$as_echo_n "checking for DirectX SDK include dir... " >&6; }
|
|
||||||
if test "x$with_dxsdk_include" != x; then
|
|
||||||
DXSDK_INCLUDE_PATH="$with_dxsdk_include"
|
|
||||||
else
|
|
||||||
DXSDK_INCLUDE_PATH="$dxsdk_path/Include"
|
|
||||||
fi
|
|
||||||
# dsound.h is included in jsoundds
|
|
||||||
if test ! -f "$DXSDK_INCLUDE_PATH/dsound.h"; then
|
|
||||||
as_fn_error $? "Invalid DirectX SDK lib dir" "$LINENO" 5
|
|
||||||
fi
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $DXSDK_INCLUDE_PATH" >&5
|
|
||||||
$as_echo "$DXSDK_INCLUDE_PATH" >&6; }
|
|
||||||
|
|
||||||
if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
|
|
||||||
|
|
||||||
# Input might be given as Windows format, start by converting to
|
|
||||||
# unix format.
|
|
||||||
path="$DXSDK_INCLUDE_PATH"
|
|
||||||
new_path=`$CYGPATH -u "$path"`
|
|
||||||
|
|
||||||
# Cygwin tries to hide some aspects of the Windows file system, such that binaries are
|
|
||||||
# named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
|
|
||||||
# the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
|
|
||||||
# "foo.exe" is OK but "foo" is an error.
|
|
||||||
#
|
|
||||||
# This test is therefore slightly more accurate than "test -f" to check for file precense.
|
|
||||||
# It is also a way to make sure we got the proper file name for the real test later on.
|
|
||||||
test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
|
|
||||||
if test "x$test_shortpath" = x; then
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: The path of DXSDK_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5
|
|
||||||
$as_echo "$as_me: The path of DXSDK_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;}
|
|
||||||
as_fn_error $? "Cannot locate the the path of DXSDK_INCLUDE_PATH" "$LINENO" 5
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Call helper function which possibly converts this using DOS-style short mode.
|
|
||||||
# If so, the updated path is stored in $new_path.
|
|
||||||
|
|
||||||
input_path="$new_path"
|
|
||||||
# Check if we need to convert this using DOS-style short mode. If the path
|
|
||||||
# contains just simple characters, use it. Otherwise (spaces, weird characters),
|
|
||||||
# take no chances and rewrite it.
|
|
||||||
# Note: m4 eats our [], so we need to use [ and ] instead.
|
|
||||||
has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
|
|
||||||
if test "x$has_forbidden_chars" != x; then
|
|
||||||
# Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
|
|
||||||
shortmode_path=`$CYGPATH -s -m -a "$input_path"`
|
|
||||||
path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
|
|
||||||
if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
|
|
||||||
# Going to short mode and back again did indeed matter. Since short mode is
|
|
||||||
# case insensitive, let's make it lowercase to improve readability.
|
|
||||||
shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
|
|
||||||
# Now convert it back to Unix-stile (cygpath)
|
|
||||||
input_path=`$CYGPATH -u "$shortmode_path"`
|
|
||||||
new_path="$input_path"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
|
|
||||||
if test "x$test_cygdrive_prefix" = x; then
|
|
||||||
# As a simple fix, exclude /usr/bin since it's not a real path.
|
|
||||||
if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
|
|
||||||
# The path is in a Cygwin special directory (e.g. /home). We need this converted to
|
|
||||||
# a path prefixed by /cygdrive for fixpath to work.
|
|
||||||
new_path="$CYGWIN_ROOT_PATH$input_path"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
if test "x$path" != "x$new_path"; then
|
|
||||||
DXSDK_INCLUDE_PATH="$new_path"
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting DXSDK_INCLUDE_PATH to \"$new_path\"" >&5
|
|
||||||
$as_echo "$as_me: Rewriting DXSDK_INCLUDE_PATH to \"$new_path\"" >&6;}
|
|
||||||
fi
|
|
||||||
|
|
||||||
elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
|
|
||||||
|
|
||||||
path="$DXSDK_INCLUDE_PATH"
|
|
||||||
has_colon=`$ECHO $path | $GREP ^.:`
|
|
||||||
new_path="$path"
|
|
||||||
if test "x$has_colon" = x; then
|
|
||||||
# Not in mixed or Windows style, start by that.
|
|
||||||
new_path=`cmd //c echo $path`
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
input_path="$new_path"
|
|
||||||
# Check if we need to convert this using DOS-style short mode. If the path
|
|
||||||
# contains just simple characters, use it. Otherwise (spaces, weird characters),
|
|
||||||
# take no chances and rewrite it.
|
|
||||||
# Note: m4 eats our [], so we need to use [ and ] instead.
|
|
||||||
has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
|
|
||||||
if test "x$has_forbidden_chars" != x; then
|
|
||||||
# Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
|
|
||||||
new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
windows_path="$new_path"
|
|
||||||
if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
|
|
||||||
unix_path=`$CYGPATH -u "$windows_path"`
|
|
||||||
new_path="$unix_path"
|
|
||||||
elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
|
|
||||||
unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
|
|
||||||
new_path="$unix_path"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "x$path" != "x$new_path"; then
|
|
||||||
DXSDK_INCLUDE_PATH="$new_path"
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting DXSDK_INCLUDE_PATH to \"$new_path\"" >&5
|
|
||||||
$as_echo "$as_me: Rewriting DXSDK_INCLUDE_PATH to \"$new_path\"" >&6;}
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Save the first 10 bytes of this path to the storage, so fixpath can work.
|
|
||||||
all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
|
|
||||||
|
|
||||||
else
|
|
||||||
# We're on a posix platform. Hooray! :)
|
|
||||||
path="$DXSDK_INCLUDE_PATH"
|
|
||||||
has_space=`$ECHO "$path" | $GREP " "`
|
|
||||||
if test "x$has_space" != x; then
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: The path of DXSDK_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5
|
|
||||||
$as_echo "$as_me: The path of DXSDK_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;}
|
|
||||||
as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Use eval to expand a potential ~
|
|
||||||
eval path="$path"
|
|
||||||
if test ! -f "$path" && test ! -d "$path"; then
|
|
||||||
as_fn_error $? "The path of DXSDK_INCLUDE_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
|
|
||||||
fi
|
|
||||||
|
|
||||||
DXSDK_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
LDFLAGS_JDK="$LDFLAGS_JDK -libpath:$DXSDK_LIB_PATH"
|
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
@ -291,10 +291,6 @@ X_CFLAGS:=@X_CFLAGS@
|
|||||||
X_LIBS:=@X_LIBS@
|
X_LIBS:=@X_LIBS@
|
||||||
OPENWIN_HOME:=@OPENWIN_HOME@
|
OPENWIN_HOME:=@OPENWIN_HOME@
|
||||||
|
|
||||||
# DirectX SDK
|
|
||||||
DXSDK_LIB_PATH=@DXSDK_LIB_PATH@
|
|
||||||
DXSDK_INCLUDE_PATH=@DXSDK_INCLUDE_PATH@
|
|
||||||
|
|
||||||
# The lowest required version of macosx to enforce compatiblity for
|
# The lowest required version of macosx to enforce compatiblity for
|
||||||
MACOSX_VERSION_MIN=@MACOSX_VERSION_MIN@
|
MACOSX_VERSION_MIN=@MACOSX_VERSION_MIN@
|
||||||
|
|
||||||
|
@ -176,7 +176,6 @@ AC_DEFUN([TOOLCHAIN_SETUP_PATHS],
|
|||||||
[
|
[
|
||||||
if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
|
if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
|
||||||
TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV
|
TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV
|
||||||
TOOLCHAIN_SETUP_DXSDK
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_SUBST(MSVCR_DLL)
|
AC_SUBST(MSVCR_DLL)
|
||||||
|
@ -277,61 +277,3 @@ AC_DEFUN([TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV],
|
|||||||
AC_MSG_RESULT([$MSVCR_DLL])
|
AC_MSG_RESULT([$MSVCR_DLL])
|
||||||
BASIC_FIXUP_PATH(MSVCR_DLL)
|
BASIC_FIXUP_PATH(MSVCR_DLL)
|
||||||
])
|
])
|
||||||
|
|
||||||
|
|
||||||
# Setup the DXSDK paths
|
|
||||||
AC_DEFUN([TOOLCHAIN_SETUP_DXSDK],
|
|
||||||
[
|
|
||||||
AC_ARG_WITH(dxsdk, [AS_HELP_STRING([--with-dxsdk],
|
|
||||||
[the DirectX SDK (Windows only) @<:@probed@:>@])])
|
|
||||||
AC_ARG_WITH(dxsdk-lib, [AS_HELP_STRING([--with-dxsdk-lib],
|
|
||||||
[the DirectX SDK lib directory (Windows only) @<:@probed@:>@])])
|
|
||||||
AC_ARG_WITH(dxsdk-include, [AS_HELP_STRING([--with-dxsdk-include],
|
|
||||||
[the DirectX SDK include directory (Windows only) @<:@probed@:>@])])
|
|
||||||
|
|
||||||
AC_MSG_CHECKING([for DirectX SDK])
|
|
||||||
|
|
||||||
if test "x$with_dxsdk" != x; then
|
|
||||||
dxsdk_path="$with_dxsdk"
|
|
||||||
elif test "x$DXSDK_DIR" != x; then
|
|
||||||
dxsdk_path="$DXSDK_DIR"
|
|
||||||
elif test -d "C:/DXSDK"; then
|
|
||||||
dxsdk_path="C:/DXSDK"
|
|
||||||
else
|
|
||||||
AC_MSG_ERROR([Could not find the DirectX SDK])
|
|
||||||
fi
|
|
||||||
AC_MSG_RESULT([$dxsdk_path])
|
|
||||||
BASIC_FIXUP_PATH(dxsdk_path)
|
|
||||||
|
|
||||||
AC_MSG_CHECKING([for DirectX SDK lib dir])
|
|
||||||
if test "x$with_dxsdk_lib" != x; then
|
|
||||||
DXSDK_LIB_PATH="$with_dxsdk_lib"
|
|
||||||
elif test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then
|
|
||||||
DXSDK_LIB_PATH="$dxsdk_path/Lib/x64"
|
|
||||||
else
|
|
||||||
DXSDK_LIB_PATH="$dxsdk_path/Lib"
|
|
||||||
fi
|
|
||||||
# dsound.lib is linked to in jsoundds
|
|
||||||
if test ! -f "$DXSDK_LIB_PATH/dsound.lib"; then
|
|
||||||
AC_MSG_ERROR([Invalid DirectX SDK lib dir])
|
|
||||||
fi
|
|
||||||
AC_MSG_RESULT([$DXSDK_LIB_PATH])
|
|
||||||
BASIC_FIXUP_PATH(DXSDK_LIB_PATH)
|
|
||||||
|
|
||||||
AC_MSG_CHECKING([for DirectX SDK include dir])
|
|
||||||
if test "x$with_dxsdk_include" != x; then
|
|
||||||
DXSDK_INCLUDE_PATH="$with_dxsdk_include"
|
|
||||||
else
|
|
||||||
DXSDK_INCLUDE_PATH="$dxsdk_path/Include"
|
|
||||||
fi
|
|
||||||
# dsound.h is included in jsoundds
|
|
||||||
if test ! -f "$DXSDK_INCLUDE_PATH/dsound.h"; then
|
|
||||||
AC_MSG_ERROR([Invalid DirectX SDK lib dir])
|
|
||||||
fi
|
|
||||||
AC_MSG_RESULT([$DXSDK_INCLUDE_PATH])
|
|
||||||
BASIC_FIXUP_PATH(DXSDK_INCLUDE_PATH)
|
|
||||||
|
|
||||||
AC_SUBST(DXSDK_LIB_PATH)
|
|
||||||
AC_SUBST(DXSDK_INCLUDE_PATH)
|
|
||||||
LDFLAGS_JDK="$LDFLAGS_JDK -libpath:$DXSDK_LIB_PATH"
|
|
||||||
])
|
|
||||||
|
Loading…
Reference in New Issue
Block a user