changeset 9222:d0fd05a0a79e 9-b78

Merge
author kcr
date Sat, 15 Aug 2015 07:47:06 -0700
parents 30136a857860 f7860462626b
children 02a8403ff7e3 155ad1e34c44
files
diffstat 26 files changed, 96 insertions(+), 84 deletions(-) [+]
line wrap: on
line diff
--- a/build.gradle	Thu Aug 13 04:46:18 2015 -0700
+++ b/build.gradle	Sat Aug 15 07:47:06 2015 -0700
@@ -2218,17 +2218,14 @@
                     commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/jfxmedia/projects/${projectDir}")
                     args("JAVA_HOME=${JDK_HOME}", "GENERATED_HEADERS_DIR=${generatedHeadersDir}",
                          "OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=jfxmedia",
-                         "COMPILE_PARFAIT=${compileParfait}")
+                         "COMPILE_PARFAIT=${compileParfait}", 
+                         IS_64 ? "ARCH=x64" : "ARCH=x32", 
+                        "CC=${mediaProperties.compiler}", "LINKER=${mediaProperties.linker}")
 
                     if (t.name == "win") {
                         environment(WINDOWS_NATIVE_COMPILE_ENVIRONMENT)
-                        args(IS_64 ? "ARCH=x64" : "ARCH=x32", "RESOURCE=${nativeOutputDir}/${buildType}/${WIN.media.jfxmediaRcFile}")
+                        args( "RESOURCE=${nativeOutputDir}/${buildType}/${WIN.media.jfxmediaRcFile}")
                     } else {
-                        args ("CC=${mediaProperties.compiler}", "LINK=${mediaProperties.linker}", "LIB=${mediaProperties.lib}")
-                        if (t.name == "linux") {
-                            args(IS_64 ? "ARCH=x64" : "ARCH=x32")
-                        }
-
                         if (t.name.startsWith("arm")) {
                             args("EXTRA_CFLAGS=${mediaProperties.extra_cflags}", "EXTRA_LDFLAGS=${mediaProperties.extra_ldflags}")
                         } else {
@@ -2248,16 +2245,13 @@
                 doLast {
                     exec {
                         commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/${projectDir}/gstreamer-lite")
-                        args("OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=gstreamer-lite")
+                        args("OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=gstreamer-lite",
+                             IS_64 ? "ARCH=x64" : "ARCH=x32", "CC=${mediaProperties.compiler}", 
+                             "AR=${mediaProperties.ar}", "LINKER=${mediaProperties.linker}")
 
                         if (t.name == "win") {
                             environment(WINDOWS_NATIVE_COMPILE_ENVIRONMENT)
-                            args(IS_64 ? "ARCH=x64" : "ARCH=x32", "RESOURCE=${nativeOutputDir}/${buildType}/${WIN.media.gstreamerRcFile}")
-                        } else {
-                            args ("CC=${mediaProperties.compiler}", "LINK=${mediaProperties.linker}", "LIB=${mediaProperties.lib}")
-                            if (t.name == "linux") {
-                                args(IS_64 ? "ARCH=x64" : "ARCH=x32")
-                            }
+                            args("RESOURCE=${nativeOutputDir}/${buildType}/${WIN.media.gstreamerRcFile}")
                         }
                     }
                 }
@@ -2278,7 +2272,9 @@
                     exec {
                         commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/${projectDir}/fxplugins")
                         args("OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=fxplugins", 
-                             "ON2_SRCDIR=${project.ext.ON2_SRCDIR}", "ON2_LIB=${project.ext.ON2_LIB}")
+                             "ON2_SRCDIR=${project.ext.ON2_SRCDIR}", "ON2_LIB=${project.ext.ON2_LIB}",
+                             IS_64 ? "ARCH=x64" : "ARCH=x32", 
+                             "CC=${mediaProperties.compiler}", "AR=${mediaProperties.ar}", "LINKER=${mediaProperties.linker}")
 
                         if (t.name == "win") {
                             Map winEnv = new HashMap(WINDOWS_NATIVE_COMPILE_ENVIRONMENT)
@@ -2290,12 +2286,7 @@
                             }
                             environment(winEnv)
 
-                            args(IS_64 ? "ARCH=x64" : "ARCH=x32", "RESOURCE=${nativeOutputDir}/${buildType}/${WIN.media.fxpluginsRcFile}")
-                        } else {
-                            args ("CC=${mediaProperties.compiler}", "LINK=${mediaProperties.linker}", "LIB=${mediaProperties.lib}")
-                            if (t.name == "linux") {
-                                args(IS_64 ? "ARCH=x64" : "ARCH=x32")
-                            }
+                            args("RESOURCE=${nativeOutputDir}/${buildType}/${WIN.media.fxpluginsRcFile}")
                         }
                     }
                 }
