Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[#889982] Ensure wrappers are included in the correct order.

  • Loading branch information...
commit 01c7760701e0fa4e82cb4c2980b3a1f0aa371dcf 1 parent d4df049
@ScottDowne ScottDowne authored
Showing with 3 additions and 2 deletions.
  1. +3 −2 Makefile
View
5 Makefile
@@ -68,8 +68,9 @@ EFFECTS_SRC := $(filter-out %unit.js, $(shell find $(EFFECTS_DIR) -name 'popcorn
# Grab all popcorn.<Module-name>.js files from modules dir
MODULES_SRC := $(filter-out %unit.js, $(shell find $(MODULES_DIR) -name 'popcorn.*.js' -print))
-# Grab all popcorn.<wrapper-name>.js files from modules dir
-WRAPPERS_SRC := $(filter-out %unit.js, $(shell find $(WRAPPERS_DIR) -name 'popcorn.*.js' -print))
+# Grab all popcorn.<wrapper-name>.js files from wrappers dir
+WRAPPERS_SRC := $(WRAPPERS_DIR)/common/popcorn._MediaElementProto.js \
+ $(filter-out %unit.js %MediaElementProto.js, $(shell find $(WRAPPERS_DIR) -name 'popcorn.*.js' -print))
# Grab all popcorn.<plugin-name>.unit.js files from plugins dir
PLUGINS_UNIT := $(shell find ${PLUGINS_DIR} -name 'popcorn.*.unit.js' -print)
Please sign in to comment.
Something went wrong with that request. Please try again.