Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

issue #2103 modify some compile setup and del some resource file

This commit is contained in:
samuele3hu 2013-06-03 17:40:31 +08:00
parent 0d33d909c9
commit 9352b60653
8 changed files with 7 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
samples/Cpp/TestCpp/Resources/ccb/Published-iOS/MainScene.js
View File

@ -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));
};

1
samples/Cpp/TestCpp/Resources/ccb/Published-iOS/gem-0.caf.REMOVED.git-id
View File

@ -1 +0,0 @@
a52e5e08c724ae4cf7127f6f7dd712442ca79023

1
samples/Cpp/TestCpp/Resources/ccb/Published-iOS/gem-1.caf.REMOVED.git-id
View File

@ -1 +0,0 @@
0b68eacb898509b350a0bf8f0f81467bd7d9f7c4

18
samples/Cpp/TestCpp/Resources/ccb/Published-iOS/main.js
View File

@ -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();

2
samples/Lua/TestLua/proj.emscripten/Makefile
View File

@ -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)

2
samples/Lua/TestLua/proj.linux/Makefile
View File

@ -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)

2
samples/Lua/TestLua/proj.marmalade/TestLua.mkb
View File

@ -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/"

4
scripting/lua/proj.nacl/Makefile
View File

@ -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 $@