changeset 5862:9de431c29e4d

fix build failure for Media
author Kirill Kirichenko <kirill.kirichenko@oracle.com>
date Mon, 02 Dec 2013 15:38:24 +0400
parents 6554a4c7fa61
children 2e2244003c8d
files modules/media/src/main/native/gstreamer/projects/win/fxplugins/Makefile modules/media/src/main/native/gstreamer/projects/win/glib-lite/Makefile modules/media/src/main/native/gstreamer/projects/win/gstreamer-lite/Makefile modules/media/src/main/native/jfxmedia/projects/win/Makefile
diffstat 4 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/modules/media/src/main/native/gstreamer/projects/win/fxplugins/Makefile	Mon Dec 02 16:27:52 2013 +0100
+++ b/modules/media/src/main/native/gstreamer/projects/win/fxplugins/Makefile	Mon Dec 02 15:38:24 2013 +0400
@@ -142,7 +142,7 @@
 	$(MAKE) $(TARGET)
 
 $(TARGET): $(OBJECTS) $(LIBS)
-	$(LINK) $(LDFLAGS) $(shell cygpath -ma $(RESOURCE)) $(foreach object,$(OBJECTS),$(shell cygpath -ma $(object))) $(foreach lib,$(LIBS),$(shell cygpath -ma $(lib)))
+	$(LINK) $(LDFLAGS) $(shell cygpath -ma "$(RESOURCE)") $(foreach object,$(OBJECTS),$(shell cygpath -ma $(object))) $(foreach lib,$(LIBS),$(shell cygpath -ma $(lib)))
 
 $(OBJECTS): | $(DEP_DIRS)
 
--- a/modules/media/src/main/native/gstreamer/projects/win/glib-lite/Makefile	Mon Dec 02 16:27:52 2013 +0100
+++ b/modules/media/src/main/native/gstreamer/projects/win/glib-lite/Makefile	Mon Dec 02 15:38:24 2013 +0400
@@ -51,7 +51,7 @@
 default: $(TARGET)
 
 $(TARGET): $(LIBS)
-	$(LINK) $(LDFLAGS) $(shell cygpath -ma $(RESOURCE)) $(foreach lib,$(LIBS),$(shell cygpath -ma $(lib))) 
+	$(LINK) $(LDFLAGS) $(shell cygpath -ma "$(RESOURCE)") $(foreach lib,$(LIBS),$(shell cygpath -ma $(lib))) 
 
 $(BUILD_DIR)/$(GLIB_TARGET):
 	$(MAKE) TARGET=$(BUILD_DIR)/$(GLIB_TARGET) -f Makefile.glib
--- a/modules/media/src/main/native/gstreamer/projects/win/gstreamer-lite/Makefile	Mon Dec 02 16:27:52 2013 +0100
+++ b/modules/media/src/main/native/gstreamer/projects/win/gstreamer-lite/Makefile	Mon Dec 02 15:38:24 2013 +0400
@@ -54,7 +54,7 @@
 	$(MAKE) $(TARGET)
 
 $(TARGET): $(LIBS)
-	$(LINK) $(LDFLAGS) $(shell cygpath -ma $(RESOURCE)) $(foreach lib,$(LIBS),$(shell cygpath -ma $(lib)))
+	$(LINK) $(LDFLAGS) $(shell cygpath -ma "$(RESOURCE)") $(foreach lib,$(LIBS),$(shell cygpath -ma $(lib)))
 
 $(GSTREAMER_TARGET):
 	$(MAKE) TARGET=$(BUILD_DIR)/$(GSTREAMER_TARGET) -f Makefile.gstreamer
--- a/modules/media/src/main/native/jfxmedia/projects/win/Makefile	Mon Dec 02 16:27:52 2013 +0100
+++ b/modules/media/src/main/native/jfxmedia/projects/win/Makefile	Mon Dec 02 15:38:24 2013 +0400
@@ -145,7 +145,7 @@
 default: $(TARGET)
 
 $(TARGET): $(DEPFILE) $(OBJECTS) 
-	$(LINK) $(LDFLAGS) $(shell cygpath -ma $(RESOURCE)) $(foreach object,$(OBJECTS),$(shell cygpath -ma $(object)))
+	$(LINK) $(LDFLAGS) $(shell cygpath -ma "$(RESOURCE)") $(foreach object,$(OBJECTS),$(shell cygpath -ma $(object)))
 
 $(DEPFILE): | $(DEP_DIRS)
 	@echo $(DEPTOKEN) > $(DEPFILE)