260 AC_MSG_ERROR([Could not find msvcr100.dll !]) |
260 AC_MSG_ERROR([Could not find msvcr100.dll !]) |
261 fi |
261 fi |
262 AC_MSG_RESULT([$MSVCR_DLL]) |
262 AC_MSG_RESULT([$MSVCR_DLL]) |
263 BASIC_FIXUP_PATH(MSVCR_DLL) |
263 BASIC_FIXUP_PATH(MSVCR_DLL) |
264 ]) |
264 ]) |
|
265 |
|
266 |
|
267 # Setup the DXSDK paths |
|
268 AC_DEFUN([TOOLCHAIN_SETUP_DXSDK], |
|
269 [ |
|
270 AC_ARG_WITH(dxsdk, [AS_HELP_STRING([--with-dxsdk], |
|
271 [the DirectX SDK (Windows only) @<:@probed@:>@])]) |
|
272 AC_ARG_WITH(dxsdk-lib, [AS_HELP_STRING([--with-dxsdk-lib], |
|
273 [the DirectX SDK lib directory (Windows only) @<:@probed@:>@])]) |
|
274 AC_ARG_WITH(dxsdk-include, [AS_HELP_STRING([--with-dxsdk-include], |
|
275 [the DirectX SDK include directory (Windows only) @<:@probed@:>@])]) |
|
276 |
|
277 AC_MSG_CHECKING([for DirectX SDK]) |
|
278 |
|
279 if test "x$with_dxsdk" != x; then |
|
280 dxsdk_path="$with_dxsdk" |
|
281 elif test "x$DXSDK_DIR" != x; then |
|
282 dxsdk_path="$DXSDK_DIR" |
|
283 else |
|
284 AC_MSG_ERROR([Could not find the DirectX SDK]) |
|
285 fi |
|
286 AC_MSG_RESULT([$dxsdk_path]) |
|
287 BASIC_FIXUP_PATH(dxsdk_path) |
|
288 |
|
289 AC_MSG_CHECKING([for DirectX SDK lib dir]) |
|
290 if test "x$with_dxsdk_lib" != x; then |
|
291 DXSDK_LIB_PATH="$with_dxsdk_lib" |
|
292 elif test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then |
|
293 DXSDK_LIB_PATH="$dxsdk_path/Lib/x64" |
|
294 else |
|
295 DXSDK_LIB_PATH="$dxsdk_path/Lib" |
|
296 fi |
|
297 # dsound.lib is linked to in jsoundds |
|
298 if test ! -f "$DXSDK_LIB_PATH/dsound.lib"; then |
|
299 AC_MSG_ERROR([Invalid DirectX SDK lib dir]) |
|
300 fi |
|
301 AC_MSG_RESULT([$DXSDK_LIB_PATH]) |
|
302 BASIC_FIXUP_PATH(DXSDK_LIB_PATH) |
|
303 |
|
304 AC_MSG_CHECKING([for DirectX SDK include dir]) |
|
305 if test "x$with_dxsdk_include" != x; then |
|
306 DXSDK_INCLUDE_PATH="$with_dxsdk_include" |
|
307 else |
|
308 DXSDK_INCLUDE_PATH="$dxsdk_path/Include" |
|
309 fi |
|
310 # dsound.h is included in jsoundds |
|
311 if test ! -f "$DXSDK_INCLUDE_PATH/dsound.h"; then |
|
312 AC_MSG_ERROR([Invalid DirectX SDK lib dir]) |
|
313 fi |
|
314 AC_MSG_RESULT([$DXSDK_INCLUDE_PATH]) |
|
315 BASIC_FIXUP_PATH(DXSDK_INCLUDE_PATH) |
|
316 |
|
317 AC_SUBST(DXSDK_LIB_PATH) |
|
318 AC_SUBST(DXSDK_INCLUDE_PATH) |
|
319 LDFLAGS_JDK="$LDFLAGS_JDK -libpath:$DXSDK_LIB_PATH" |
|
320 ]) |