@@ -1,5 +1,5 @@ EXTRA_DIST = \ - $(wildcard *.js) \ - $(wildcard *.xaml) + $(wildcard mtk/*.js) \ + $(wildcard *.js) MAINTAINERCLEANFILES = Makefile.in player/Makefile.am @@ -1,9 +1,9 @@ RESOURCE_OUT_FILE = mmp-resources.h RESOURCE_VAR_PREFIX = MLMP_RESOURCE_ +RESOURCE_ALL_VAR_NAME = MLMP_RESOURCES_ALL RESOURCES = \ - $(top_srcdir)/player/player.xaml \ - $(top_srcdir)/player/player.js \ - $(top_srcdir)/player/wmp-controls.js + $(wildcard $(top_srcdir)/player/*.js) \ + $(wildcard $(top_srcdir)/player/mtk/*.js) RESOURCES_BUILD = $(foreach res, $(RESOURCES), \ `echo $(RESOURCE_VAR_PREFIX)$(notdir $(res)) \ @@ -12,7 +12,7 @@ RESOURCES_BUILD = $(foreach res, $(RESOURCES), \ $(res)) $(RESOURCE_OUT_FILE): $(srcdir)/generate-resource $(RESOURCES) - $(SHELL) $< $@ $(RESOURCES_BUILD) + $(SHELL) $< $@ $(RESOURCE_ALL_VAR_NAME) $(RESOURCES_BUILD) mpplugindir=$(BROWSER_PLUGIN_DIR) mpplugin_LTLIBRARIES = libmoonmp-plugin.la plugin/Makefile.am @@ -20,6 +20,9 @@ out_define="_$(echo $out | tr '[:lower:]' '[:upper:]' | sed 's,[-.],_,g;s,[^A-Z_],,g')" +all_name=$1; shift +all_array="" + [[ -z $out ]] && bail "You must specify an output file first" @@ -33,15 +36,6 @@ while (($# > 0)); do [[ $inputs -eq 0 ]] && { (echo "/* " echo " * $out: auto-generated embedded resources " - echo " * " - echo " * This file was created with the command: " - echo " * " - echo " * $ $0 $out \ " - for ((i=1; i<$#; i+=2)); do - argset=" * $(eval "echo \$$i \$$(($i+1))")" - [[ $i -lt $(($#-1)) ]] && argset="$argset \\" - echo "$argset" - done echo " */ " echo echo "#ifndef $out_define" @@ -50,6 +44,7 @@ while (($# > 0)); do } ((inputs++)) + all_array="$all_array $var" (echo "/* Embedded Resource $inputs ($input) */" table=$(hexdump -e '" " 16/1 "0x%02x, " "\n"' $input | sed -r 's/, 0x[ ,]+.*/, 0x00/') @@ -58,12 +53,19 @@ while (($# > 0)); do [[ ${table:$((${#table}-1))} = "," ]] && echo " 0x00" echo "};" echo) >> $out - + shift; shift done [[ $inputs -eq 0 ]] && bail "You must specify at least one variable/input file pair" +echo "static const char const * $all_name [] = {" >> $out +for var in $all_array; do + echo " ${var}," >> $out +done +echo " NULL" >> $out +echo "};" >> $out +echo >> $out echo "#endif /* $out_define */" >> $out plugin/generate-resource b0629e5b999a723504d0e5a885dddc051ebc1560 Aaron Bockover abockover@novell.com http://github.com/abock/moonshine/commit/160e1efe18226cac29b22ab442be03c6f2e4f0b2 160e1efe18226cac29b22ab442be03c6f2e4f0b2 2009-02-09T02:33:40-08:00 2009-02-09T02:33:40-08:00 Fix build, and generate an 'all' array for the embedded resources so they don't need to be referenced by name in the plugin code ba3a4c718fd9c424472dd9b14aafd25621c58227 Aaron Bockover abockover@novell.com