@@ -2315,9 +2306,10 @@
                                 if (dir.exists()) {
                                     exec {
                                         commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/linux/avplugin")
-                                        args("CC=${mediaProperties.compiler}", "OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", 
-                                             "BASE_NAME=avplugin", "VERSION=${version}", "LIBAV_DIR=${libavDir}")
-                                        args(IS_64 ? "ARCH=x64" : "ARCH=x32")
+                                        args("CC=${mediaProperties.compiler}", "LINKER=${mediaProperties.linker}", 
+                                             "OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", 
+                                             "BASE_NAME=avplugin", "VERSION=${version}", "LIBAV_DIR=${libavDir}", 
+                                              IS_64 ? "ARCH=x64" : "ARCH=x32")
                                     }
                                 }
                             }
@@ -2325,9 +2317,9 @@
                             // Building fxavcodec plugin (libav plugin)
                             exec {
                                 commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/linux/avplugin")
-                                args("CC=${mediaProperties.compiler}", "OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", 
-                                     "BASE_NAME=avplugin")
-                                args(IS_64 ? "ARCH=x64" : "ARCH=x32")
+                                args("CC=${mediaProperties.compiler}", "LINKER=${mediaProperties.linker}", 
+                                     "OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", 
+                                     "BASE_NAME=avplugin", IS_64 ? "ARCH=x64" : "ARCH=x32")
                             }
                         }
                     }
@@ -2367,7 +2359,7 @@
                         args("/Fo${rcOutputDir}/${WIN.media.jfxmediaRcFile}", WIN.media.rcSource)
                     }
                 }
-                
+
                 def buildGlib = task("build${t.capital}Glib", dependsOn: [buildResources]) {
                     enabled = IS_COMPILE_MEDIA
                     doLast {
@@ -2375,12 +2367,13 @@
                             environment(WINDOWS_NATIVE_COMPILE_ENVIRONMENT)
                             commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/${projectDir}/glib-lite")
                             args("OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=glib-lite",
-                                 IS_64 ? "ARCH=x64" : "ARCH=x32", "RESOURCE=${nativeOutputDir}/${buildType}/${WIN.media.glibRcFile}")
+                                 IS_64 ? "ARCH=x64" : "ARCH=x32", "RESOURCE=${nativeOutputDir}/${buildType}/${WIN.media.glibRcFile}",
+                                 "CC=${mediaProperties.compiler}", "AR=${mediaProperties.ar}", "LINKER=${mediaProperties.linker}")
                         }
                     }
                 }
                 buildGStreamer.dependsOn buildGlib
-                
+
             } else if (t.name == "mac") {
                 def buildGlib = task("build${t.capital}Glib") {
                     enabled = IS_COMPILE_MEDIA
@@ -2388,7 +2381,7 @@
                         exec {
                             commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/${projectDir}/glib-lite")
                             args("OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=glib-lite")
-                            args ("CC=${mediaProperties.compiler}", "LINK=${mediaProperties.linker}", "LIB=${mediaProperties.lib}")
+                            args ("CC=${mediaProperties.compiler}", "LINKER=${mediaProperties.linker}")
                         }
                     }
                 }
--- a/buildSrc/linux.gradle	Thu Aug 13 04:46:18 2015 -0700
+++ b/buildSrc/linux.gradle	Sat Aug 15 07:47:06 2015 -0700
@@ -256,4 +256,4 @@
 LINUX.media = [:]
 LINUX.media.compiler = compiler
 LINUX.media.linker = linker
