wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset 5bb66b16b70c (bug 996078) for B2G desktop build failures; CLOSED TREE

Browse Source
This commit is contained in:
Ed Morley 2014-04-28 15:11:22 +01:00
parent aff44791e9
commit 62232520a0
3 changed files with 556 additions and 558 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure.in
View File

@ -5964,6 +5964,18 @@ if test "$MOZ_GAMEPAD"; then
MOZ_GAMEPAD_BACKEND=cocoa
;;
WINNT)
if test -z "$MOZ_HAS_WINSDK_WITH_D3D"; then
if test -n "$MOZ_DIRECTX_SDK_PATH" ; then
if ! test -f "$MOZ_DIRECTX_SDK_PATH"/lib/$MOZ_DIRECTX_SDK_CPU_SUFFIX/dxguid.lib ; then
MOZ_GAMEPAD=
fi
elif test "$GCC" != "yes"; then
MOZ_GAMEPAD=
fi
fi
if test -z "$MOZ_GAMEPAD"; then
AC_MSG_ERROR([Couldn't find the DirectX SDK, needed for gamepad support. Please install it or, reconfigure with --disable-gamepad to disable gamepad support.])
fi
MOZ_GAMEPAD_BACKEND=windows
;;
Linux)

1095
hal/windows/WindowsGamepad.cpp
View File

File diff suppressed because it is too large Load Diff

7
toolkit/library/libxul.mk
View File

@ -214,6 +214,13 @@ endif
ifdef MOZ_METRO
OS_LIBS += $(call EXPAND_LIBNAME,uiautomationcore runtimeobject)
endif
ifdef MOZ_GAMEPAD
ifdef MOZ_HAS_WINSDK_WITH_D3D
OS_LIBS += $(call EXPAND_LIBNAME,dxguid dinput8)
else
OS_LIBS += $(call EXPAND_LIBNAME_PATH,dxguid dinput8, '$(subst \,/,$(MOZ_DIRECTX_SDK_PATH))/Lib/$(MOZ_DIRECTX_SDK_CPU_SUFFIX)')
endif
endif
endif # WINNT
ifdef MOZ_JPROF