From 541a6264263e8c53b766e1507af47a03c5db1cf8 Mon Sep 17 00:00:00 2001 From: Marco Bonardo Date: Thu, 24 Jan 2013 23:48:17 +0100 Subject: [PATCH] Backout 65a26453f9a6 (bug 823109) cause it still breaks some Windows builds --- gfx/angle/Makefile.in | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/gfx/angle/Makefile.in b/gfx/angle/Makefile.in index 844e4665df2..235097bcfe6 100644 --- a/gfx/angle/Makefile.in +++ b/gfx/angle/Makefile.in @@ -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