-LINUX.media.lib = "ar"
+LINUX.media.ar = "ar"
--- a/buildSrc/mac.gradle	Thu Aug 13 04:46:18 2015 -0700
+++ b/buildSrc/mac.gradle	Sat Aug 15 07:47:06 2015 -0700
@@ -241,4 +241,4 @@
 MAC.media = [:]
 MAC.media.compiler = compiler
 MAC.media.linker = linker
-MAC.media.lib = "libtool"
+MAC.media.ar = "libtool"
--- a/buildSrc/win.gradle	Thu Aug 13 04:46:18 2015 -0700
+++ b/buildSrc/win.gradle	Sat Aug 15 07:47:06 2015 -0700
@@ -374,7 +374,11 @@
 WIN.media.gstreamerRcFlags = ["/d", "JFX_FNAME=gstreamer-lite.dll", "/d", "JFX_INTERNAL_NAME=gstreamer", rcFlags].flatten()
 WIN.media.fxpluginsRcFlags = ["/d", "JFX_FNAME=fxplugins.dll", "/d", "JFX_INTERNAL_NAME=fxplugins", rcFlags].flatten()
 WIN.media.jfxmediaRcFlags = ["/d", "JFX_FNAME=jfxmedia.dll", "/d", "JFX_INTERNAL_NAME=jfxmedia", rcFlags].flatten()
-
+def parfaitPath = System.getenv("PARFAIT_PATH");
+WIN.media.compiler = IS_COMPILE_PARFAIT ? "${parfaitPath}/parfait-cl.exe" : "cl.exe"; 
+WIN.media.linker = IS_COMPILE_PARFAIT ? "${parfaitPath}/parfait-link.exe" : "link.exe"; 
+WIN.media.ar = IS_COMPILE_PARFAIT ? "${parfaitPath}/parfait-lib.exe" : "lib.exe"; 
+ 
 WIN.webkit = [:]
 WIN.webkit.rcCompiler = rcCompiler
 WIN.webkit.rcSource = defaultRcSource
--- a/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/MenuBarSkin.java	Thu Aug 13 04:46:18 2015 -0700
+++ b/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/MenuBarSkin.java	Sat Aug 15 07:47:06 2015 -0700
@@ -528,9 +528,9 @@
             // remove action listeners 
             updateActionListeners(m, false);
         }
-        for(Node n : container.getChildren()) {
-            //Stop observing menu's showing & disable property for changes.
-            //Need to unbind before clearing container's children.
+        for (Node n : container.getChildren()) {
+            // Stop observing menu's showing & disable property for changes.
+            // Need to unbind before clearing container's children.
             MenuBarButton menuButton = (MenuBarButton)n;
             menuButton.hide();
             menuButton.menu.showingProperty().removeListener(menuButton.menuListener);
@@ -569,6 +569,11 @@
                                         currentMenuBarStage = null;
                                         setSystemMenu(stage);
                                     }
+                                } else {
+                                    if (curMBSkin != null && curMBSkin.getSkinnable() != null &&
+                                            curMBSkin.getSkinnable().isUseSystemMenuBar()) {
+                                        curMBSkin.getSkinnable().setUseSystemMenuBar(false);
+                                    }
                                 }
                             }
                         }
@@ -580,12 +585,8 @@
                                     if (systemMenuMap == null) {
                                         initSystemMenuBar();
                                     }
-                                    if (wrappedMenus == null) {
-                                        wrappedMenus = new ArrayList<>();
-                                        systemMenuMap.put(stage, new WeakReference<>(this));
-                                    } else {
-                                        wrappedMenus.clear();
-                                    }
+                                    wrappedMenus = new ArrayList<>();
+                                    systemMenuMap.put(stage, new WeakReference<>(this));
                                     for (Menu menu : getSkinnable().getMenus()) {
                                         wrappedMenus.add(GlobalMenuAdapter.adapt(menu));
                                     }
--- a/modules/controls/src/main/java/javafx/scene/control/MenuBar.java	Thu Aug 13 04:46:18 2015 -0700
+++ b/modules/controls/src/main/java/javafx/scene/control/MenuBar.java	Sat Aug 15 07:47:06 2015 -0700
@@ -33,6 +33,7 @@
 
 import javafx.beans.DefaultProperty;
 import javafx.beans.property.BooleanProperty;
+import javafx.beans.value.ObservableValue;
 import javafx.beans.value.WritableValue;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
