Mercurial > jdk8-mips64-public / file comparison
comparison: common/autoconf/toolchain_windows.m4
common/autoconf/toolchain_windows.m4
- changeset 796
- b1e9396fb8af
- parent 759
- 0d0c983a817b
- child 839
- 174a54ce39c4
equal
deleted
inserted
replaced
| 795:64f52ef175a4 | 796:b1e9396fb8af |
|---|---|
| 275 AC_MSG_ERROR([Could not find msvcr100.dll !]) | 275 AC_MSG_ERROR([Could not find msvcr100.dll !]) |
| 276 fi | 276 fi |
| 277 AC_MSG_RESULT([$MSVCR_DLL]) | 277 AC_MSG_RESULT([$MSVCR_DLL]) |
| 278 BASIC_FIXUP_PATH(MSVCR_DLL) | 278 BASIC_FIXUP_PATH(MSVCR_DLL) |
| 279 ]) | 279 ]) |
| 280 | |
| 281 | |
| 282 # Setup the DXSDK paths | |
| 283 AC_DEFUN([TOOLCHAIN_SETUP_DXSDK], | |
| 284 [ | |
| 285 AC_ARG_WITH(dxsdk, [AS_HELP_STRING([--with-dxsdk], | |
| 286 [the DirectX SDK (Windows only) @<:@probed@:>@])]) | |
| 287 AC_ARG_WITH(dxsdk-lib, [AS_HELP_STRING([--with-dxsdk-lib], | |
| 288 [the DirectX SDK lib directory (Windows only) @<:@probed@:>@])]) | |
| 289 AC_ARG_WITH(dxsdk-include, [AS_HELP_STRING([--with-dxsdk-include], | |
| 290 [the DirectX SDK include directory (Windows only) @<:@probed@:>@])]) | |
| 291 | |
| 292 AC_MSG_CHECKING([for DirectX SDK]) | |
| 293 | |
| 294 if test "x$with_dxsdk" != x; then | |
| 295 dxsdk_path="$with_dxsdk" | |
| 296 elif test "x$DXSDK_DIR" != x; then | |
| 297 dxsdk_path="$DXSDK_DIR" | |
| 298 elif test -d "C:/DXSDK"; then | |
| 299 dxsdk_path="C:/DXSDK" | |
| 300 else | |
| 301 AC_MSG_ERROR([Could not find the DirectX SDK]) | |
| 302 fi | |
| 303 AC_MSG_RESULT([$dxsdk_path]) | |
| 304 BASIC_FIXUP_PATH(dxsdk_path) | |
| 305 | |
| 306 AC_MSG_CHECKING([for DirectX SDK lib dir]) | |
| 307 if test "x$with_dxsdk_lib" != x; then | |
| 308 DXSDK_LIB_PATH="$with_dxsdk_lib" | |
| 309 elif test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then | |
| 310 DXSDK_LIB_PATH="$dxsdk_path/Lib/x64" | |
| 311 else | |
| 312 DXSDK_LIB_PATH="$dxsdk_path/Lib" | |
| 313 fi | |
| 314 # dsound.lib is linked to in jsoundds | |
| 315 if test ! -f "$DXSDK_LIB_PATH/dsound.lib"; then | |
| 316 AC_MSG_ERROR([Invalid DirectX SDK lib dir]) | |
| 317 fi | |
| 318 AC_MSG_RESULT([$DXSDK_LIB_PATH]) | |
| 319 BASIC_FIXUP_PATH(DXSDK_LIB_PATH) | |
| 320 | |
| 321 AC_MSG_CHECKING([for DirectX SDK include dir]) | |
| 322 if test "x$with_dxsdk_include" != x; then | |
| 323 DXSDK_INCLUDE_PATH="$with_dxsdk_include" | |
| 324 else | |
| 325 DXSDK_INCLUDE_PATH="$dxsdk_path/Include" | |
| 326 fi | |
| 327 # dsound.h is included in jsoundds | |
| 328 if test ! -f "$DXSDK_INCLUDE_PATH/dsound.h"; then | |
| 329 AC_MSG_ERROR([Invalid DirectX SDK lib dir]) | |
| 330 fi | |
| 331 AC_MSG_RESULT([$DXSDK_INCLUDE_PATH]) | |
| 332 BASIC_FIXUP_PATH(DXSDK_INCLUDE_PATH) | |
| 333 | |
| 334 AC_SUBST(DXSDK_LIB_PATH) | |
| 335 AC_SUBST(DXSDK_INCLUDE_PATH) | |
| 336 LDFLAGS_JDK="$LDFLAGS_JDK -libpath:$DXSDK_LIB_PATH" | |
| 337 ]) |
