mirror of https://github.com/axmolengine/axmol.git
Merge branch 'releasing' of https://github.com/minggo/cocos2d-x into minggo-releasing
This commit is contained in:
James Chen
commit
653c1f7f8f
|
|
@ -1 +1 @@
|
|||
ab317c33d7682a318b7e7f617553b4039c5c93f1
|
||||
61930829c286fd6ec795bccee6e841a60e8ba34f
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
APP_STL := gnustl_static
|
||||
APP_CPPFLAGS := -frtti -DCOCOS2D_JAVASCRIPT=1 -std=c++11
|
||||
APP_CPPFLAGS += -DCOCOS2D_DEBUG=1 -DCC_ENABLE_CHIPMUNK_INTEGRATION=
|
||||
APP_CPPFLAGS += -DCOCOS2D_DEBUG=1 -DCC_ENABLE_CHIPMUNK_INTEGRATION=1
|
||||
NDK_TOOLCHAIN_VERSION=4.7
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--Encapsulate SimpleAudioEngine to AudioEngine,Play music and sound effects.
|
||||
local M = {}
|
||||
local sharedEngine = SimpleAudioEngine:sharedEngine()
|
||||
local sharedEngine = SimpleAudioEngine:getInstance()
|
||||
|
||||
function M.stopAllEffects()
|
||||
sharedEngine:stopAllEffects()
|
||||
|
|
|
|||
|
|
@ -38,15 +38,14 @@ bool HelloWorld::init()
|
|||
MenuItemImage *pCloseItem = MenuItemImage::create(
|
||||
"CloseNormal.png",
|
||||
"CloseSelected.png",
|
||||
this,
|
||||
menu_selector(HelloWorld::menuCloseCallback));
|
||||
CC_CALLBACK_1(HelloWorld::menuCloseCallback, this));
|
||||
|
||||
pCloseItem->setPosition(ccp(origin.x + visibleSize.width - pCloseItem->getContentSize().width/2 ,
|
||||
pCloseItem->setPosition(Point(origin.x + visibleSize.width - pCloseItem->getContentSize().width/2 ,
|
||||
origin.y + pCloseItem->getContentSize().height/2));
|
||||
|
||||
// create menu, it's an autorelease object
|
||||
Menu* pMenu = Menu::create(pCloseItem, NULL);
|
||||
pMenu->setPosition(PointZero);
|
||||
pMenu->setPosition(Point::ZERO);
|
||||
this->addChild(pMenu, 1);
|
||||
|
||||
/////////////////////////////
|
||||
|
|
@ -58,7 +57,7 @@ bool HelloWorld::init()
|
|||
LabelTTF* pLabel = LabelTTF::create("Hello World", "Arial", 24);
|
||||
|
||||
// position the label on the center of the screen
|
||||
pLabel->setPosition(ccp(origin.x + visibleSize.width/2,
|
||||
pLabel->setPosition(Point(origin.x + visibleSize.width/2,
|
||||
origin.y + visibleSize.height - pLabel->getContentSize().height));
|
||||
|
||||
// add the label as a child to this layer
|
||||
|
|
@ -68,7 +67,7 @@ bool HelloWorld::init()
|
|||
Sprite* pSprite = Sprite::create("HelloWorld.png");
|
||||
|
||||
// position the sprite on the center of the screen
|
||||
pSprite->setPosition(ccp(visibleSize.width/2 + origin.x, visibleSize.height/2 + origin.y));
|
||||
pSprite->setPosition(Point(visibleSize.width/2 + origin.x, visibleSize.height/2 + origin.y));
|
||||
|
||||
// add the sprite as a child to this layer
|
||||
this->addChild(pSprite, 0);
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
android:versionCode="1"
|
||||
android:versionName="1.0">
|
||||
|
||||
<uses-sdk android:minSdkVersion="8"/>
|
||||
<uses-sdk android:minSdkVersion="9"/>
|
||||
<uses-feature android:glEsVersion="0x00020000" />
|
||||
|
||||
<application android:label="@string/app_name"
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
APP_STL := gnustl_static
|
||||
APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCOCOS2D_DEBUG=1
|
||||
APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCOCOS2D_DEBUG=1 -std=c++11
|
||||
NDK_TOOLCHAIN_VERSION=4.7
|
||||
|
|
|
|||
|
|
@ -8,6 +8,6 @@
|
|||
# project structure.
|
||||
|
||||
# Project target.
|
||||
target=android-8
|
||||
target=android-10
|
||||
|
||||
android.library.reference.1=../../../cocos2dx/platform/android/java
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ AppDelegate::AppDelegate()
|
|||
|
||||
AppDelegate::~AppDelegate()
|
||||
{
|
||||
ScriptEngineManager::purgeSharedManager();
|
||||
ScriptEngineManager::destroyInstance();
|
||||
}
|
||||
|
||||
bool AppDelegate::applicationDidFinishLaunching()
|
||||
|
|
@ -83,14 +83,14 @@ void handle_signal(int signal) {
|
|||
void AppDelegate::applicationDidEnterBackground()
|
||||
{
|
||||
Director::getInstance()->stopAnimation();
|
||||
SimpleAudioEngine::sharedEngine()->pauseBackgroundMusic();
|
||||
SimpleAudioEngine::sharedEngine()->pauseAllEffects();
|
||||
SimpleAudioEngine::getInstance()->pauseBackgroundMusic();
|
||||
SimpleAudioEngine::getInstance()->pauseAllEffects();
|
||||
}
|
||||
|
||||
// this function will be called when the app is active again
|
||||
void AppDelegate::applicationWillEnterForeground()
|
||||
{
|
||||
Director::getInstance()->startAnimation();
|
||||
SimpleAudioEngine::sharedEngine()->resumeBackgroundMusic();
|
||||
SimpleAudioEngine::sharedEngine()->resumeAllEffects();
|
||||
SimpleAudioEngine::getInstance()->resumeBackgroundMusic();
|
||||
SimpleAudioEngine::getInstance()->resumeAllEffects();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
APP_STL := gnustl_static
|
||||
APP_CPPFLAGS := -frtti -DCOCOS2D_JAVASCRIPT=1
|
||||
APP_CPPFLAGS += -DCOCOS2D_DEBUG=1 -DCC_ENABLE_CHIPMUNK_INTEGRATION=1
|
||||
APP_CPPFLAGS += -DCOCOS2D_DEBUG=1 -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11
|
||||
NDK_TOOLCHAIN_VERSION=4.7
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@
|
|||
1AF4C35A17865F7400122817 /* jsb_sys.js in Resources */ = {isa = PBXBuildFile; fileRef = 1AF4C34217865F1600122817 /* jsb_sys.js */; };
|
||||
1AF4C35B17865F7400122817 /* jsb.js in Resources */ = {isa = PBXBuildFile; fileRef = 1AF4C34317865F1600122817 /* jsb.js */; };
|
||||
1AF4C35C17865F7400122817 /* main.debug.js in Resources */ = {isa = PBXBuildFile; fileRef = 1AF4C34417865F1600122817 /* main.debug.js */; };
|
||||
466AF679179FC7EE002EE9BB /* jsb_deprecated.js in Resources */ = {isa = PBXBuildFile; fileRef = 466AF66C179FC7BE002EE9BB /* jsb_deprecated.js */; };
|
||||
A92275421517C094001B78AA /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A92275411517C094001B78AA /* QuartzCore.framework */; };
|
||||
A92275441517C094001B78AA /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A92275431517C094001B78AA /* OpenGLES.framework */; };
|
||||
A92275461517C094001B78AA /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A92275451517C094001B78AA /* OpenAL.framework */; };
|
||||
|
|
@ -202,6 +203,7 @@
|
|||
1AF4C34217865F1600122817 /* jsb_sys.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = jsb_sys.js; path = ../../../scripting/javascript/bindings/js/jsb_sys.js; sourceTree = "<group>"; };
|
||||
1AF4C34317865F1600122817 /* jsb.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = jsb.js; path = ../../../scripting/javascript/bindings/js/jsb.js; sourceTree = "<group>"; };
|
||||
1AF4C34417865F1600122817 /* main.debug.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = main.debug.js; path = ../../../scripting/javascript/bindings/js/main.debug.js; sourceTree = "<group>"; };
|
||||
466AF66C179FC7BE002EE9BB /* jsb_deprecated.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = jsb_deprecated.js; path = ../../../scripting/javascript/bindings/js/jsb_deprecated.js; sourceTree = "<group>"; };
|
||||
A922753D1517C094001B78AA /* HelloJavascript.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HelloJavascript.app; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
A92275411517C094001B78AA /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
|
||||
A92275431517C094001B78AA /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; };
|
||||
|
|
@ -290,6 +292,7 @@
|
|||
1AF4C33817865EF900122817 /* JS Common */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
466AF66C179FC7BE002EE9BB /* jsb_deprecated.js */,
|
||||
1AF4C33917865F1600122817 /* jsb_chipmunk_constants.js */,
|
||||
1AF4C33A17865F1600122817 /* jsb_chipmunk.js */,
|
||||
1AF4C33B17865F1600122817 /* jsb_cocos2d_constants.js */,
|
||||
|
|
@ -531,6 +534,7 @@
|
|||
isa = PBXResourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
466AF679179FC7EE002EE9BB /* jsb_deprecated.js in Resources */,
|
||||
1AF4C35117865F7400122817 /* jsb_chipmunk_constants.js in Resources */,
|
||||
1AF4C35217865F7400122817 /* jsb_chipmunk.js in Resources */,
|
||||
1AF4C35317865F7400122817 /* jsb_cocos2d_constants.js in Resources */,
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ bool AppDelegate::applicationDidFinishLaunching()
|
|||
pDirector->setAnimationInterval(1.0 / 60);
|
||||
|
||||
// register lua engine
|
||||
LuaEngine* pEngine = LuaEngine::defaultEngine();
|
||||
LuaEngine* pEngine = LuaEngine::getInstance();
|
||||
ScriptEngineManager::getInstance()->setScriptEngine(pEngine);
|
||||
|
||||
LuaStack *pStack = pEngine->getLuaStack();
|
||||
|
|
@ -57,7 +57,7 @@ void AppDelegate::applicationDidEnterBackground()
|
|||
{
|
||||
Director::getInstance()->stopAnimation();
|
||||
|
||||
SimpleAudioEngine::sharedEngine()->pauseBackgroundMusic();
|
||||
SimpleAudioEngine::getInstance()->pauseBackgroundMusic();
|
||||
}
|
||||
|
||||
// this function will be called when the app is active again
|
||||
|
|
@ -65,5 +65,5 @@ void AppDelegate::applicationWillEnterForeground()
|
|||
{
|
||||
Director::getInstance()->startAnimation();
|
||||
|
||||
SimpleAudioEngine::sharedEngine()->resumeBackgroundMusic();
|
||||
SimpleAudioEngine::getInstance()->resumeBackgroundMusic();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,9 +32,9 @@ local function main()
|
|||
|
||||
-- create dog animate
|
||||
local textureDog = CCTextureCache:getInstance():addImage("dog.png")
|
||||
local rect = CCRectMake(0, 0, frameWidth, frameHeight)
|
||||
local rect = CCRect(0, 0, frameWidth, frameHeight)
|
||||
local frame0 = CCSpriteFrame:createWithTexture(textureDog, rect)
|
||||
rect = CCRectMake(frameWidth, 0, frameWidth, frameHeight)
|
||||
rect = CCRect(frameWidth, 0, frameWidth, frameHeight)
|
||||
local frame1 = CCSpriteFrame:createWithTexture(textureDog, rect)
|
||||
|
||||
local spriteDog = CCSprite:createWithSpriteFrame(frame0)
|
||||
|
|
@ -87,7 +87,7 @@ local function main()
|
|||
end
|
||||
|
||||
-- add crop
|
||||
local frameCrop = CCSpriteFrame:create("crop.png", CCRectMake(0, 0, 105, 95))
|
||||
local frameCrop = CCSpriteFrame:create("crop.png", CCRect(0, 0, 105, 95))
|
||||
for i = 0, 3 do
|
||||
for j = 0, 1 do
|
||||
local spriteCrop = CCSprite:createWithSpriteFrame(frameCrop);
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
android:versionCode="1"
|
||||
android:versionName="1.0">
|
||||
|
||||
<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="9"/>
|
||||
<uses-sdk android:minSdkVersion="9"/>
|
||||
<uses-feature android:glEsVersion="0x00020000" />
|
||||
|
||||
<application android:label="@string/app_name"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
APP_STL := gnustl_static
|
||||
APP_CPPFLAGS := -frtti -DCOCOS2D_DEBUG=1 -DCC_ENABLE_CHIPMUNK_INTEGRATION=1
|
||||
APP_CPPFLAGS := -frtti -DCOCOS2D_DEBUG=1 -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11
|
||||
APP_CPPFLAGS += -fexceptions
|
||||
NDK_TOOLCHAIN_VERSION=4.7
|
||||
|
|
|
|||
|
|
@ -8,6 +8,6 @@
|
|||
# project structure.
|
||||
|
||||
# Project target.
|
||||
target=android-8
|
||||
target=android-10
|
||||
|
||||
android.library.reference.1=../../../cocos2dx/platform/android/java
|
||||
|
|
|
|||
|
|
@ -32,12 +32,9 @@
|
|||
1AF4C3F41786633E00122817 /* libcocos2dx-extensions iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C3DD1786631700122817 /* libcocos2dx-extensions iOS.a */; };
|
||||
1AF4C3F51786633E00122817 /* libCocosDenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C3E31786631700122817 /* libCocosDenshion iOS.a */; };
|
||||
1AF4C3F61786633E00122817 /* libluabindings iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C3E71786631700122817 /* libluabindings iOS.a */; };
|
||||
1AF4C3FD1786635F00122817 /* AudioEngine.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1AF4C3F81786635F00122817 /* AudioEngine.lua */; };
|
||||
1AF4C3FE1786635F00122817 /* CCBReaderLoad.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1AF4C3F91786635F00122817 /* CCBReaderLoad.lua */; };
|
||||
1AF4C3FF1786635F00122817 /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1AF4C3FA1786635F00122817 /* Cocos2dConstants.lua */; };
|
||||
1AF4C4001786635F00122817 /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1AF4C3FB1786635F00122817 /* Opengl.lua */; };
|
||||
1AF4C4011786635F00122817 /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1AF4C3FC1786635F00122817 /* OpenglConstants.lua */; };
|
||||
1AF4C403178663F200122817 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C402178663F200122817 /* libz.dylib */; };
|
||||
466AF68B179FCC03002EE9BB /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = 466AF68A179FCC03002EE9BB /* DrawPrimitives.lua */; };
|
||||
466AF68D179FCC09002EE9BB /* Deprecated.lua in Resources */ = {isa = PBXBuildFile; fileRef = 466AF68C179FCC09002EE9BB /* Deprecated.lua */; };
|
||||
F293B3CD15EB7BE500256477 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3CC15EB7BE500256477 /* QuartzCore.framework */; };
|
||||
F293B3CF15EB7BE500256477 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3CE15EB7BE500256477 /* OpenGLES.framework */; };
|
||||
F293B3D115EB7BE500256477 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3D015EB7BE500256477 /* OpenAL.framework */; };
|
||||
|
|
@ -211,12 +208,9 @@
|
|||
1AC3622E16D47C5C000847F2 /* menu2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = menu2.png; path = ../Resources/menu2.png; sourceTree = "<group>"; };
|
||||
1AF4C3B8178662A500122817 /* Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Prefix.pch; sourceTree = "<group>"; };
|
||||
1AF4C3B91786631600122817 /* cocos2d_libs.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2d_libs.xcodeproj; path = ../../../cocos2d_libs.xcodeproj; sourceTree = "<group>"; };
|
||||
1AF4C3F81786635F00122817 /* AudioEngine.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = AudioEngine.lua; path = ../../../scripting/lua/script/AudioEngine.lua; sourceTree = "<group>"; };
|
||||
1AF4C3F91786635F00122817 /* CCBReaderLoad.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CCBReaderLoad.lua; path = ../../../scripting/lua/script/CCBReaderLoad.lua; sourceTree = "<group>"; };
|
||||
1AF4C3FA1786635F00122817 /* Cocos2dConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2dConstants.lua; path = ../../../scripting/lua/script/Cocos2dConstants.lua; sourceTree = "<group>"; };
|
||||
1AF4C3FB1786635F00122817 /* Opengl.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Opengl.lua; path = ../../../scripting/lua/script/Opengl.lua; sourceTree = "<group>"; };
|
||||
1AF4C3FC1786635F00122817 /* OpenglConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = OpenglConstants.lua; path = ../../../scripting/lua/script/OpenglConstants.lua; sourceTree = "<group>"; };
|
||||
1AF4C402178663F200122817 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
|
||||
466AF68A179FCC03002EE9BB /* DrawPrimitives.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file; name = DrawPrimitives.lua; path = ../../../scripting/lua/script/DrawPrimitives.lua; sourceTree = "<group>"; };
|
||||
466AF68C179FCC09002EE9BB /* Deprecated.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file; name = Deprecated.lua; path = ../../../scripting/lua/script/Deprecated.lua; sourceTree = "<group>"; };
|
||||
F293B3C815EB7BE500256477 /* HelloLua.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HelloLua.app; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
F293B3CC15EB7BE500256477 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
|
||||
F293B3CE15EB7BE500256477 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; };
|
||||
|
|
@ -282,25 +276,14 @@
|
|||
name = Products;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
1AF4C3F71786634600122817 /* Lua Common */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
1AF4C3F81786635F00122817 /* AudioEngine.lua */,
|
||||
1AF4C3F91786635F00122817 /* CCBReaderLoad.lua */,
|
||||
1AF4C3FA1786635F00122817 /* Cocos2dConstants.lua */,
|
||||
1AF4C3FB1786635F00122817 /* Opengl.lua */,
|
||||
1AF4C3FC1786635F00122817 /* OpenglConstants.lua */,
|
||||
);
|
||||
name = "Lua Common";
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
F293B3BD15EB7BE500256477 = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
466AF68C179FCC09002EE9BB /* Deprecated.lua */,
|
||||
466AF68A179FCC03002EE9BB /* DrawPrimitives.lua */,
|
||||
1AF4C3B91786631600122817 /* cocos2d_libs.xcodeproj */,
|
||||
F293BB7C15EB830F00256477 /* Classes */,
|
||||
F293B3CB15EB7BE500256477 /* Frameworks */,
|
||||
1AF4C3F71786634600122817 /* Lua Common */,
|
||||
F293B6E815EB807E00256477 /* Other Sources */,
|
||||
F293B3C915EB7BE500256477 /* Products */,
|
||||
F293BC4615EB859D00256477 /* Resources */,
|
||||
|
|
@ -558,15 +541,12 @@
|
|||
1AC3623416D47C5C000847F2 /* farm.jpg in Resources */,
|
||||
1AC3623516D47C5C000847F2 /* fonts in Resources */,
|
||||
1AC3623616D47C5C000847F2 /* hello.lua in Resources */,
|
||||
466AF68B179FCC03002EE9BB /* DrawPrimitives.lua in Resources */,
|
||||
1AC3623716D47C5C000847F2 /* hello2.lua in Resources */,
|
||||
1AC3623816D47C5C000847F2 /* land.png in Resources */,
|
||||
1AC3623916D47C5C000847F2 /* menu1.png in Resources */,
|
||||
466AF68D179FCC09002EE9BB /* Deprecated.lua in Resources */,
|
||||
1AC3623A16D47C5C000847F2 /* menu2.png in Resources */,
|
||||
1AF4C3FD1786635F00122817 /* AudioEngine.lua in Resources */,
|
||||
1AF4C3FE1786635F00122817 /* CCBReaderLoad.lua in Resources */,
|
||||
1AF4C3FF1786635F00122817 /* Cocos2dConstants.lua in Resources */,
|
||||
1AF4C4001786635F00122817 /* Opengl.lua in Resources */,
|
||||
1AF4C4011786635F00122817 /* OpenglConstants.lua in Resources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
|
|
@ -717,6 +697,7 @@
|
|||
"\"$(SRCROOT)/../../../cocos2dx/platform/third_party/ios\"",
|
||||
"\"$(SRCROOT)/../../../cocos2dx/platform/ios/Simulation\"",
|
||||
"\"$(SRCROOT)/../../../extensions\"",
|
||||
"\"$(SRCROOT)/../../../external/libwebsockets/ios/include\"",
|
||||
);
|
||||
INFOPLIST_FILE = Info.plist;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
|
||||
|
|
@ -765,6 +746,7 @@
|
|||
"\"$(SRCROOT)/../../../cocos2dx/platform/third_party/ios\"",
|
||||
"\"$(SRCROOT)/../../../cocos2dx/platform/ios/Simulation\"",
|
||||
"\"$(SRCROOT)/../../../extensions\"",
|
||||
"\"$(SRCROOT)/../../../external/libwebsockets/ios/include\"",
|
||||
);
|
||||
INFOPLIST_FILE = Info.plist;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
|
||||
# define global variables
|
||||
PLATFORMS = {
|
||||
"cpp" : ["ios", "android", "win32", "mac", "blackberry", "linux", "marmalade"],
|
||||
"lua" : ["ios", "android", "win32", "blackberry", "linux", "marmalade"],
|
||||
"cpp" : ["ios", "android", "win32", "mac", "linux"],
|
||||
"lua" : ["ios", "android", "win32", "linux"],
|
||||
"javascript" : ["ios", "android", "win32"]
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -7,9 +7,11 @@ COCOS2DX_ROOT="$DIR"/../..
|
|||
|
||||
build_android()
|
||||
{
|
||||
cd $COCOS2DX_ROOT/samples/$1/$2/proj.android
|
||||
ln -s ../../../../android_build_objs obj
|
||||
echo "Current dir: `pwd`"
|
||||
pushd $1/proj.android
|
||||
ln -s $COCOS2DX_ROOT/android_build_objs obj
|
||||
./build_native.sh
|
||||
popd
|
||||
}
|
||||
|
||||
if [ "$GEN_JSB"x = "YES"x ]; then
|
||||
|
|
@ -38,17 +40,42 @@ if [ "$GEN_JSB"x = "YES"x ]; then
|
|||
./generate-jsbindings.sh
|
||||
elif [ "$PLATFORM"x = "android"x ]; then
|
||||
export NDK_ROOT=$HOME/bin/android-ndk
|
||||
|
||||
# Generate jsbinding glue codes
|
||||
echo "Generating jsbindings glue codes ..."
|
||||
cd $COCOS2DX_ROOT/tools/travis-scripts
|
||||
./generate-jsbindings.sh
|
||||
|
||||
cd $COCOS2DX_ROOT
|
||||
|
||||
# Create a directory for temporary objects
|
||||
mkdir android_build_objs
|
||||
build_android Cpp HelloCpp
|
||||
build_android Cpp TestCpp
|
||||
build_android Cpp AssetsManagerTest
|
||||
build_android Javascript TestJavascript
|
||||
build_android Lua HelloLua
|
||||
build_android Lua TestLua
|
||||
|
||||
# Build samples
|
||||
echo "Building samples ..."
|
||||
cd $COCOS2DX_ROOT/samples/Cpp
|
||||
build_android HelloCpp
|
||||
build_android TestCpp
|
||||
build_android AssetsManagerTest
|
||||
|
||||
cd $COCOS2DX_ROOT/samples/Javascript
|
||||
build_android TestJavascript
|
||||
build_android CocosDragonJS
|
||||
build_android CrystalCraze
|
||||
build_android MoonWarriors
|
||||
build_android WatermelonWithMe
|
||||
|
||||
cd $COCOS2DX_ROOT/samples/Lua
|
||||
build_android HelloLua
|
||||
build_android TestLua
|
||||
|
||||
# Build template
|
||||
echo "Building template ..."
|
||||
cd $COCOS2DX_ROOT/template
|
||||
build_android multi-platform-cpp
|
||||
build_android multi-platform-js
|
||||
build_android multi-platform-lua
|
||||
|
||||
elif [ "$PLATFORM"x = "nacl"x ]; then
|
||||
export NACL_SDK_ROOT=$HOME/bin/nacl_sdk/pepper_canary
|
||||
export PATH=$PATH:$NACL_SDK_ROOT/toolchain/linux_x86_newlib/bin
|
||||
|
|
|
|||
Loading…
Reference in New Issue