@@ -130,7 +131,13 @@
      *
      * This should not be set on more than one MenuBar instance per
      * Stage. If this property is set to true on more than one
-     * MenuBar in the same Stage, then the behavior is undefined.
+     * MenuBar in the same Stage, then the last menu set is allowed
+     * to modify the system menu bar, and if there is an existing installed
+     * system menu it is unset and removed from the system menu bar.
+     *
+     * Note that trying to uni-directionally bind to this property
+     * will throw a RuntimeException.  Please use
+     * bi-directional binding to this property instead.
      *
      * @since JavaFX 2.1
      */
@@ -152,10 +159,19 @@
                 public String getName() {
                     return "useSystemMenuBar";
                 }
+                
+                @Override
+                public void bind(final ObservableValue<? extends Boolean> rawObservable) {
+                    throw new RuntimeException(BIND_MSG);
+                }
+
             };
         }
         return useSystemMenuBar;
     }
+    private String BIND_MSG =
+        "cannot uni-directionally bind to the system menu bar - use bindBidrectional instead";
+                                               
     private BooleanProperty useSystemMenuBar;
     public final void setUseSystemMenuBar(boolean value) {
         useSystemMenuBarProperty().setValue(value);
--- a/modules/graphics/src/main/native-glass/mac/GlassMenu.m	Thu Aug 13 04:46:18 2015 -0700
+++ b/modules/graphics/src/main/native-glass/mac/GlassMenu.m	Sat Aug 15 07:47:06 2015 -0700
@@ -67,7 +67,7 @@
 
 - (void)dealloc
 {
-    NSLog(@"GlassMenubar dealloc: %p", self);
+    LOG("GlassMenubar dealloc: %p", self);
     [super dealloc];
 }
 
--- a/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile	Thu Aug 13 04:46:18 2015 -0700
+++ b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile	Sat Aug 15 07:47:06 2015 -0700
@@ -84,4 +84,4 @@
 	mkdir -p $(TARGET_DIRS)
 
 $(TARGET): $(OBJECTS)
-	$(CC) -shared $(OBJECTS) $(LDFLAGS) -o $@
+	$(LINKER) -shared $(OBJECTS) $(LDFLAGS) -o $@
--- a/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile	Thu Aug 13 04:46:18 2015 -0700
+++ b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile	Sat Aug 15 07:47:06 2015 -0700
@@ -90,4 +90,4 @@
 	mkdir -p $(TARGET_DIRS)
 
 $(TARGET): $(OBJECTS)
-	$(CC) -shared $(OBJECTS) $(ON2_LIB) $(ON2_LIB) $(LDFLAGS) -o $@
+	$(LINKER) -shared $(OBJECTS) $(ON2_LIB) $(ON2_LIB) $(LDFLAGS) -o $@
--- a/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile	Thu Aug 13 04:46:18 2015 -0700
+++ b/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile	Sat Aug 15 07:47:06 2015 -0700
@@ -260,4 +260,4 @@
 	mkdir -p $(TARGET_DIRS)
 
 $(TARGET): $(OBJECTS)
-	$(CC) -shared $(OBJECTS) $(LDFLAGS) -o $@
+	$(LINKER) -shared $(OBJECTS) $(LDFLAGS) -o $@
--- a/modules/media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile	Thu Aug 13 04:46:18 2015 -0700
+++ b/modules/media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile	Sat Aug 15 07:47:06 2015 -0700
@@ -98,4 +98,4 @@
 	mkdir -p $(TARGET_DIRS)
 
 $(TARGET): $(OBJECTS)
-	$(CC) -dynamiclib $(OBJECTS) $(ON2_LIB) $(LDFLAGS) -o $@
+	$(LINKER) -dynamiclib $(OBJECTS) $(ON2_LIB) $(LDFLAGS) -o $@
--- a/modules/media/src/main/native/gstreamer/projects/mac/glib-lite/Makefile	Thu Aug 13 04:46:18 2015 -0700
+++ b/modules/media/src/main/native/gstreamer/projects/mac/glib-lite/Makefile	Sat Aug 15 07:47:06 2015 -0700
@@ -154,4 +154,4 @@
 	mkdir -p $(TARGET_DIRS)
 
 $(TARGET): $(OBJECTS)
-	$(CC) -dynamiclib $(OBJECTS) $(LDFLAGS) -o $@
+	$(LINKER) -dynamiclib $(OBJECTS) $(LDFLAGS) -o $@
--- a/modules/media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile	Thu Aug 13 04:46:18 2015 -0700
+++ b/modules/media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile	Sat Aug 15 07:47:06 2015 -0700
@@ -259,4 +259,4 @@
 	mkdir -p $(TARGET_DIRS)
 
 $(TARGET): $(OBJECTS)
-	$(CC) -dynamiclib $(OBJECTS) $(LDFLAGS) -o $@
+	$(LINKER) -dynamiclib $(OBJECTS) $(LDFLAGS) -o $@
--- a/modules/media/src/main/native/gstreamer/projects/win/fxplugins/Makefile	Thu Aug 13 04:46:18 2015 -0700
+++ b/modules/media/src/main/native/gstreamer/projects/win/fxplugins/Makefile	Sat Aug 15 07:47:06 2015 -0700
@@ -3,8 +3,7 @@
 #
 
 CC   = cl.exe
-CPP  = cl.exe
-LINK = link.exe
+LINKER = link.exe
 
 GLIB_VERSION = 2.28.8
 
@@ -142,7 +141,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)))
+	$(LINKER) $(LDFLAGS) $(shell cygpath -ma "$(RESOURCE)") $(foreach object,$(OBJECTS),$(shell cygpath -ma $(object))) $(foreach lib,$(LIBS),$(shell cygpath -ma $(lib)))
 
 $(OBJECTS): | $(DEP_DIRS)
 
