Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-28 00:07:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 990333 - Fix DirectX SDK path handling when linking xul.dll after bug 988271. r=mshal

Browse Source
This commit is contained in:
Mike Hommey 2014-04-02 11:52:21 +09:00
parent cb1a0d7337
commit d0cdea26af
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/angle/src/libGLESv2/Makefile.in
View File

@ -20,6 +20,6 @@ endif
ifdef MOZ_HAS_WINSDK_WITH_D3D
EXTRA_DSO_LDOPTS = $(call EXPAND_LIBNAME,d3d9 dxguid)
else
EXTRA_DSO_LDOPTS = $(call EXPAND_LIBNAME_PATH,d3d9 dxguid,$(MOZ_DIRECTX_SDK_PATH)/lib/$(MOZ_DIRECTX_SDK_CPU_SUFFIX))
EXTRA_DSO_LDOPTS = $(call EXPAND_LIBNAME_PATH,d3d9 dxguid,'$(MOZ_DIRECTX_SDK_PATH)/lib/$(MOZ_DIRECTX_SDK_CPU_SUFFIX)')
endif
EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME,delayimp)

2
toolkit/library/libxul.mk
View File

@ -218,7 +218,7 @@ 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))
OS_LIBS += $(call EXPAND_LIBNAME_PATH,dxguid dinput8, '$(subst \,/,$(MOZ_DIRECTX_SDK_PATH))/Lib/$(MOZ_DIRECTX_SDK_CPU_SUFFIX)')
endif
endif
endif # WINNT