[nacltoons] Reference resources directly from checkout location

nacltoons/Makefile

Index: nacltoons/Makefile
diff --git a/nacltoons/Makefile b/nacltoons/Makefile
index 6f08ea79f765f5f45611c5351496c7a4b204c8de..9c2af96ac7020dd65e71645f22c6f3f5d124134f 100644
--- a/nacltoons/Makefile
+++ b/nacltoons/Makefile
@@ -14,11 +14,6 @@ ifndef BUILDBOT_BUILDERNAME
 NACL_ARCH ?= x86_64
 endif
 
-# Use this variable to enable/disable nacl_mounts an an alternative to
-# nacl_io.  When you do this you will also want to clean the cocos build using:
-# "build/build_cocos2dx.sh clean"
-#NACL_MOUNTS = 1
-
 DEBUG ?= 1
 ifeq ($(DEBUG),1)
   CONFIG := Debug
@@ -31,14 +26,10 @@ PUBLISH_DIR := $(OUT_DIR)/publish
 
 all: cocos2dx
 	@echo '@@@BUILD_STEP build game@@@'
-ifdef NACL_MOUNTS
-	$(MAKE) -f game.mk NACL_ARCH=$(NACL_ARCH) DEBUG=$(DEBUG) NACL_MOUNTS=$(NACL_MOUNTS)
-else
 	$(MAKE) -f game.mk NACL_ARCH=$(NACL_ARCH) DEBUG=$(DEBUG)
-endif
 
 cocos2dx : build/build-cocos2dx.sh
-	NACL_MOUNTS=$(NACL_MOUNTS) NACL_ARCH=$(NACL_ARCH) build/build-cocos2dx.sh
+	NACL_ARCH=$(NACL_ARCH) build/build-cocos2dx.sh
 
 really-clean: clean
 	$(RM) -r $(OUT_DIR)
@@ -51,10 +42,8 @@ publish: all
 	mkdir -p $(PUBLISH_DIR)
 	cp $(OUT_DIR)/newlib/$(CONFIG)/*.nexe $(PUBLISH_DIR)
 	cp $(OUT_DIR)/newlib/$(CONFIG)/*.nmf $(PUBLISH_DIR)
-	cp -r data/* $(PUBLISH_DIR)
-ifndef NACL_MOUNTS
-	cp -r data/res $(PUBLISH_DIR)/Resources
-endif
+	cp data/*.* $(PUBLISH_DIR)

[binji, 2013/03/12 23:57:36]

why not just data/*?
also, what are we copying here?

[Sam Clegg, 2013/03/13 00:45:51]

All the non-cocos2dx resources such as html and js which
are outside of the resources tree that cocos2dx sees.

I guess we should symlink the entire data folder but
its a little more complicated to achieve that.

+	ln -s $(PWD)/data/res $(PUBLISH_DIR)/Resources
 
 CHROME_ARGS += --no-first-run --user-data-dir=$(OUT_DIR)/user-data-dir