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

Merge branch 'master' of https://github.com/styck/cocos2d-x into pullrequest#611 

Conflicts:
	tests/test.marmalade/test.mkb
This commit is contained in:
dumganhar 2011-12-15 13:03:07 +08:00
parent a64b81f97b b1cdb6543d
commit 8298e0b6ff
3 changed files with 313 additions and 262 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
cocos2dx/platform/marmalade/CCApplication_marmalade.cpp
View File

@ -137,7 +137,47 @@ CCApplication& CCApplication::sharedApplication()
ccLanguageType CCApplication::getCurrentLanguage()
{
return kLanguageEnglish;
int nLanguageIdx;
ccLanguageType currentLanguage;
nLanguageIdx = s3eDeviceGetInt(S3E_DEVICE_LANGUAGE);
switch (nLanguageIdx)
{
case S3E_DEVICE_LANGUAGE_ENGLISH:
currentLanguage = kLanguageEnglish;
break;
case S3E_DEVICE_LANGUAGE_SIMPL_CHINESE:
case S3E_DEVICE_LANGUAGE_TRAD_CHINESE:
currentLanguage = kLanguageChinese;
break;
case S3E_DEVICE_LANGUAGE_FRENCH:
currentLanguage = kLanguageFrench;
break;
case S3E_DEVICE_LANGUAGE_ITALIAN:
currentLanguage = kLanguageItalian;
break;
case S3E_DEVICE_LANGUAGE_GERMAN:
currentLanguage = kLanguageGerman;
break;
case S3E_DEVICE_LANGUAGE_SPANISH:
currentLanguage = kLanguageSpanish;
break;
case S3E_DEVICE_LANGUAGE_RUSSIAN:
currentLanguage = kLanguageItalian;
break;
default:
currentLanguage = kLanguageRussian;
break;
}
return currentLanguage;
}

528
tests/test.marmalade/test.mkb
View File