@@ -150,13 +149,13 @@
 	@mkdir -p $(DEP_DIRS)
 
 $(OBJBASE_DIR)/%.obj: $(SRCBASE_DIR)/%.cpp
-	$(CPP) $(CFLAGS) $(O1FLAGS) -TP -c -Fo$(shell cygpath -ma $@) $<
+	$(CC) $(CFLAGS) $(O1FLAGS) -TP -c -Fo$(shell cygpath -ma $@) $<
 
 $(OBJBASE_DIR)/%.obj: $(SRCBASE_DIR)/%.c
-	$(CPP) $(CFLAGS) $(O1FLAGS) -TC -c -Fo$(shell cygpath -ma $@) $<
+	$(CC) $(CFLAGS) $(O1FLAGS) -TC -c -Fo$(shell cygpath -ma $@) $<
 
 $(OBJBASE_DIR)/plugin_vp6/vp6decoder.obj: $(SRCBASE_DIR)/plugin_vp6/vp6decoder.c
-	$(CPP) $(CFLAGS) $(O2FLAGS) -TC -c -Fo$(shell cygpath -ma $@) $<
+	$(CC) $(CFLAGS) $(O2FLAGS) -TC -c -Fo$(shell cygpath -ma $@) $<
 
 $(BASECLASSES_TARGET):
 	$(MAKE) TARGET=$(BUILD_DIR)/$(BASECLASSES_TARGET) -f Makefile.BaseClasses
--- a/modules/media/src/main/native/gstreamer/projects/win/fxplugins/Makefile.BaseClasses	Thu Aug 13 04:46:18 2015 -0700
+++ b/modules/media/src/main/native/gstreamer/projects/win/fxplugins/Makefile.BaseClasses	Sat Aug 15 07:47:06 2015 -0700
@@ -2,8 +2,8 @@
 # BaseClasses Makefile
 #
 
-CPP = cl.exe
-LIB = lib.exe
+CC = cl.exe
+AR = lib.exe
 
 OBJBASE_DIR = $(BUILD_DIR)/obj/Microsoft/DirectShow/BaseClasses
 DEP_DIRS = $(BUILD_DIR) $(OBJBASE_DIR)
@@ -78,7 +78,7 @@
 default: $(TARGET)
 
 $(TARGET): $(OBJECTS) 
-	$(LIB) $(LIBFLAGS) $(foreach object,$(OBJECTS),$(shell cygpath -ma $(object)))
+	$(AR) $(LIBFLAGS) $(foreach object,$(OBJECTS),$(shell cygpath -ma $(object)))
 
 $(OBJECTS): | $(DEP_DIRS)
 
