From 9352b60653c5d9637ed1faf1d6be70c9cf0bc0a8 Mon Sep 17 00:00:00 2001 From: samuele3hu Date: Mon, 3 Jun 2013 17:40:31 +0800 Subject: [PATCH] issue #2103 modify some compile setup and del some resource file --- .../Resources/ccb/Published-iOS/MainScene.js | 11 ----------- .../ccb/Published-iOS/gem-0.caf.REMOVED.git-id | 1 - .../ccb/Published-iOS/gem-1.caf.REMOVED.git-id | 1 - .../Resources/ccb/Published-iOS/main.js | 18 ------------------ samples/Lua/TestLua/proj.emscripten/Makefile | 2 +- samples/Lua/TestLua/proj.linux/Makefile | 2 +- samples/Lua/TestLua/proj.marmalade/TestLua.mkb | 2 +- scripting/lua/proj.nacl/Makefile | 4 ++++ 8 files changed, 7 insertions(+), 34 deletions(-) delete mode 100644 samples/Cpp/TestCpp/Resources/ccb/Published-iOS/MainScene.js delete mode 100644 samples/Cpp/TestCpp/Resources/ccb/Published-iOS/gem-0.caf.REMOVED.git-id delete mode 100644 samples/Cpp/TestCpp/Resources/ccb/Published-iOS/gem-1.caf.REMOVED.git-id delete mode 100644 samples/Cpp/TestCpp/Resources/ccb/Published-iOS/main.js diff --git a/samples/Cpp/TestCpp/Resources/ccb/Published-iOS/MainScene.js b/samples/Cpp/TestCpp/Resources/ccb/Published-iOS/MainScene.js deleted file mode 100644 index bd8d5381a2..0000000000 --- a/samples/Cpp/TestCpp/Resources/ccb/Published-iOS/MainScene.js +++ /dev/null @@ -1,11 +0,0 @@ -// -// MainScene class -// -var MainScene = function(){}; - -// Create callback for button -MainScene.prototype.onPressButton = function() -{ - // Rotate the label when the button is pressed - this.helloLabel.runAction(cc.RotateBy.create(1,360)); -}; \ No newline at end of file diff --git a/samples/Cpp/TestCpp/Resources/ccb/Published-iOS/gem-0.caf.REMOVED.git-id b/samples/Cpp/TestCpp/Resources/ccb/Published-iOS/gem-0.caf.REMOVED.git-id deleted file mode 100644 index 5946b78bea..0000000000 --- a/samples/Cpp/TestCpp/Resources/ccb/Published-iOS/gem-0.caf.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -a52e5e08c724ae4cf7127f6f7dd712442ca79023 \ No newline at end of file diff --git a/samples/Cpp/TestCpp/Resources/ccb/Published-iOS/gem-1.caf.REMOVED.git-id b/samples/Cpp/TestCpp/Resources/ccb/Published-iOS/gem-1.caf.REMOVED.git-id deleted file mode 100644 index d6b9f2468c..0000000000 --- a/samples/Cpp/TestCpp/Resources/ccb/Published-iOS/gem-1.caf.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -0b68eacb898509b350a0bf8f0f81467bd7d9f7c4 \ No newline at end of file diff --git a/samples/Cpp/TestCpp/Resources/ccb/Published-iOS/main.js b/samples/Cpp/TestCpp/Resources/ccb/Published-iOS/main.js deleted file mode 100644 index 323f8f0752..0000000000 --- a/samples/Cpp/TestCpp/Resources/ccb/Published-iOS/main.js +++ /dev/null @@ -1,18 +0,0 @@ -// Autogenerated main.js file - -require("jsb.js"); - -require("MainScene.js"); - - -function main() -{ - cc.FileUtils.getInstance().loadFilenameLookup("fileLookup.plist"); - //cc.Texture2D.setDefaultAlphaPixelFormat(6); - var director = cc.Director.getInstance(); - var scene = cc.BuilderReader.loadAsScene("MainScene"); - var runningScene = director.getRunningScene(); - if (runningScene === null) director.runWithScene(scene); - else director.replaceScene(scene); -} -main(); \ No newline at end of file diff --git a/samples/Lua/TestLua/proj.emscripten/Makefile b/samples/Lua/TestLua/proj.emscripten/Makefile index 7661966849..89fbdf9a12 100644 --- a/samples/Lua/TestLua/proj.emscripten/Makefile +++ b/samples/Lua/TestLua/proj.emscripten/Makefile @@ -16,7 +16,7 @@ include $(COCOS_ROOT)/cocos2dx/proj.emscripten/cocos2dx.mk $(TARGET): $(OBJECTS) $(STATICLIBS) $(COCOS_LIBS) $(CORE_MAKEFILE_LIST) @mkdir -p $(@D) cp -a ../../../../samples/Cpp/TestCpp/Resources ../../../../samples/Lua/TestLua - cp -r ../../../../scripting/lua/scripting/ ../../../../samples/Lua/TestLua/Resources + cp -r ../../../../scripting/lua/script/ ../../../../samples/Lua/TestLua/Resources $(CXX) $(CXXFLAGS) $(OBJECTS) -o $@ $(SHAREDLIBS) $(STATICLIBS) $(LIBS) $(OBJ_DIR)/%.o: ../%.cpp $(CORE_MAKEFILE_LIST) diff --git a/samples/Lua/TestLua/proj.linux/Makefile b/samples/Lua/TestLua/proj.linux/Makefile index 0604cc64ce..53012c2cf8 100644 --- a/samples/Lua/TestLua/proj.linux/Makefile +++ b/samples/Lua/TestLua/proj.linux/Makefile @@ -16,7 +16,7 @@ include $(COCOS_ROOT)/cocos2dx/proj.linux/cocos2dx.mk $(TARGET): $(OBJECTS) $(STATICLIBS) $(COCOS_LIBS) $(CORE_MAKEFILE_LIST) @mkdir -p $(@D) cp -R -n ../../../../samples/Cpp/TestCpp/Resources ../../../../samples/Lua/TestLua - cp -r ../../../../scripting/lua/scripting/ ../../../../samples/Lua/TestLua/Resources + cp -r ../../../../scripting/lua/script/ ../../../../samples/Lua/TestLua/Resources $(LOG_LINK)$(CXX) $(CXXFLAGS) $(OBJECTS) -o $@ $(SHAREDLIBS) $(STATICLIBS) $(LIBS) $(OBJ_DIR)/%.o: ../%.cpp $(CORE_MAKEFILE_LIST) diff --git a/samples/Lua/TestLua/proj.marmalade/TestLua.mkb b/samples/Lua/TestLua/proj.marmalade/TestLua.mkb index f0e4b368c7..1f5dc080aa 100644 --- a/samples/Lua/TestLua/proj.marmalade/TestLua.mkb +++ b/samples/Lua/TestLua/proj.marmalade/TestLua.mkb @@ -44,5 +44,5 @@ files postbuild "${MARMALADE_ROOT}/s3e/python/python ./cccopy.py -s ../../../../samples/Cpp/TestCpp/Resources/ -d ../../../../samples/Lua/TestLua/Resources/" -postbuild "${MARMALADE_ROOT}/s3e/python/python ./cccopy.py -s ../../../../scripting/lua/scripting/ -d ../../../../samples/Lua/TestLua/Resources/" +postbuild "${MARMALADE_ROOT}/s3e/python/python ./cccopy.py -s ../../../../scripting/lua/script/ -d ../../../../samples/Lua/TestLua/Resources/" diff --git a/scripting/lua/proj.nacl/Makefile b/scripting/lua/proj.nacl/Makefile index ceaa62c2a0..519f531765 100644 --- a/scripting/lua/proj.nacl/Makefile +++ b/scripting/lua/proj.nacl/Makefile @@ -61,3 +61,7 @@ $(TARGET): $(OBJECTS) $(CORE_MAKEFILE_LIST) $(OBJ_DIR)/%.o: ../%.c $(CORE_MAKEFILE_LIST) @mkdir -p $(@D) $(LOG_CC)$(NACL_CC) -MMD $(CCFLAGS) $(INCLUDES) $(DEFINES) $(VISIBILITY) -c $< -o $@ + +$(OBJ_DIR)/%.o: ../%.cpp $(CORE_MAKEFILE_LIST) + @mkdir -p $(@D) + $(LOG_CXX)$(NACL_CXX) -MMD $(CXXFLAGS) $(INCLUDES) $(DEFINES) -c $< -o $@