@ -1,259 +1,269 @@
defines
{
# chipmunk currently only supported on Mac OS (Xcode).
# if you want to use the chipmunk - set MARMALADEUSECHIPMUNK = 1
MARMALADEUSECHIPMUNK = 0
}
options
{
s3e-data-dir="../Res"
module_path="../../cocos2dx/proj.marmalade/"
module_path="../../Box2D/proj.marmalade/"
module_path="../../chipmunk/proj.marmalade/"
module_path="../../CocosDenshion/proj.marmalade/"
}
includepaths
{
..
}
subprojects
{
IwGL
Box2D
cocos2dx
chipmunk
CocosDenshion
}
files
{
[Main]
Main.h
Main.cpp
(../)
AppDelegate.h
AppDelegate.cpp
[Tests]
("../tests")
controller.h
controller.cpp
tests.h
testResource.h
testBasic.h
testBasic.cpp
[Tests/AccelerometerTest]
("../tests/AccelerometerTest")
"*.h"
"*.cpp"
[Tests/ActionManagerTest]
("../tests/ActionManagerTest")
"*.h"
"*.cpp"
[Tests/ActionsTest]
("../tests/ActionsTest")
"*.h"
"*.cpp"
[Tests/LabelTest]
("../tests/LabelTest")
"*.h"
"*.cpp"
[Tests/Box2DTest]
("../tests/Box2DTest")
"*.h"
"*.cpp"
[Tests/Box2DTestBed]
("../tests/Box2DTestBed")
"*.h"
"*.cpp"
[Tests/ClickAndMoveTest]
("../tests/ClickAndMoveTest")
"*.h"
"*.cpp"
[Tests/CocosDenshionTest]
("../tests/CocosDenshionTest")
"*.h"
"*.cpp"
[Tests/CocosNodeTest]
("../tests/CocosNodeTest")
"*.h"
"*.cpp"
[Tests/DrawPrimitivesTest]
("../tests/DrawPrimitivesTest")
"*.h"
"*.cpp"
[Tests/EaseActionsTest]
("../tests/EaseActionsTest")
"*.h"
"*.cpp"
[Tests/EffectsAdvancedTest]
("../tests/EffectsAdvancedTest")
"*.h"
"*.cpp"
[Tests/EffectsTest]
("../tests/EffectsTest")
"*.h"
"*.cpp"
[Tests/HiResTest]
("../tests/HiResTest")
"*.h"
"*.cpp"
[Tests/IntervalTest]
("../tests/IntervalTest")
"*.h"
"*.cpp"
[Tests/KeypadTest]
("../tests/KeypadTest")
"*.h"
"*.cpp"
[Tests/LayerTest]
("../tests/LayerTest")
"*.h"
"*.cpp"
[Tests/MenuTest]
("../tests/MenuTest")
"*.h"
"*.cpp"
[Tests/MotionStreakTest]
("../tests/MotionStreakTest")
"*.h"
"*.cpp"
[Tests/ParallaxTest]
("../tests/ParallaxTest")
"*.h"
"*.cpp"
[Tests/ParticleTest]
("../tests/ParticleTest")
"*.h"
"*.cpp"
[Tests/PerformanceTest]
("../tests/PerformanceTest")
"*.h"
"*.cpp"
[Tests/ProgressActionsTest]
("../tests/ProgressActionsTest")
"*.h"
"*.cpp"
[Tests/RenderTextureTest]
("../tests/RenderTextureTest")
"*.h"
"*.cpp"
[Tests/RotateWorldTest]
("../tests/RotateWorldTest")
"*.h"
"*.cpp"
[Tests/SceneTest]
("../tests/SceneTest")
"*.h"
"*.cpp"
[Tests/SchedulerTest]
("../tests/SchedulerTest")
"*.h"
"*.cpp"
[Tests/SpriteTest]
("../tests/SpriteTest")
"*.h"
"*.cpp"
[Tests/Texture2dTest]
("../tests/Texture2dTest")
"*.h"
"*.cpp"
[Tests/TileMapTest]
("../tests/TileMapTest")
"*.h"
"*.cpp"
[Tests/TouchesTest]
("../tests/TouchesTest")
"*.h"
"*.cpp"
[Tests/TransitionsTest]
("../tests/TransitionsTest")
"*.h"
"*.cpp"
[Tests/UserDefaultTest]
("../tests/UserDefaultTest")
"*.h"
"*.cpp"
[Tests/ZwoptexTest]
("../tests/ZwoptexTest")
"*.h"
"*.cpp"
[Tests/BugsTest]
("../tests/BugsTest")
"*.h"
"*.cpp"
[Tests/BugsTest/Bug-458]
("../tests/BugsTest/Bug-458")
"*.h"
"*.cpp"
[Tests/DirectorTest]
("../tests/DirectorTest")
"*.h"
"*.cpp"
}
if {{ defined MARMALADEUSECHIPMUNK}}
{
if {{ MARMALADEUSECHIPMUNK == 1 }}
{
files
{
[Tests/ChipmunkTest]
("../tests/ChipmunkTest")
"*.h"
"*.cpp"
}
}
}
#### AUTO GENERATED deployment settings from DeployTool.exe. Do not edit below this line ####
deployments
{
["Default"]
caption='TestCocos2d-x'
}
defines
{
# chipmunk currently only supported on Mac OS (Xcode).
# if you want to use the chipmunk - set MARMALADEUSECHIPMUNK = 1
MARMALADEUSECHIPMUNK = 0
}
options
{
s3e-data-dir="../Res"
module_path="../../cocos2dx/proj.marmalade/"
module_path="../../Box2D/proj.marmalade/"
module_path="../../chipmunk/proj.marmalade/"
module_path="../../CocosDenshion/proj.marmalade/"
}
includepaths
{
..
}
subprojects
{
IwGL
Box2D
cocos2dx
chipmunk
CocosDenshion
}
files
{
[Main]
Main.h
Main.cpp
(../)
AppDelegate.h
AppDelegate.cpp
[Tests]
("../tests")
controller.h
controller.cpp
tests.h
testResource.h
testBasic.h
testBasic.cpp
[Tests/AccelerometerTest]
("../tests/AccelerometerTest")
"*.h"
"*.cpp"
[Tests/ActionManagerTest]
("../tests/ActionManagerTest")
"*.h"
"*.cpp"
[Tests/ActionsTest]
("../tests/ActionsTest")
"*.h"
"*.cpp"
[Tests/LabelTest]
("../tests/LabelTest")
"*.h"
"*.cpp"
[Tests/Box2DTest]
("../tests/Box2DTest")
"*.h"
"*.cpp"
[Tests/Box2DTestBed]
("../tests/Box2DTestBed")
"*.h"
"*.cpp"
[Tests/ClickAndMoveTest]
("../tests/ClickAndMoveTest")
"*.h"
"*.cpp"
[Tests/CocosDenshionTest]
("../tests/CocosDenshionTest")
"*.h"
"*.cpp"
[Tests/CocosNodeTest]
("../tests/CocosNodeTest")
"*.h"
"*.cpp"
[Tests/DrawPrimitivesTest]
("../tests/DrawPrimitivesTest")
"*.h"
"*.cpp"
[Tests/EaseActionsTest]
("../tests/EaseActionsTest")
"*.h"
"*.cpp"
[Tests/EffectsAdvancedTest]
("../tests/EffectsAdvancedTest")
"*.h"
"*.cpp"
[Tests/EffectsTest]
("../tests/EffectsTest")
"*.h"
"*.cpp"
[Tests/FontTest]
("../tests/FontTest")
"*.h"
"*.cpp"
[Tests/HiResTest]
("../tests/HiResTest")
"*.h"
"*.cpp"
[Tests/IntervalTest]
("../tests/IntervalTest")
"*.h"
"*.cpp"
[Tests/KeypadTest]
("../tests/KeypadTest")
"*.h"
"*.cpp"
[Tests/LayerTest]
("../tests/LayerTest")
"*.h"
"*.cpp"
[Tests/CurrentLanguageTest]
("../tests/CurrentLanguageTest")
"*.h"
"*.cpp"
[Tests/MenuTest]
("../tests/MenuTest")
"*.h"
"*.cpp"
[Tests/MotionStreakTest]
("../tests/MotionStreakTest")
"*.h"
"*.cpp"
[Tests/ParallaxTest]
("../tests/ParallaxTest")
"*.h"
"*.cpp"
[Tests/ParticleTest]
("../tests/ParticleTest")
"*.h"
"*.cpp"
[Tests/PerformanceTest]
("../tests/PerformanceTest")
"*.h"
"*.cpp"
[Tests/ProgressActionsTest]
("../tests/ProgressActionsTest")
"*.h"
"*.cpp"
[Tests/RenderTextureTest]
("../tests/RenderTextureTest")
"*.h"
"*.cpp"
[Tests/RotateWorldTest]
("../tests/RotateWorldTest")
"*.h"
"*.cpp"
[Tests/SceneTest]
("../tests/SceneTest")
"*.h"
"*.cpp"
[Tests/SchedulerTest]
("../tests/SchedulerTest")
"*.h"
"*.cpp"
[Tests/SpriteTest]
("../tests/SpriteTest")
"*.h"
"*.cpp"
[Tests/Texture2dTest]
("../tests/Texture2dTest")
"*.h"
"*.cpp"
[Tests/TileMapTest]
("../tests/TileMapTest")
"*.h"
"*.cpp"
[Tests/TouchesTest]
("../tests/TouchesTest")
"*.h"
"*.cpp"
[Tests/TransitionsTest]
("../tests/TransitionsTest")
"*.h"
"*.cpp"
[Tests/UserDefaultTest]
("../tests/UserDefaultTest")
"*.h"
"*.cpp"
[Tests/ZwoptexTest]
("../tests/ZwoptexTest")
"*.h"
"*.cpp"
[Tests/BugsTest]
("../tests/BugsTest")
"*.h"
"*.cpp"
[Tests/BugsTest/Bug-458]
("../tests/BugsTest/Bug-458")
"*.h"
"*.cpp"
[Tests/DirectorTest]
("../tests/DirectorTest")
"*.h"
"*.cpp"
}
if {{ defined MARMALADEUSECHIPMUNK}}
{
if {{ MARMALADEUSECHIPMUNK == 1 }}
{
files
{
[Tests/ChipmunkTest]
("../tests/ChipmunkTest")
"*.h"
"*.cpp"
}
}
}
#### AUTO GENERATED deployment settings from DeployTool.exe. Do not edit below this line ####
deployments
{
["Default"]
caption='TestCocos2d-x'
}

5
tests/tests/controller.cpp
View File

@ -58,8 +58,9 @@ static TestScene* CreateTestScene(int nIdx)
#else
#ifdef MARMALADEUSECHIPMUNK
#if (MARMALADEUSECHIPMUNK == 1)
pScene = new ChipmunkTestScene(); break;
pScene = new ChipmunkTestScene();
#endif
break;
#endif
#endif
case TEST_LABEL:
@ -111,11 +112,11 @@ static TestScene* CreateTestScene(int nIdx)
pScene = new DirectorTestScene(); break;
case TEST_BUGS:
pScene = new BugsTestScene(); break;
#if (CC_TARGET_PLATFORM != CC_PLATFORM_MARMALADE)
case TEST_FONTS:
pScene = new FontTestScene(); break;
case TEST_CURRENT_LANGUAGE:
pScene = new CurrentLanguageTestScene(); break;
#if (CC_TARGET_PLATFORM != CC_PLATFORM_MARMALADE)
case TEST_TEXTURECACHE: pScene = new TextureCacheTestScene(); break;
#endif