@@ -86,4 +86,4 @@
 	@mkdir -p $(DEP_DIRS)
 
 $(OBJBASE_DIR)/%.obj: $(SRCBASE_DIR)/%.cpp
-	$(CPP) $(CFLAGS) -TP -c -Fo$(shell cygpath -ma $@) $(shell cygpath -mas $<)
+	$(CC) $(CFLAGS) -TP -c -Fo$(shell cygpath -ma $@) $(shell cygpath -mas $<)
--- a/modules/media/src/main/native/gstreamer/projects/win/glib-lite/Makefile	Thu Aug 13 04:46:18 2015 -0700
+++ b/modules/media/src/main/native/gstreamer/projects/win/glib-lite/Makefile	Sat Aug 15 07:47:06 2015 -0700
@@ -1,7 +1,7 @@
 #
 # glib-lite Makefile
 #
-LINK = link.exe
+LINKER = link.exe
 
 GLIB_VERSION = 2.28.8
 export GLIB_BASE_DIR = 3rd_party/glib/glib-$(GLIB_VERSION)
@@ -51,7 +51,7 @@
 default: $(TARGET)
 
 $(TARGET): $(LIBS)
-	$(LINK) $(LDFLAGS) $(shell cygpath -ma "$(RESOURCE)") $(foreach lib,$(LIBS),$(shell cygpath -ma $(lib))) 
+	$(LINKER) $(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/glib-lite/Makefile.glib	Thu Aug 13 04:46:18 2015 -0700
+++ b/modules/media/src/main/native/gstreamer/projects/win/glib-lite/Makefile.glib	Sat Aug 15 07:47:06 2015 -0700
@@ -2,7 +2,7 @@
 # glib Makefile
 #
 CC = cl.exe
-LIB = lib.exe
+AR = lib.exe
 
 OBJBASE_DIR = $(BUILD_DIR)/obj/$(GLIB_BASE_DIR)/glib
 SRCBASE_DIR = ../../../$(GLIB_BASE_DIR)
@@ -160,7 +160,7 @@
 default: $(TARGET)
 
 $(TARGET): $(OBJECTS)
-	$(LIB) $(LIBFLAGS) $(foreach object,$(OBJECTS),$(shell cygpath -ma $(object))) 
+	$(AR) $(LIBFLAGS) $(foreach object,$(OBJECTS),$(shell cygpath -ma $(object))) 
 
 $(OBJECTS): | $(DEP_DIRS)
 
--- a/modules/media/src/main/native/gstreamer/projects/win/glib-lite/Makefile.gmodule	Thu Aug 13 04:46:18 2015 -0700
+++ b/modules/media/src/main/native/gstreamer/projects/win/glib-lite/Makefile.gmodule	Sat Aug 15 07:47:06 2015 -0700
@@ -2,7 +2,7 @@
 # gmodule Makefile
 #
 CC = cl.exe
-LIB = lib.exe
+AR = lib.exe
 
 OBJBASE_DIR = $(BUILD_DIR)/obj/$(GLIB_BASE_DIR)/gmodule
 SRCBASE_DIR = ../../../$(GLIB_BASE_DIR)
@@ -56,7 +56,7 @@
 default: $(TARGET)
 
 $(TARGET): $(OBJECTS) 
-	$(LIB) $(LIBFLAGS) $(foreach object,$(OBJECTS),$(shell cygpath -ma $(object)))
+	$(AR) $(LIBFLAGS) $(foreach object,$(OBJECTS),$(shell cygpath -ma $(object)))
 
 $(OBJECTS): | $(DEP_DIRS)
 
--- a/modules/media/src/main/native/gstreamer/projects/win/glib-lite/Makefile.gobject	Thu Aug 13 04:46:18 2015 -0700
+++ b/modules/media/src/main/native/gstreamer/projects/win/glib-lite/Makefile.gobject	Sat Aug 15 07:47:06 2015 -0700
@@ -2,7 +2,7 @@
 # gobject Makefile
 #
 CC = cl.exe
-LIB = lib.exe
+AR = lib.exe
 
 OBJBASE_DIR = $(BUILD_DIR)/obj/$(GLIB_BASE_DIR)/gobject
 SRCBASE_DIR = ../../../$(GLIB_BASE_DIR)
@@ -73,7 +73,7 @@
 default: $(TARGET)
 
 $(TARGET): $(OBJECTS) 
-	$(LIB) $(LIBFLAGS) $(foreach object,$(OBJECTS),$(shell cygpath -ma $(object)))
+	$(AR) $(LIBFLAGS) $(foreach object,$(OBJECTS),$(shell cygpath -ma $(object)))
 
 $(OBJECTS): | $(DEP_DIRS)
 
--- a/modules/media/src/main/native/gstreamer/projects/win/glib-lite/Makefile.gthread	Thu Aug 13 04:46:18 2015 -0700
+++ b/modules/media/src/main/native/gstreamer/projects/win/glib-lite/Makefile.gthread	Sat Aug 15 07:47:06 2015 -0700
@@ -2,7 +2,7 @@
 # gthread Makefile
 #
 CC = cl.exe
-LIB = lib.exe
+AR = lib.exe
 
 OBJBASE_DIR = $(BUILD_DIR)/obj/$(GLIB_BASE_DIR)/gthread
 SRCBASE_DIR = ../../../$(GLIB_BASE_DIR)
@@ -56,7 +56,7 @@
 default: $(TARGET)
 
 $(TARGET): $(OBJECTS) 
-	$(LIB) $(LIBFLAGS) $(foreach object,$(OBJECTS),$(shell cygpath -ma $(object))) 
+	$(AR) $(LIBFLAGS) $(foreach object,$(OBJECTS),$(shell cygpath -ma $(object))) 
 
 $(OBJECTS): | $(DEP_DIRS)
 
--- a/modules/media/src/main/native/gstreamer/projects/win/gstreamer-lite/Makefile	Thu Aug 13 04:46:18 2015 -0700
+++ b/modules/media/src/main/native/gstreamer/projects/win/gstreamer-lite/Makefile	Sat Aug 15 07:47:06 2015 -0700
@@ -2,7 +2,7 @@
 # gstreamer-lite Makefile
 #
 
-LINK = link.exe
+LINKER = link.exe
 
 GLIB_VERSION = 2.28.8
 export GLIB_DIR = ../../../3rd_party/glib/glib-$(GLIB_VERSION)
@@ -54,7 +54,7 @@
 	$(MAKE) $(TARGET)
 
 $(TARGET): $(LIBS)
-	$(LINK) $(LDFLAGS) $(shell cygpath -ma "$(RESOURCE)") $(foreach lib,$(LIBS),$(shell cygpath -ma $(lib)))
+	$(LINKER) $(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/gstreamer/projects/win/gstreamer-lite/Makefile.gstplugins	Thu Aug 13 04:46:18 2015 -0700
+++ b/modules/media/src/main/native/gstreamer/projects/win/gstreamer-lite/Makefile.gstplugins	Sat Aug 15 07:47:06 2015 -0700
@@ -2,7 +2,7 @@
 # gstplugins Makefile
 #
 CC  = cl.exe
-LIB = lib.exe
+AR = lib.exe
 
 BASE_DIR = ../../..
 GSTREAMER_LITE = gstreamer-lite
@@ -118,7 +118,7 @@
 default: $(TARGET)
 
 $(TARGET): $(OBJECTS) 
-	$(LIB) $(LIBFLAGS) $(foreach object,$(OBJECTS),$(shell cygpath -ma $(object)))
+	$(AR) $(LIBFLAGS) $(foreach object,$(OBJECTS),$(shell cygpath -ma $(object)))
 
 $(OBJECTS): | $(DEP_DIRS)
 
--- a/modules/media/src/main/native/gstreamer/projects/win/gstreamer-lite/Makefile.gstreamer	Thu Aug 13 04:46:18 2015 -0700
+++ b/modules/media/src/main/native/gstreamer/projects/win/gstreamer-lite/Makefile.gstreamer	Sat Aug 15 07:47:06 2015 -0700
@@ -2,7 +2,7 @@
 # gstreamer Makefile
 #
 CC  = cl.exe
-LIB = lib.exe
+AR = lib.exe
 
 BASE_DIR = ../../..
 GSTREAMER_LITE = gstreamer-lite
@@ -195,7 +195,7 @@
 default: $(TARGET)
 
 $(TARGET): $(OBJECTS) 
-	$(LIB) $(LIBFLAGS) $(foreach object,$(OBJECTS),$(shell cygpath -ma $(object)))
+	$(AR) $(LIBFLAGS) $(foreach object,$(OBJECTS),$(shell cygpath -ma $(object)))
 
 $(OBJECTS): | $(DEP_DIRS)
 
--- a/modules/media/src/main/native/jfxmedia/projects/linux/Makefile	Thu Aug 13 04:46:18 2015 -0700
+++ b/modules/media/src/main/native/jfxmedia/projects/linux/Makefile	Sat Aug 15 07:47:06 2015 -0700
@@ -128,7 +128,7 @@
 	mkdir -p $(DEP_DIRS)
 
 $(TARGET): $(DEPFILES) $(OBJECTS)
-	$(LINK) -shared $(OBJECTS) $(LDFLAGS) -o $@
+	$(LINKER) -shared $(OBJECTS) $(LDFLAGS) -o $@
 
 $(OBJBASE_DIR)/%.o: $(SRCBASE_DIR)/%.cpp
 	$(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDES) -x c++ -c $< -o $@
--- a/modules/media/src/main/native/jfxmedia/projects/mac/Makefile	Thu Aug 13 04:46:18 2015 -0700
+++ b/modules/media/src/main/native/jfxmedia/projects/mac/Makefile	Sat Aug 15 07:47:06 2015 -0700
@@ -177,7 +177,7 @@
 
 $(TARGET): $(JFXMEDIA_OBJECTS)
 	@mkdir -p $(dir $@)
-	$(LINK) -dynamiclib $(JFXMEDIA_LDFLAGS) $(JFXMEDIA_OBJECTS) -o $@
+	$(LINKER) -dynamiclib $(JFXMEDIA_LDFLAGS) $(JFXMEDIA_OBJECTS) -o $@
 
 
 # ------------------------------------------------------------------
@@ -304,4 +304,4 @@
 
 $(QTK_LIB): $(TARGET) $(QTK_OBJECTS)
 	@mkdir -p $(dir $@)
-	$(LINK)  $(QTK_LDFLAGS) -dynamiclib $(QTK_OBJECTS) -l$(BASE_NAME) -o $@
+	$(LINKER)  $(QTK_LDFLAGS) -dynamiclib $(QTK_OBJECTS) -l$(BASE_NAME) -o $@
--- a/modules/media/src/main/native/jfxmedia/projects/win/Makefile	Thu Aug 13 04:46:18 2015 -0700
+++ b/modules/media/src/main/native/jfxmedia/projects/win/Makefile	Sat Aug 15 07:47:06 2015 -0700
@@ -1,8 +1,7 @@
 # jfxmedia-jni win32/win64 makefile
 
 CC = cl.exe
-CPP = cl.exe
-LINK = link.exe
+LINKER = link.exe
 MAKEDEPEND = makedepend.exe
 
 BUILD_DIR = $(shell cygpath -u "$(OUTPUT_DIR)/$(BUILD_TYPE)")
@@ -149,7 +148,7 @@
 default: $(TARGET)
 
 $(TARGET): $(DEPFILE) $(OBJECTS) 
-	$(LINK) $(LDFLAGS) $(shell cygpath -ma "$(RESOURCE)") $(foreach object,$(OBJECTS),$(shell cygpath -ma $(object)))
+	$(LINKER) $(LDFLAGS) $(shell cygpath -ma "$(RESOURCE)") $(foreach object,$(OBJECTS),$(shell cygpath -ma $(object)))
 
 $(DEPFILE): | $(DEP_DIRS)
 	@echo $(DEPTOKEN) > $(DEPFILE)
@@ -161,7 +160,7 @@
 -include $(DEPFILE)
 
 $(OBJBASE_DIR)/%.obj: $(SRCBASE_DIR)/%.cpp
-	$(CPP) $(CFLAGS) -TP -c -Fo$(shell cygpath -ma $@) $<
+	$(CC) $(CFLAGS) -TP -c -Fo$(shell cygpath -ma $@) $<
 
 $(OBJBASE_DIR)/%.obj: $(SRCBASE_DIR)/%.c
 	$(CC) $(CFLAGS) -TC -c -Fo$(shell cygpath -ma $@) $<