Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
[#889982] Ensure wrappers are included in the correct order.
  • Loading branch information
ScottDowne committed Jul 3, 2013
1 parent d4df049 commit 01c7760701e0fa4e82cb4c2980b3a1f0aa371dcf
Showing 1 changed file with 3 additions and 2 deletions.
@@ -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)

0 comments on commit 01c7760

Please sign in to comment.