Backout 65a26453f9a6 (bug 823109) cause it still breaks some Windows builds

This commit is contained in:
Marco Bonardo 2013-01-24 23:48:17 +01:00
parent fd1c2ab1a1
commit 541a626426

View File

@ -132,22 +132,11 @@ ifdef MOZ_ANGLE_RENDERER
# libEGL depends on (links against!) libGLESv2!
DIRS = src/libGLESv2 src/libEGL
space := $(NULL) $(NULL)
# We use a trick from http://blog.jgc.org/2007/06/escaping-comma-and-space-in-gnu-make.html
# to escape possible spaces in MOZ_D3DX9_CAB and MOZ_D3DCOMPILER_CAB
libs::
ifdef MOZ_D3DX9_CAB
libs:: $(DIST)/bin/$(MOZ_D3DX9_DLL)
$(DIST)/bin/$(MOZ_D3DX9_DLL): $(subst $(space),\$(space),$(MOZ_D3DX9_CAB))
expand "$(MOZ_D3DX9_CAB)" -F:$(MOZ_D3DX9_DLL) "$(DIST)/bin"
endif
ifdef MOZ_D3DCOMPILER_CAB
libs:: $(DIST)/bin/$(MOZ_D3DCOMPILER_DLL)
$(DIST)/bin/$(MOZ_D3DCOMPILER_DLL): $(subst $(space),\$(space),$(MOZ_D3DCOMPILER_CAB))
expand "$(MOZ_D3DCOMPILER_CAB)" -F:$(MOZ_D3DCOMPILER_DLL) "$(DIST)/bin"
endif