diff --git a/CHANGELOG.REMOVED.git-id b/CHANGELOG.REMOVED.git-id index 5ca6d51e19..2a2478fb4e 100644 --- a/CHANGELOG.REMOVED.git-id +++ b/CHANGELOG.REMOVED.git-id @@ -1 +1 @@ -727d9ca089cf00365014b23ae2cf63341316ba7d \ No newline at end of file +9692f61b2341a6b7d3bea76b2ca8ae0c98cf5911 \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 92d9ff04fc..502be6ed2a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,8 +46,8 @@ option(BUILD_EDITOR_SPINE "Build editor support for spine" ON) option(BUILD_EDITOR_COCOSTUDIO "Build editor support for cocostudio" ON) option(BUILD_EDITOR_COCOSBUILDER "Build editor support for cocosbuilder" ON) -option(BUILD_TestCpp "Only build TestCpp sample" ON) -option(BUILD_TestLua "Only build TestLua sample" OFF) +option(BUILD_CppTests "Only build TestCpp sample" ON) +option(BUILD_LuaTests "Only build TestLua sample" OFF) else()#temp option(USE_CHIPMUNK "Use chipmunk for physics library" ON) @@ -62,8 +62,8 @@ option(BUILD_EDITOR_SPINE "Build editor support for spine" ON) option(BUILD_EDITOR_COCOSTUDIO "Build editor support for cocostudio" ON) option(BUILD_EDITOR_COCOSBUILDER "Build editor support for cocosbuilder" ON) -option(BUILD_TestCpp "Only build TestCpp sample" ON) -option(BUILD_TestLua "Only build TestLua sample" ON) +option(BUILD_CppTests "Only build TestCpp sample" ON) +option(BUILD_LuaTests "Only build TestLua sample" ON) endif()#temp @@ -144,6 +144,8 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/cocos/physics ${CMAKE_CURRENT_SOURCE_DIR}/cocos/editor-support ${CMAKE_CURRENT_SOURCE_DIR}/cocos/math/kazmath + ${CMAKE_CURRENT_SOURCE_DIR}/cocos/scripting/lua-bindings/auto + ${CMAKE_CURRENT_SOURCE_DIR}/cocos/scripting/lua-bindings/manual ${CMAKE_CURRENT_SOURCE_DIR}/extensions ${CMAKE_CURRENT_SOURCE_DIR}/external ${CMAKE_CURRENT_SOURCE_DIR}/external/tinyxml2 @@ -289,10 +291,14 @@ endif(BUILD_LIBS_LUA) # build tests -if(BUILD_TestCpp) -add_subdirectory(samples/cpp-tests) -endif(BUILD_TestCpp) +add_subdirectory(tests/cpp-empty-test) -if(BUILD_TestLua) -add_subdirectory(samples/lua-tests/project) -endif(BUILD_TestLua) +if(BUILD_CppTests) +add_subdirectory(tests/cpp-tests) +endif(BUILD_CppTests) + +add_subdirectory(tests/lua-empty-test/project) + +if(BUILD_LuaTests) +add_subdirectory(tests/lua-tests/project) +endif(BUILD_LuaTests) diff --git a/build/android-build.py b/build/android-build.py index 3ef3ae6f2a..b2fbc48a3c 100755 --- a/build/android-build.py +++ b/build/android-build.py @@ -7,8 +7,8 @@ import os, os.path import shutil from optparse import OptionParser -CPP_SAMPLES = ['testcpp'] -LUA_SAMPLES = ['testlua'] +CPP_SAMPLES = ['cpp-empty-test', 'cpp-tests'] +LUA_SAMPLES = ['lua-empty-test', 'lua-tests'] ALL_SAMPLES = CPP_SAMPLES + LUA_SAMPLES def get_num_of_cpu(): @@ -146,21 +146,34 @@ def copy_resources(target, app_android_root): if os.path.isdir(assets_dir): shutil.rmtree(assets_dir) - # copy resources(cpp samples and lua samples) os.mkdir(assets_dir) - resources_dir = os.path.join(app_android_root, "../../res") - if os.path.isdir(resources_dir): - copy_files(resources_dir, assets_dir) + + # copy resources(cpp samples) + if target in CPP_SAMPLES: + resources_dir = os.path.join(app_android_root, "../Resources") + if os.path.isdir(resources_dir): + copy_files(resources_dir, assets_dir) + # lua samples should copy lua script if target in LUA_SAMPLES: + resources_dir = os.path.join(app_android_root, "../../res") + assets_res_dir = os.path.join(assets_dir, "res"); + os.mkdir(assets_res_dir) + copy_files(resources_dir, assets_res_dir) + + resources_dir = os.path.join(app_android_root, "../../src") + assets_src_dir = os.path.join(assets_dir, "src"); + os.mkdir(assets_src_dir) + copy_files(resources_dir, assets_src_dir) + resources_dir = os.path.join(app_android_root, "../../../../cocos/scripting/lua-bindings/script") copy_files(resources_dir, assets_dir) - # TestLua shared resources with TestCpp - if target == "testlua": + # lua-tests shared resources with cpp-tests + if target == "lua-tests": resources_dir = os.path.join(app_android_root, "../../../cpp-tests/Resources") - copy_files(resources_dir, assets_dir) + copy_files(resources_dir, assets_res_dir) def build_samples(target,ndk_build_param,android_platform,build_mode): @@ -186,11 +199,17 @@ def build_samples(target,ndk_build_param,android_platform,build_mode): build_mode = 'debug' app_android_root = '' + + target_proj_path_map = { + "cpp-empty-test": "tests/cpp-empty-test/proj.android", + "cpp-tests": "tests/cpp-tests/proj.android", + "lua-empty-test": "tests/lua-empty-test/project/proj.android", + "lua-tests": "tests/lua-tests/project/proj.android" + } + for target in build_targets: - if target == 'testcpp': - app_android_root = os.path.join(cocos_root, 'samples/cpp-tests/proj.android') - elif target == 'testlua': - app_android_root = os.path.join(cocos_root, 'samples/lua-tests/project/proj.android') + if target in target_proj_path_map: + app_android_root = os.path.join(cocos_root, target_proj_path_map[target]) else: print 'unknown target: %s' % target continue @@ -205,14 +224,13 @@ if __name__ == '__main__': usage = """ This script is mainy used for building tests built-in with cocos2d-x. - Usage: %prog [options] [testcpp|testlua] + Usage: %prog [options] [cpp-empty-test|cpp-tests|lua-empty-test|lua-tests] - If you are new to cocos2d-x, I recommend you start with testcpp, testlua. + If you are new to cocos2d-x, I recommend you start with cpp-empty-test, lua-empty-test. You can combine these targets like this: - //1. to build simplegame and assetsmanager - python android-build.py -p 10 testcpp testlua + python android-build.py -p 10 cpp-empty-test lua-empty-test Note: You should install ant to generate apk while building the andriod tests. But it is optional. You can generate apk with eclipse. diff --git a/build/cocos2d-win32.vc2012.sln b/build/cocos2d-win32.vc2012.sln index 805608b261..ca13181a46 100644 --- a/build/cocos2d-win32.vc2012.sln +++ b/build/cocos2d-win32.vc2012.sln @@ -11,7 +11,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libchipmunk", "..\external\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libExtensions", "..\extensions\proj.win32\libExtensions.vcxproj", "{21B2C324-891F-48EA-AD1A-5AE13DE12E28}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestCpp", "..\samples\cpp-tests\proj.win32\TestCpp.vcxproj", "{76A39BB2-9B84-4C65-98A5-654D86B86F2A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestCpp", "..\tests\cpp-tests\proj.win32\TestCpp.vcxproj", "{76A39BB2-9B84-4C65-98A5-654D86B86F2A}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosBuilder", "..\cocos\editor-support\cocosbuilder\proj.win32\libCocosBuilder.vcxproj", "{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}" EndProject @@ -25,7 +25,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libLocalStorage", "..\cocos EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblua", "..\cocos\scripting\lua-bindings\proj.win32\liblua.vcxproj", "{DDC3E27F-004D-4DD4-9DD3-931A013D2159}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestLua", "..\samples\lua-tests\project\proj.win32\TestLua.win32.vcxproj", "{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestLua", "..\tests\lua-tests\project\proj.win32\TestLua.win32.vcxproj", "{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGUI", "..\cocos\ui\proj.win32\libGUI.vcxproj", "{7E06E92C-537A-442B-9E4A-4761C84F8A1A}" EndProject diff --git a/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id b/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id index 85fc17c725..7b4843b4f0 100644 --- a/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id +++ b/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id @@ -1 +1 @@ -be9729478e98eeb340d839d3cc4c2c2dc9c46b65 \ No newline at end of file +2eabffffc9ac4960f8e1ae33fc712be031827127 \ No newline at end of file diff --git a/build/cocos2d_samples.xcodeproj/project.pbxproj.REMOVED.git-id b/build/cocos2d_samples.xcodeproj/project.pbxproj.REMOVED.git-id deleted file mode 100644 index e419cc5e28..0000000000 --- a/build/cocos2d_samples.xcodeproj/project.pbxproj.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -93cf35f598f47739015a3d72a8c5749d254b87af \ No newline at end of file diff --git a/build/cocos2d_tests.xcodeproj/project.pbxproj.REMOVED.git-id b/build/cocos2d_tests.xcodeproj/project.pbxproj.REMOVED.git-id new file mode 100644 index 0000000000..75ce22c5ee --- /dev/null +++ b/build/cocos2d_tests.xcodeproj/project.pbxproj.REMOVED.git-id @@ -0,0 +1 @@ +1c0cfb1ac4272e26690b9265c721c0a7e5ae83c3 \ No newline at end of file diff --git a/build/cocos2d_samples.xcodeproj/xcshareddata/xcschemes/build all samples Mac.xcscheme b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/build all tests Mac.xcscheme similarity index 90% rename from build/cocos2d_samples.xcodeproj/xcshareddata/xcschemes/build all samples Mac.xcscheme rename to build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/build all tests Mac.xcscheme index 917d3d4152..796187849d 100644 --- a/build/cocos2d_samples.xcodeproj/xcshareddata/xcschemes/build all samples Mac.xcscheme +++ b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/build all tests Mac.xcscheme @@ -15,9 +15,9 @@ + BuildableName = "build all tests Mac" + BlueprintName = "build all tests Mac" + ReferencedContainer = "container:cocos2d_tests.xcodeproj"> diff --git a/build/cocos2d_samples.xcodeproj/xcshareddata/xcschemes/build all samples iOS.xcscheme b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/build all tests iOS.xcscheme similarity index 90% rename from build/cocos2d_samples.xcodeproj/xcshareddata/xcschemes/build all samples iOS.xcscheme rename to build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/build all tests iOS.xcscheme index 28132244ba..501ada4ed3 100644 --- a/build/cocos2d_samples.xcodeproj/xcshareddata/xcschemes/build all samples iOS.xcscheme +++ b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/build all tests iOS.xcscheme @@ -15,9 +15,9 @@ + BuildableName = "build all tests iOS" + BlueprintName = "build all tests iOS" + ReferencedContainer = "container:cocos2d_tests.xcodeproj"> diff --git a/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/cpp-empty-test Mac.xcscheme b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/cpp-empty-test Mac.xcscheme new file mode 100644 index 0000000000..85a27132e0 --- /dev/null +++ b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/cpp-empty-test Mac.xcscheme @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/cpp-empty-test iOS.xcscheme b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/cpp-empty-test iOS.xcscheme new file mode 100644 index 0000000000..9abcd49646 --- /dev/null +++ b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/cpp-empty-test iOS.xcscheme @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/cocos2d_samples.xcodeproj/xcshareddata/xcschemes/Test cpp Mac.xcscheme b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/cpp-tests Mac.xcscheme similarity index 79% rename from build/cocos2d_samples.xcodeproj/xcshareddata/xcschemes/Test cpp Mac.xcscheme rename to build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/cpp-tests Mac.xcscheme index 4745b9566e..ed17d820a6 100644 --- a/build/cocos2d_samples.xcodeproj/xcshareddata/xcschemes/Test cpp Mac.xcscheme +++ b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/cpp-tests Mac.xcscheme @@ -15,9 +15,9 @@ + BuildableName = "cpp-tests Mac.app" + BlueprintName = "cpp-tests Mac" + ReferencedContainer = "container:cocos2d_tests.xcodeproj"> @@ -33,9 +33,9 @@ + BuildableName = "cpp-tests Mac.app" + BlueprintName = "cpp-tests Mac" + ReferencedContainer = "container:cocos2d_tests.xcodeproj"> @@ -52,9 +52,9 @@ + BuildableName = "cpp-tests Mac.app" + BlueprintName = "cpp-tests Mac" + ReferencedContainer = "container:cocos2d_tests.xcodeproj"> @@ -70,9 +70,9 @@ + BuildableName = "cpp-tests Mac.app" + BlueprintName = "cpp-tests Mac" + ReferencedContainer = "container:cocos2d_tests.xcodeproj"> diff --git a/build/cocos2d_samples.xcodeproj/xcshareddata/xcschemes/Test cpp iOS.xcscheme b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/cpp-tests iOS.xcscheme similarity index 79% rename from build/cocos2d_samples.xcodeproj/xcshareddata/xcschemes/Test cpp iOS.xcscheme rename to build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/cpp-tests iOS.xcscheme index c90d0cb995..b58cd1df88 100644 --- a/build/cocos2d_samples.xcodeproj/xcshareddata/xcschemes/Test cpp iOS.xcscheme +++ b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/cpp-tests iOS.xcscheme @@ -15,9 +15,9 @@ + BuildableName = "cpp-tests iOS.app" + BlueprintName = "cpp-tests iOS" + ReferencedContainer = "container:cocos2d_tests.xcodeproj"> @@ -33,9 +33,9 @@ + BuildableName = "cpp-tests iOS.app" + BlueprintName = "cpp-tests iOS" + ReferencedContainer = "container:cocos2d_tests.xcodeproj"> @@ -52,9 +52,9 @@ + BuildableName = "cpp-tests iOS.app" + BlueprintName = "cpp-tests iOS" + ReferencedContainer = "container:cocos2d_tests.xcodeproj"> @@ -70,9 +70,9 @@ + BuildableName = "cpp-tests iOS.app" + BlueprintName = "cpp-tests iOS" + ReferencedContainer = "container:cocos2d_tests.xcodeproj"> diff --git a/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/lua-empty-test Mac.xcscheme b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/lua-empty-test Mac.xcscheme new file mode 100644 index 0000000000..1834a506ae --- /dev/null +++ b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/lua-empty-test Mac.xcscheme @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/lua-empty-test iOS.xcscheme b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/lua-empty-test iOS.xcscheme new file mode 100644 index 0000000000..1f274901f9 --- /dev/null +++ b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/lua-empty-test iOS.xcscheme @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/cocos2d_samples.xcodeproj/xcshareddata/xcschemes/Test lua Mac.xcscheme b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/lua-tests Mac.xcscheme similarity index 79% rename from build/cocos2d_samples.xcodeproj/xcshareddata/xcschemes/Test lua Mac.xcscheme rename to build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/lua-tests Mac.xcscheme index 70f1231cab..5126aa1d0c 100644 --- a/build/cocos2d_samples.xcodeproj/xcshareddata/xcschemes/Test lua Mac.xcscheme +++ b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/lua-tests Mac.xcscheme @@ -15,9 +15,9 @@ + BuildableName = "lua-tests Mac.app" + BlueprintName = "lua-tests Mac" + ReferencedContainer = "container:cocos2d_tests.xcodeproj"> @@ -33,9 +33,9 @@ + BuildableName = "lua-tests Mac.app" + BlueprintName = "lua-tests Mac" + ReferencedContainer = "container:cocos2d_tests.xcodeproj"> @@ -52,9 +52,9 @@ + BuildableName = "lua-tests Mac.app" + BlueprintName = "lua-tests Mac" + ReferencedContainer = "container:cocos2d_tests.xcodeproj"> @@ -70,9 +70,9 @@ + BuildableName = "lua-tests Mac.app" + BlueprintName = "lua-tests Mac" + ReferencedContainer = "container:cocos2d_tests.xcodeproj"> diff --git a/build/cocos2d_samples.xcodeproj/xcshareddata/xcschemes/Test lua iOS.xcscheme b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/lua-tests iOS.xcscheme similarity index 79% rename from build/cocos2d_samples.xcodeproj/xcshareddata/xcschemes/Test lua iOS.xcscheme rename to build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/lua-tests iOS.xcscheme index 39fa95f160..b0b07b09d5 100644 --- a/build/cocos2d_samples.xcodeproj/xcshareddata/xcschemes/Test lua iOS.xcscheme +++ b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/lua-tests iOS.xcscheme @@ -15,9 +15,9 @@ + BuildableName = "lua-tests iOS.app" + BlueprintName = "lua-tests iOS" + ReferencedContainer = "container:cocos2d_tests.xcodeproj"> @@ -33,9 +33,9 @@ + BuildableName = "lua-tests iOS.app" + BlueprintName = "lua-tests iOS" + ReferencedContainer = "container:cocos2d_tests.xcodeproj"> @@ -52,9 +52,9 @@ + BuildableName = "lua-tests iOS.app" + BlueprintName = "lua-tests iOS" + ReferencedContainer = "container:cocos2d_tests.xcodeproj"> @@ -70,9 +70,9 @@ + BuildableName = "lua-tests iOS.app" + BlueprintName = "lua-tests iOS" + ReferencedContainer = "container:cocos2d_tests.xcodeproj"> diff --git a/cocos/2d/CCRenderTexture.cpp b/cocos/2d/CCRenderTexture.cpp index d15cf4bf0b..b82eb8ddd8 100644 --- a/cocos/2d/CCRenderTexture.cpp +++ b/cocos/2d/CCRenderTexture.cpp @@ -413,34 +413,30 @@ void RenderTexture::visit(Renderer *renderer, const kmMat4 &parentTransform, boo bool RenderTexture::saveToFile(const std::string& filename) { - bool ret = false; - - Image *image = newImage(true); - if (image) - { - ret = image->saveToFile(filename); - } - - CC_SAFE_DELETE(image); - return ret; + return saveToFile(filename,Image::Format::JPG); } bool RenderTexture::saveToFile(const std::string& fileName, Image::Format format) { - bool ret = false; CCASSERT(format == Image::Format::JPG || format == Image::Format::PNG, "the image can only be saved as JPG or PNG format"); + + std::string fullpath = FileUtils::getInstance()->getWritablePath() + fileName; + _saveToFileCommand.init(_globalZOrder); + _saveToFileCommand.func = CC_CALLBACK_0(RenderTexture::onSaveToFile,this,fullpath); + + Director::getInstance()->getRenderer()->addCommand(&_saveToFileCommand); + return true; +} +void RenderTexture::onSaveToFile(const std::string& filename) +{ Image *image = newImage(true); if (image) { - std::string fullpath = FileUtils::getInstance()->getWritablePath() + fileName; - - ret = image->saveToFile(fullpath.c_str(), true); + image->saveToFile(filename.c_str(), true); } CC_SAFE_DELETE(image); - - return ret; } /* get buffer as Image */ diff --git a/cocos/2d/CCRenderTexture.h b/cocos/2d/CCRenderTexture.h index ff1803e634..2ca4a53f92 100644 --- a/cocos/2d/CCRenderTexture.h +++ b/cocos/2d/CCRenderTexture.h @@ -214,6 +214,7 @@ protected: CustomCommand _clearCommand; CustomCommand _beginCommand; CustomCommand _endCommand; + CustomCommand _saveToFileCommand; protected: //renderer caches and callbacks void onBegin(); @@ -221,6 +222,8 @@ protected: void onClear(); void onClearDepth(); + + void onSaveToFile(const std::string& fileName); kmMat4 _oldTransMatrix, _oldProjMatrix; kmMat4 _transformMatrix, _projectionMatrix; diff --git a/cocos/editor-support/cocostudio/TriggerObj.cpp b/cocos/editor-support/cocostudio/TriggerObj.cpp index 0377f91722..9ced8023ab 100755 --- a/cocos/editor-support/cocostudio/TriggerObj.cpp +++ b/cocos/editor-support/cocostudio/TriggerObj.cpp @@ -115,11 +115,11 @@ bool TriggerObj::detect() return true; } - bool ret = true; + bool ret = false; for (const auto& con : _cons) { - ret = ret && con->detect(); + ret = ret || con->detect(); } return ret; diff --git a/samples/cpp-hello/.gitkeep b/samples/cpp-hello/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/samples/cpp-tests/proj.android/jni/Android.mk b/samples/cpp-tests/proj.android/jni/Android.mk deleted file mode 100644 index 83e3f8612d..0000000000 --- a/samples/cpp-tests/proj.android/jni/Android.mk +++ /dev/null @@ -1,17 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := testcpp_shared - -LOCAL_MODULE_FILENAME := libtestcpp - -LOCAL_SRC_FILES := testcpp/main.cpp - -LOCAL_C_INCLUDES := ../../Classes - -LOCAL_WHOLE_STATIC_LIBRARIES := cocos_testcpp_common - -include $(BUILD_SHARED_LIBRARY) - -$(call import-module,samples/cpp-tests) diff --git a/samples/cpp-tests/proj.android/src/nojava.txt b/samples/cpp-tests/proj.android/src/nojava.txt deleted file mode 100644 index 26a79fd674..0000000000 --- a/samples/cpp-tests/proj.android/src/nojava.txt +++ /dev/null @@ -1,3 +0,0 @@ -No Java files -src/ is required for Android's build.xml to operate correctly. -git does not allow empty directories in revision control so this file is added to src/ both as a readme and to keep git happy. diff --git a/samples/cpp-tests/proj.ios/iphone_Prefix.pch b/samples/cpp-tests/proj.ios/iphone_Prefix.pch deleted file mode 100644 index 5b4e2fd9e1..0000000000 --- a/samples/cpp-tests/proj.ios/iphone_Prefix.pch +++ /dev/null @@ -1,8 +0,0 @@ -// -// Prefix header for all source files of the 'iphone' target in the 'iphone' project -// - -#ifdef __OBJC__ - #import - #import -#endif diff --git a/samples/lua-hello/.gitkeep b/samples/lua-hello/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/templates/cocos2dx_files.json.REMOVED.git-id b/templates/cocos2dx_files.json.REMOVED.git-id index 88daf856db..251bec07e4 100644 --- a/templates/cocos2dx_files.json.REMOVED.git-id +++ b/templates/cocos2dx_files.json.REMOVED.git-id @@ -1 +1 @@ -28f5c48c4b945edd2e2c3a1a79ab436af8da538e \ No newline at end of file +e4f656f3e06fc5c267880b95d80deba8b2640c77 \ No newline at end of file diff --git a/templates/lua-template-default/frameworks/runtime-src/Classes/AppDelegate.cpp b/templates/lua-template-default/frameworks/runtime-src/Classes/AppDelegate.cpp index 8ac60f8a79..b3af0b27c8 100644 --- a/templates/lua-template-default/frameworks/runtime-src/Classes/AppDelegate.cpp +++ b/templates/lua-template-default/frameworks/runtime-src/Classes/AppDelegate.cpp @@ -2,7 +2,6 @@ #include "CCLuaEngine.h" #include "SimpleAudioEngine.h" #include "cocos2d.h" -#include "Runtime.h" using namespace CocosDenshion; @@ -24,7 +23,7 @@ bool AppDelegate::applicationDidFinishLaunching() auto director = Director::getInstance(); auto glview = director->getOpenGLView(); if(!glview) { - glview = GLView::createWithRect("Test Lua", Rect(0,0,900,640)); + glview = GLView::createWithRect("HelloLua", Rect(0,0,900,640)); director->setOpenGLView(glview); } @@ -36,15 +35,10 @@ bool AppDelegate::applicationDidFinishLaunching() // set FPS. the default value is 1.0/60 if you don't call this director->setAnimationInterval(1.0 / 60); - -#ifdef COCOS2D_DEBUG - startRuntime(); -#else auto engine = LuaEngine::getInstance(); ScriptEngineManager::getInstance()->setScriptEngine(engine); engine->executeScriptFile("src/main.lua"); -#endif return true; } diff --git a/templates/lua-template-default/frameworks/runtime-src/build_runtime.py b/templates/lua-template-default/frameworks/runtime-src/build_runtime.py deleted file mode 100755 index 03c5214184..0000000000 --- a/templates/lua-template-default/frameworks/runtime-src/build_runtime.py +++ /dev/null @@ -1,436 +0,0 @@ -#! /usr/bin/env python -# coding=utf-8 -# filename=build_runtime.py - -import os -import re -import sys -import shutil -import platform -import subprocess - -if platform.system() == 'Windows': - import _winreg - - -def checkParams(): - """Custom and check param list. - """ - from optparse import OptionParser - # set the parser to parse input params - # the correspond variable name of "-x, --xxx" is parser.xxx - - if platform.system() == "Darwin": - parser = OptionParser( - usage="Usage: %prog -p \n\ - Sample: %prog -p ios" - ) - parser.add_option( - "-p", - "--platform", - metavar="PLATFORM", - type="choice", - choices=["android", "ios", "mac"], - help="Set build runtime's platform" - ) - elif platform.system() == "Windows": - parser = OptionParser( - usage="Usage: %prog -p \n\ - Sample: %prog -p win32" - ) - parser.add_option( - "-p", - "--platform", - metavar="PLATFORM", - type="choice", - choices=["win32", "android"], - help="Set build runtime's platform" - ) - - parser.add_option( - "-u", - "--pure", - dest="pure", - action="store_true", - help="parameter for copy resource" - ) - - # parse the params - (opts, args) = parser.parse_args() - if not opts.platform: - parser.error("-p or --platform is not specified") - if not opts.pure: - return opts.platform, None - return opts.platform, opts.pure - - -class BuildRuntime: - - def __init__(self, platform, pure): - self.projectPath = None - self.projectName = None - self.runtimePlatform = platform - self.pure = pure - - scriptPath = os.path.abspath(os.path.dirname(__file__)) - if platform == 'win32': - self.projectPath = os.path.join(scriptPath, "proj.win32") - elif platform == 'android': - self.projectPath = os.path.join(scriptPath, "proj.android") - elif platform == 'ios': - self.projectPath = os.path.join(scriptPath, "proj.ios_mac") - elif platform == 'mac': - self.projectPath = os.path.join(scriptPath, "proj.ios_mac") - - def buildRuntime(self): - if self.runtimePlatform == 'win32': - self.win32Runtime() - elif self.runtimePlatform == 'android': - self.androidRuntime() - if self.runtimePlatform == 'ios': - self.iosRuntime() - if self.runtimePlatform == 'mac': - self.macRuntime() - - def macRuntime(self): - commands = [ - "xcodebuild", - "-version" - ] - child = subprocess.Popen(commands, stdout=subprocess.PIPE) - - xcode = None - version = None - for line in child.stdout: - if 'Xcode' in line: - xcode, version = str.split(line, ' ') - - child.wait() - - if xcode is None: - print ("Xcode wasn't installed") - return False - - if version <= '5': - print ("Update xcode please") - return False - - res = self.checkFileByExtention(".xcodeproj") - if not res: - print ("Can't find the \".xcodeproj\" file") - return False - - projectPath = os.path.join(self.projectPath, self.projectName) - pbxprojectPath = os.path.join(projectPath, "project.pbxproj") - print(pbxprojectPath) - - f = file(pbxprojectPath) - contents = f.read() - - section = re.search( - r"Begin PBXProject section.*End PBXProject section", - contents, - re.S - ) - - if section is None: - print ("Can't find Mac target") - return False - - targets = re.search(r"targets = (.*);", section.group(), re.S) - if targets is None: - print ("Can't find Mac target") - return False - - targetName = None - names = re.split("\*", targets.group()) - for name in names: - if "Mac" in name: - targetName = str.strip(name) - - if targetName is None: - print ("Can't find Mac target") - return False - - macFolder = os.path.join(self.projectPath, "..", "..", "..", "runtime", "mac") - if os.path.isdir(macFolder): - shutil.rmtree(macFolder) - - commands = [ - "xcodebuild", - "-project", - projectPath, - "-configuration", - "Debug", - "-target", - targetName, - "CONFIGURATION_BUILD_DIR=%s" % (macFolder) - ] - child = subprocess.Popen(commands, stdout=subprocess.PIPE) - for line in child.stdout: - print (line) - - child.wait() - - filelist = os.listdir(macFolder) - for filename in filelist: - name, extention = os.path.splitext(filename) - if extention == '.a': - filename = os.path.join(macFolder, filename) - os.remove(filename) - if extention == '.app': - filename = os.path.join(macFolder, filename) - if ' ' in name: - newname = os.path.join(macFolder, name[:name.find(' ')]+extention) - os.rename(filename, newname) - - def iosRuntime(self): - commands = [ - "xcodebuild", - "-version" - ] - child = subprocess.Popen(commands, stdout=subprocess.PIPE) - - xcode = None - version = None - for line in child.stdout: - if 'Xcode' in line: - xcode, version = str.split(line, ' ') - - child.wait() - - if xcode is None: - print ("Xcode wasn't installed") - return False - - if version <= '5': - print ("Update xcode please") - return False - - res = self.checkFileByExtention(".xcodeproj") - if not res: - print ("Can't find the \".xcodeproj\" file") - return False - - projectPath = os.path.join(self.projectPath, self.projectName) - pbxprojectPath = os.path.join(projectPath, "project.pbxproj") - print(pbxprojectPath) - - f = file(pbxprojectPath) - contents = f.read() - - section = re.search(r"Begin PBXProject section.*End PBXProject section", contents, re.S) - - if section is None: - print ("Can't find iOS target") - return False - - targets = re.search(r"targets = (.*);", section.group(), re.S) - if targets is None: - print ("Can't find iOS target") - return False - - targetName = None - names = re.split("\*", targets.group()) - for name in names: - if "iOS" in name: - targetName = str.strip(name) - - if targetName is None: - print ("Can't find iOS target") - return False - - iosFolder = os.path.join(self.projectPath, "..", "..","..", "runtime", "ios") - if os.path.isdir(iosFolder): - filelist = os.listdir(iosFolder) - for filename in filelist: - if ".app" in filename: - f = os.path.join(iosFolder, filename) - shutil.rmtree(f) - - commands = [ - "xcodebuild", - "-project", - projectPath, - "-configuration", - "Debug", - "-target", - targetName, - "-sdk", - "iphonesimulator", - "CONFIGURATION_BUILD_DIR=%s" % (iosFolder) - ] - child = subprocess.Popen(commands, stdout=subprocess.PIPE) - for line in child.stdout: - print (line) - - child.wait() - - filelist = os.listdir(iosFolder) - - for filename in filelist: - name, extention = os.path.splitext(filename) - if extention == '.a': - filename = os.path.join(iosFolder, filename) - os.remove(filename) - if extention == '.app': - filename = os.path.join(iosFolder, filename) - newname = os.path.join(iosFolder, name[:name.find(' ')]+extention) - os.rename(filename, newname) - - def androidRuntime(self): - try: - SDK_ROOT = os.environ['ANDROID_SDK_ROOT'] - except Exception: - print ("ANDROID_SDK_ROOT not defined.\ - Please define ANDROID_SDK_ROOT in your environment") - return False - - try: - NDK_ROOT = os.environ['NDK_ROOT'] - except Exception: - print ("NDK_ROOT not defined.\ - Please define NDK_ROOT in your environment") - return False - - platformsPath = os.path.join(SDK_ROOT,"platforms") - if not os.path.isdir(platformsPath): - print ("Can't find android platforms") - return False - - projectProperties = os.path.join(self.projectPath, "project.properties") - androidVersion = None - if os.path.isfile(projectProperties): - f = file(projectProperties, 'r') - while True: - line = f.readline() - if "target=" in line and not "#" in line: - androidVersion = line[line.find('-')+1:] - break - if len(line) == 0: - break - - if androidVersion is None: - platforms = os.listdir(platformsPath) - versions = [] - for platform in platforms: - if "android-" in platform: - version = platform[platform.find('-')+1:] - versions.append(version) - versions = [x for x in map(float, versions) if x > 10.0] - if len(versions) == 0: - print ("Please update your android sdk") - return False - androidVersion = min(versions) - - if androidVersion is None or int(androidVersion) < 10: - print ("Please update your android sdk or reset android sdk version in the project.properties file") - return False - - buildNative = os.path.join(self.projectPath, "build_native.py") - if not os.path.isdir(self.projectPath) or not os.path.isfile(buildNative): - print ("Can't find the build_native.py") - return False - - sys.path.append(self.projectPath) - from build_native import build - build(None, str(int(androidVersion)), None, self.pure) - - def win32Runtime(self): - try: - vs = _winreg.OpenKey( - _winreg.HKEY_LOCAL_MACHINE, - r"SOFTWARE\Microsoft\VisualStudio" - ) - - msbuild = _winreg.OpenKey( - _winreg.HKEY_LOCAL_MACHINE, - r"SOFTWARE\Microsoft\MSBuild\ToolsVersions" - ) - - except WindowsError: - print ("Visual Studio wasn't installed") - return False - - vsPath = None - i = 0 - try: - while True: - version = _winreg.EnumKey(vs, i) - try: - if float(version) >= 11.0: - key = _winreg.OpenKey(vs, r"SxS\VS7") - vsPath,type = _winreg.QueryValueEx(key, version) - except: - pass - i += 1 - except WindowsError: - pass - - if vsPath is None: - print("Can't find the Visual Studio's path in the regedit") - return False - - msbuildPath = None - i = 0 - try: - while True: - version = _winreg.EnumKey(msbuild,i) - try: - if float(version) >= 4.0: - key = _winreg.OpenKey(msbuild, version) - msbuildPath, type = _winreg.QueryValueEx( - key, - "MSBuildToolsPath" - ) - except: - pass - i += 1 - except WindowsError: - pass - - if msbuildPath is None: - print ("Can't find the MSBuildTools' path in the regedit") - return False - - res = self.checkFileByExtention(".sln") - if not res: - print ("Can't find the \".sln\" file") - return False - - msbuildPath = os.path.join(msbuildPath, "MSBuild.exe") - projectPath = os.path.join(self.projectPath, self.projectName) - commands = [ - msbuildPath, - projectPath, - "/maxcpucount:4", - "/t:build", - "/p:configuration=Debug" - ] - - child = subprocess.Popen(commands, stdout=subprocess.PIPE) - for line in child.stdout: - print (line) - - child.wait() - - return True - - def checkFileByExtention(self, ext, path=None): - filelist = "" - if path is None: - filelist = os.listdir(self.projectPath) - else: - filelist = os.listdir(path) - - for file in filelist: - name, extention = os.path.splitext(file) - if extention == ext: - self.projectName = file - return True - return False - -if __name__ == '__main__': - platform, pure = checkParams(); - buildRuntime = BuildRuntime(platform, pure) - buildRuntime.buildRuntime() diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android/build_native.py b/templates/lua-template-default/frameworks/runtime-src/proj.android/build_native.py deleted file mode 100755 index 13bbe70b2b..0000000000 --- a/templates/lua-template-default/frameworks/runtime-src/proj.android/build_native.py +++ /dev/null @@ -1,193 +0,0 @@ -#!/usr/bin/python -# build_native.py -# Build native codes - - -import sys -import os, os.path -import shutil -from optparse import OptionParser - -def get_num_of_cpu(): - ''' The build process can be accelerated by running multiple concurrent job processes using the -j-option. - ''' - try: - platform = sys.platform - if platform == 'win32': - if 'NUMBER_OF_PROCESSORS' in os.environ: - return int(os.environ['NUMBER_OF_PROCESSORS']) - else: - return 1 - else: - from numpy.distutils import cpuinfo - return cpuinfo.cpu._getNCPUs() - except Exception: - print "Can't know cpuinfo, use default 1 cpu" - return 1 - -def check_environment_variables_sdk(): - ''' Checking the environment ANDROID_SDK_ROOT, which will be used for building - ''' - - try: - SDK_ROOT = os.environ['ANDROID_SDK_ROOT'] - except Exception: - print "ANDROID_SDK_ROOT not defined. Please define ANDROID_SDK_ROOT in your environment" - sys.exit(1) - - return SDK_ROOT - -def check_environment_variables(): - ''' Checking the environment NDK_ROOT, which will be used for building - ''' - - try: - NDK_ROOT = os.environ['NDK_ROOT'] - except Exception: - print "NDK_ROOT not defined. Please define NDK_ROOT in your environment" - sys.exit(1) - - return NDK_ROOT - -def select_toolchain_version(): - '''Because ndk-r8e uses gcc4.6 as default. gcc4.6 doesn't support c++11. So we should select gcc4.7 when - using ndk-r8e. But gcc4.7 is removed in ndk-r9, so we should determine whether gcc4.7 exist. - Conclution: - ndk-r8e -> use gcc4.7 - ndk-r9 -> use gcc4.8 - ''' - - ndk_root = check_environment_variables() - if os.path.isdir(os.path.join(ndk_root,"toolchains/arm-linux-androideabi-4.8")): - os.environ['NDK_TOOLCHAIN_VERSION'] = '4.8' - print "The Selected NDK toolchain version was 4.8 !" - elif os.path.isdir(os.path.join(ndk_root,"toolchains/arm-linux-androideabi-4.7")): - os.environ['NDK_TOOLCHAIN_VERSION'] = '4.7' - print "The Selected NDK toolchain version was 4.7 !" - else: - print "Couldn't find the gcc toolchain." - exit(1) - -def check_ant_variables(): - ''' Checking the environment ANT, which will be used for package - ''' - try: - ANT_PATH = os.environ['ANT_PATH'] - except Exception: - print "ANT_PATH not defined. Please define ANT_PATH in your environment" - sys.exit(1) - - return ANT_PATH - -def do_build(cocos_root, ndk_root, app_android_root,ndk_build_param,sdk_root,android_platform,build_mode): - - ndk_path = os.path.join(ndk_root, "ndk-build") - - # windows should use ";" to seperate module paths - platform = sys.platform - if platform == 'win32': - ndk_module_path = 'NDK_MODULE_PATH=%s/..;%s/../external;%s;%s/external;%s/cocos' % (cocos_root, cocos_root, cocos_root, cocos_root, cocos_root) - else: - ndk_module_path = 'NDK_MODULE_PATH=%s/..:%s/../external:%s:%s/external:%s/cocos' % (cocos_root, cocos_root, cocos_root, cocos_root, cocos_root) - - num_of_cpu = get_num_of_cpu() - - if ndk_build_param == None: - command = '%s -j%d -C %s %s' % (ndk_path, num_of_cpu, app_android_root, ndk_module_path) - else: - command = '%s -j%d -C %s %s %s' % (ndk_path, num_of_cpu, app_android_root, ''.join(str(e) for e in ndk_build_param), ndk_module_path) - if os.system(command) != 0: - raise Exception("Build dynamic library for project [ " + app_android_root + " ] fails!") - elif android_platform is not None: - sdk_tool_path = os.path.join(sdk_root, "tools/android") - cocoslib_path = os.path.join(cocos_root, "cocos/2d/platform/android/java") - command = '%s update lib-project -t %s -p %s' % (sdk_tool_path,android_platform,cocoslib_path) - if os.system(command) != 0: - raise Exception("update cocos lib-project [ " + cocoslib_path + " ] fails!") - command = '%s update project -t %s -p %s -s' % (sdk_tool_path,android_platform,app_android_root) - if os.system(command) != 0: - raise Exception("update project [ " + app_android_root + " ] fails!") - ant_path=check_ant_variables() - ant_path = os.path.join(ant_path, "ant") - buildfile_path = os.path.join(app_android_root, "build.xml") - command = '%s clean %s -f %s -Dsdk.dir=%s' % (ant_path,build_mode,buildfile_path,sdk_root) - os.system(command) - -def copy_files(src, dst): - - for item in os.listdir(src): - path = os.path.join(src, item) - # Android can not package the file that ends with ".gz" - if not item.startswith('.') and not item.endswith('.gz') and os.path.isfile(path): - shutil.copy(path, dst) - if os.path.isdir(path): - new_dst = os.path.join(dst, item) - os.makedirs(new_dst) - copy_files(path, new_dst) - -def copy_resources(app_android_root, build_mode, pure): - - # remove app_android_root/assets if it exists - assets_dir = os.path.join(app_android_root, "assets") - if os.path.isdir(assets_dir): - shutil.rmtree(assets_dir) - - # copy resources - os.mkdir(assets_dir) - - if pure is None: - assets_res_dir = assets_dir + "/res"; - assets_scripts_dir = assets_dir + "/scripts"; - os.mkdir(assets_res_dir); - os.mkdir(assets_scripts_dir); - - resources_dir = os.path.join(app_android_root, "../../../res") - copy_files(resources_dir, assets_res_dir) - - resources_dir = os.path.join(app_android_root, "../../../src") - copy_files(resources_dir, assets_scripts_dir) - - # lua project should copy lua script - resources_dir = os.path.join(app_android_root, "../../lua-bindings/bindings/script") - copy_files(resources_dir, assets_dir) - -def build(ndk_build_param,android_platform,build_mode,pure): - - ndk_root = check_environment_variables() - sdk_root = None - select_toolchain_version() - - current_dir = os.path.dirname(os.path.realpath(__file__)) - cocos_root = os.path.join(current_dir, "../../lua-bindings/cocos2d-x") - - app_android_root = current_dir - copy_resources(app_android_root, build_mode, pure) - - if android_platform is not None: - sdk_root = check_environment_variables_sdk() - if android_platform.isdigit(): - android_platform = 'android-'+android_platform - else: - print 'please use vaild android platform' - exit(1) - - if build_mode is None: - build_mode = 'debug' - elif build_mode != 'release': - build_mode = 'debug' - - do_build(cocos_root, ndk_root, app_android_root,ndk_build_param,sdk_root,android_platform,build_mode) - -# -------------- main -------------- -if __name__ == '__main__': - - parser = OptionParser() - parser.add_option("-n", "--ndk", dest="ndk_build_param", help='parameter for ndk-build') - parser.add_option("-p", "--platform", dest="android_platform", - help='parameter for android-update.Without the parameter,the script just build dynamic library for project. Valid android-platform are:[10|11|12|13|14|15|16|17|18|19]') - parser.add_option("-b", "--build", dest="build_mode", - help='the build mode for java project,debug[default] or release.Get more information,please refer to http://developer.android.com/tools/building/building-cmdline.html') - parser.add_option("-u", "--pure", dest="pure", help='parameter for copy resource') - (opts, args) = parser.parse_args() - - build(opts.ndk_build_param,opts.android_platform,opts.build_mode,opts.pure) diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android/custom_rules.xml b/templates/lua-template-default/frameworks/runtime-src/proj.android/custom_rules.xml deleted file mode 100644 index 677fbdcd05..0000000000 --- a/templates/lua-template-default/frameworks/runtime-src/proj.android/custom_rules.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android/jni/Android.mk b/templates/lua-template-default/frameworks/runtime-src/proj.android/jni/Android.mk index 3d0c180523..dfa01aa1a1 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.android/jni/Android.mk +++ b/templates/lua-template-default/frameworks/runtime-src/proj.android/jni/Android.mk @@ -7,13 +7,11 @@ LOCAL_MODULE := cocos2dlua_shared LOCAL_MODULE_FILENAME := libcocos2dlua LOCAL_SRC_FILES := hellolua/main.cpp \ - hellolua/Runtime_android.cpp \ - ../../Classes/AppDelegate.cpp \ - ../../Classes/Runtime.cpp + ../../Classes/AppDelegate.cpp LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes \ - $(LOCAL_PATH)/../../cocos2d/external/lua/tolua + $(LOCAL_PATH)/../../cocos2d-x/external/lua/tolua LOCAL_STATIC_LIBRARIES := curl_static_prebuilt diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android/project.properties b/templates/lua-template-default/frameworks/runtime-src/proj.android/project.properties index caa7eb935a..44eace38a5 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.android/project.properties +++ b/templates/lua-template-default/frameworks/runtime-src/proj.android/project.properties @@ -10,4 +10,4 @@ # Project target. target=android-10 -android.library.reference.1=../../lua-bindings/cocos2d-x/cocos/2d/platform/android/java +android.library.reference.1=../../cocos2d-x/cocos/2d/platform/android/java diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android/src/org/cocos2dx/lua/Cocos2dxActivity.java b/templates/lua-template-default/frameworks/runtime-src/proj.android/src/org/cocos2dx/lua/Cocos2dxActivity.java index 932794051e..8a6f1a6f1c 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.android/src/org/cocos2dx/lua/Cocos2dxActivity.java +++ b/templates/lua-template-default/frameworks/runtime-src/proj.android/src/org/cocos2dx/lua/Cocos2dxActivity.java @@ -40,49 +40,6 @@ public class Cocos2dxActivity extends NativeActivity{ //2.Set the format of window // getWindow().setFormat(PixelFormat.TRANSLUCENT); - if(!isWifiConnected()) - { - Toast.makeText(this, "wifi is closed!", Toast.LENGTH_SHORT).show(); - startActivity(new Intent(Settings.ACTION_WIFI_SETTINGS)); - } - } - - private boolean isWifiConnected() { - ConnectivityManager cm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE); - if (cm != null) { - NetworkInfo networkInfo = cm.getActiveNetworkInfo(); - if (networkInfo != null && networkInfo.getType() == ConnectivityManager.TYPE_WIFI) { - return true; - } - } - return false; - } - - public static String getLocalIpAddress() { - try { - for (Enumeration en = NetworkInterface - .getNetworkInterfaces(); en.hasMoreElements();) { - NetworkInterface intf = en.nextElement(); - for (Enumeration enumIpAddr = intf - .getInetAddresses(); enumIpAddr.hasMoreElements();) { - InetAddress inetAddress = enumIpAddr.nextElement(); - if (!inetAddress.isLoopbackAddress() && !inetAddress.isLinkLocalAddress()) { - return inetAddress.getHostAddress().toString(); - } - } - } - } catch (SocketException ex) { - Log.e("WifiPreference IpAddress", ex.toString()); - } - return null; - } - - public static String getSDCardPath() { - if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) { - String strSDCardPathString = Environment.getExternalStorageDirectory().getPath(); - return strSDCardPathString; - } - return null; } } diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj b/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj index 03584c9666..58b62f1160 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj +++ b/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj @@ -92,16 +92,7 @@ C03781F218BF656A00FE4F13 /* StudioConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CE18BF656A00FE4F13 /* StudioConstants.lua */; }; C03781F518BF65A900FE4F13 /* libluabindings Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C03781B418BF654500FE4F13 /* libluabindings Mac.a */; }; C03781F618BF65B100FE4F13 /* libluabindings iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C03781B618BF654500FE4F13 /* libluabindings iOS.a */; }; - C0619CD71896894800872C26 /* Runtime_ios-mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = C0619CD61896894800872C26 /* Runtime_ios-mac.mm */; }; - C0619CD81896894800872C26 /* Runtime_ios-mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = C0619CD61896894800872C26 /* Runtime_ios-mac.mm */; }; - C07828F818B4D72E00BD2287 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = C07828F418B4D72E00BD2287 /* main.m */; }; - C07828F918B4D72E00BD2287 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = C07828F518B4D72E00BD2287 /* MainMenu.xib */; }; - C07828FA18B4D72E00BD2287 /* SimulatorApp.mm in Sources */ = {isa = PBXBuildFile; fileRef = C07828F718B4D72E00BD2287 /* SimulatorApp.mm */; }; - C07828FD18B4DC6F00BD2287 /* Runtime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C07828FB18B4DC6F00BD2287 /* Runtime.cpp */; }; - C07828FE18B4DC7000BD2287 /* Runtime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C07828FB18B4DC6F00BD2287 /* Runtime.cpp */; }; - C09BA7E718BC929700A85A3E /* WorkSpaceDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = C09BA7E418BC929700A85A3E /* WorkSpaceDialog.xib */; }; - C09BA7E818BC929700A85A3E /* WorkSpaceDialogController.mm in Sources */ = {isa = PBXBuildFile; fileRef = C09BA7E618BC929700A85A3E /* WorkSpaceDialogController.mm */; }; - C09BA7EE18BCA49600A85A3E /* NSAppSheetAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = C09BA7ED18BCA49600A85A3E /* NSAppSheetAdditions.m */; }; + C06E23C418CEF9740093C81A /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C06E23C318CEF9740093C81A /* main.cpp */; }; D6B061351803AC000077942B /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D6B061341803AC000077942B /* CoreMotion.framework */; }; F293B3CD15EB7BE500256477 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3CC15EB7BE500256477 /* QuartzCore.framework */; }; F293B3D115EB7BE500256477 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3D015EB7BE500256477 /* OpenAL.framework */; }; @@ -284,9 +275,9 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2d_libs.xcodeproj; path = "../../lua-bindings/cocos2d-x/build/cocos2d_libs.xcodeproj"; sourceTree = ""; }; + 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2d_libs.xcodeproj; path = "../../cocos2d-x/build/cocos2d_libs.xcodeproj"; sourceTree = ""; }; 15A8A4871834C90E00142BE0 /* libcurl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcurl.dylib; path = usr/lib/libcurl.dylib; sourceTree = SDKROOT; }; - 15C1568D1683131500D239F2 /* libcurl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcurl.a; path = "../../lua-bindings/cocos2d-x/cocos2dx/platform/third_party/ios/libraries/libcurl.a"; sourceTree = ""; }; + 15C1568D1683131500D239F2 /* libcurl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcurl.a; path = "../../cocos2d-x/cocos2dx/platform/third_party/ios/libraries/libcurl.a"; sourceTree = ""; }; 1AF4C402178663F200122817 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; 5023810717EBBCAC00990C9B /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppController.h; sourceTree = ""; }; 5023810817EBBCAC00990C9B /* AppController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AppController.mm; sourceTree = ""; }; @@ -320,39 +311,28 @@ 50D7C96B17EBBEDF005D0B91 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; }; 50D7C96D17EBBEE6005D0B91 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; }; 50D7C96F17EBBEEC005D0B91 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; - C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2d_lua_bindings.xcodeproj; path = "../../lua-bindings/bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj"; sourceTree = ""; }; + C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2d_lua_bindings.xcodeproj; path = "../../cocos2d-x/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj"; sourceTree = ""; }; C03781B718BF655400FE4F13 /* res */ = {isa = PBXFileReference; lastKnownFileType = folder; name = res; path = ../../../res; sourceTree = ""; }; C03781B818BF655400FE4F13 /* src */ = {isa = PBXFileReference; lastKnownFileType = folder; name = src; path = ../../../src; sourceTree = ""; }; - C03781BD18BF656900FE4F13 /* AudioEngine.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = AudioEngine.lua; path = "../../lua-bindings/bindings/script/AudioEngine.lua"; sourceTree = ""; }; - C03781BE18BF656900FE4F13 /* CCBReaderLoad.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CCBReaderLoad.lua; path = "../../lua-bindings/bindings/script/CCBReaderLoad.lua"; sourceTree = ""; }; - C03781BF18BF656900FE4F13 /* Cocos2d.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2d.lua; path = "../../lua-bindings/bindings/script/Cocos2d.lua"; sourceTree = ""; }; - C03781C018BF656900FE4F13 /* Cocos2dConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2dConstants.lua; path = "../../lua-bindings/bindings/script/Cocos2dConstants.lua"; sourceTree = ""; }; - C03781C118BF656900FE4F13 /* CocoStudio.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CocoStudio.lua; path = "../../lua-bindings/bindings/script/CocoStudio.lua"; sourceTree = ""; }; - C03781C218BF656900FE4F13 /* Deprecated.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Deprecated.lua; path = "../../lua-bindings/bindings/script/Deprecated.lua"; sourceTree = ""; }; - C03781C318BF656900FE4F13 /* DeprecatedClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedClass.lua; path = "../../lua-bindings/bindings/script/DeprecatedClass.lua"; sourceTree = ""; }; - C03781C418BF656A00FE4F13 /* DeprecatedEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedEnum.lua; path = "../../lua-bindings/bindings/script/DeprecatedEnum.lua"; sourceTree = ""; }; - C03781C518BF656A00FE4F13 /* DeprecatedOpenglEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedOpenglEnum.lua; path = "../../lua-bindings/bindings/script/DeprecatedOpenglEnum.lua"; sourceTree = ""; }; - C03781C618BF656A00FE4F13 /* DrawPrimitives.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DrawPrimitives.lua; path = "../../lua-bindings/bindings/script/DrawPrimitives.lua"; sourceTree = ""; }; - C03781C718BF656A00FE4F13 /* extern.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = extern.lua; path = "../../lua-bindings/bindings/script/extern.lua"; sourceTree = ""; }; - C03781C818BF656A00FE4F13 /* GuiConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = GuiConstants.lua; path = "../../lua-bindings/bindings/script/GuiConstants.lua"; sourceTree = ""; }; - C03781C918BF656A00FE4F13 /* json.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = json.lua; path = "../../lua-bindings/bindings/script/json.lua"; sourceTree = ""; }; - C03781CA18BF656A00FE4F13 /* luaj.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = luaj.lua; path = "../../lua-bindings/bindings/script/luaj.lua"; sourceTree = ""; }; - C03781CB18BF656A00FE4F13 /* luaoc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = luaoc.lua; path = "../../lua-bindings/bindings/script/luaoc.lua"; sourceTree = ""; }; - C03781CC18BF656A00FE4F13 /* Opengl.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Opengl.lua; path = "../../lua-bindings/bindings/script/Opengl.lua"; sourceTree = ""; }; - C03781CD18BF656A00FE4F13 /* OpenglConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = OpenglConstants.lua; path = "../../lua-bindings/bindings/script/OpenglConstants.lua"; sourceTree = ""; }; - C03781CE18BF656A00FE4F13 /* StudioConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = StudioConstants.lua; path = "../../lua-bindings/bindings/script/StudioConstants.lua"; sourceTree = ""; }; - C0619CD61896894800872C26 /* Runtime_ios-mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "Runtime_ios-mac.mm"; sourceTree = ""; }; - C07828F418B4D72E00BD2287 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - C07828F518B4D72E00BD2287 /* MainMenu.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MainMenu.xib; sourceTree = ""; }; - C07828F618B4D72E00BD2287 /* SimulatorApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SimulatorApp.h; sourceTree = ""; }; - C07828F718B4D72E00BD2287 /* SimulatorApp.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SimulatorApp.mm; sourceTree = ""; }; - C07828FB18B4DC6F00BD2287 /* Runtime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Runtime.cpp; path = ../Classes/Runtime.cpp; sourceTree = ""; }; - C07828FC18B4DC6F00BD2287 /* Runtime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Runtime.h; path = ../Classes/Runtime.h; sourceTree = ""; }; - C09BA7E418BC929700A85A3E /* WorkSpaceDialog.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = WorkSpaceDialog.xib; sourceTree = ""; }; - C09BA7E518BC929700A85A3E /* WorkSpaceDialogController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkSpaceDialogController.h; sourceTree = ""; }; - C09BA7E618BC929700A85A3E /* WorkSpaceDialogController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WorkSpaceDialogController.mm; sourceTree = ""; }; - C09BA7EC18BCA49600A85A3E /* NSAppSheetAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSAppSheetAdditions.h; sourceTree = ""; }; - C09BA7ED18BCA49600A85A3E /* NSAppSheetAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSAppSheetAdditions.m; sourceTree = ""; }; + C03781BD18BF656900FE4F13 /* AudioEngine.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = AudioEngine.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/AudioEngine.lua"; sourceTree = ""; }; + C03781BE18BF656900FE4F13 /* CCBReaderLoad.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CCBReaderLoad.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/CCBReaderLoad.lua"; sourceTree = ""; }; + C03781BF18BF656900FE4F13 /* Cocos2d.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2d.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/Cocos2d.lua"; sourceTree = ""; }; + C03781C018BF656900FE4F13 /* Cocos2dConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2dConstants.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/Cocos2dConstants.lua"; sourceTree = ""; }; + C03781C118BF656900FE4F13 /* CocoStudio.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CocoStudio.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/CocoStudio.lua"; sourceTree = ""; }; + C03781C218BF656900FE4F13 /* Deprecated.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Deprecated.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/Deprecated.lua"; sourceTree = ""; }; + C03781C318BF656900FE4F13 /* DeprecatedClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedClass.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/DeprecatedClass.lua"; sourceTree = ""; }; + C03781C418BF656A00FE4F13 /* DeprecatedEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedEnum.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/DeprecatedEnum.lua"; sourceTree = ""; }; + C03781C518BF656A00FE4F13 /* DeprecatedOpenglEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedOpenglEnum.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/DeprecatedOpenglEnum.lua"; sourceTree = ""; }; + C03781C618BF656A00FE4F13 /* DrawPrimitives.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DrawPrimitives.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/DrawPrimitives.lua"; sourceTree = ""; }; + C03781C718BF656A00FE4F13 /* extern.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = extern.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/extern.lua"; sourceTree = ""; }; + C03781C818BF656A00FE4F13 /* GuiConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = GuiConstants.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/GuiConstants.lua"; sourceTree = ""; }; + C03781C918BF656A00FE4F13 /* json.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = json.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/json.lua"; sourceTree = ""; }; + C03781CA18BF656A00FE4F13 /* luaj.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = luaj.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/luaj.lua"; sourceTree = ""; }; + C03781CB18BF656A00FE4F13 /* luaoc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = luaoc.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/luaoc.lua"; sourceTree = ""; }; + C03781CC18BF656A00FE4F13 /* Opengl.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Opengl.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/Opengl.lua"; sourceTree = ""; }; + C03781CD18BF656A00FE4F13 /* OpenglConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = OpenglConstants.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/OpenglConstants.lua"; sourceTree = ""; }; + C03781CE18BF656A00FE4F13 /* StudioConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = StudioConstants.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/StudioConstants.lua"; sourceTree = ""; }; + C06E23C318CEF9740093C81A /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = ""; }; D6B061341803AC000077942B /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/System/Library/Frameworks/CoreMotion.framework; sourceTree = DEVELOPER_DIR; }; F293B3C815EB7BE500256477 /* HelloLua iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "HelloLua iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; F293B3CC15EB7BE500256477 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; @@ -479,16 +459,8 @@ 5023817117EBBE3400990C9B /* mac */ = { isa = PBXGroup; children = ( - C09BA7EC18BCA49600A85A3E /* NSAppSheetAdditions.h */, - C09BA7ED18BCA49600A85A3E /* NSAppSheetAdditions.m */, - C09BA7E418BC929700A85A3E /* WorkSpaceDialog.xib */, - C09BA7E518BC929700A85A3E /* WorkSpaceDialogController.h */, - C09BA7E618BC929700A85A3E /* WorkSpaceDialogController.mm */, + C06E23C318CEF9740093C81A /* main.cpp */, 5023817217EBBE3400990C9B /* Icon.icns */, - C07828F418B4D72E00BD2287 /* main.m */, - C07828F518B4D72E00BD2287 /* MainMenu.xib */, - C07828F618B4D72E00BD2287 /* SimulatorApp.h */, - C07828F718B4D72E00BD2287 /* SimulatorApp.mm */, 5023817317EBBE3400990C9B /* Info.plist */, 5023817517EBBE3400990C9B /* Prefix.pch */, ); @@ -575,9 +547,6 @@ F293BB7C15EB830F00256477 /* Classes */ = { isa = PBXGroup; children = ( - C07828FB18B4DC6F00BD2287 /* Runtime.cpp */, - C07828FC18B4DC6F00BD2287 /* Runtime.h */, - C0619CD61896894800872C26 /* Runtime_ios-mac.mm */, F293BB7E15EB831F00256477 /* AppDelegate.cpp */, F293BB7F15EB831F00256477 /* AppDelegate.h */, ); @@ -782,13 +751,11 @@ C03781E618BF656A00FE4F13 /* GuiConstants.lua in Resources */, C03781D418BF656A00FE4F13 /* Cocos2d.lua in Resources */, C03781BA18BF655400FE4F13 /* res in Resources */, - C09BA7E718BC929700A85A3E /* WorkSpaceDialog.xib in Resources */, C03781BC18BF655400FE4F13 /* src in Resources */, C03781E218BF656A00FE4F13 /* DrawPrimitives.lua in Resources */, C03781DA18BF656A00FE4F13 /* Deprecated.lua in Resources */, C03781E018BF656A00FE4F13 /* DeprecatedOpenglEnum.lua in Resources */, C03781EC18BF656A00FE4F13 /* luaoc.lua in Resources */, - C07828F918B4D72E00BD2287 /* MainMenu.xib in Resources */, 5023817617EBBE3400990C9B /* Icon.icns in Resources */, C03781D218BF656A00FE4F13 /* CCBReaderLoad.lua in Resources */, C03781D018BF656A00FE4F13 /* AudioEngine.lua in Resources */, @@ -852,13 +819,8 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - C07828FA18B4D72E00BD2287 /* SimulatorApp.mm in Sources */, + C06E23C418CEF9740093C81A /* main.cpp in Sources */, 5023813317EBBCE400990C9B /* AppDelegate.cpp in Sources */, - C09BA7EE18BCA49600A85A3E /* NSAppSheetAdditions.m in Sources */, - C07828FE18B4DC7000BD2287 /* Runtime.cpp in Sources */, - C09BA7E818BC929700A85A3E /* WorkSpaceDialogController.mm in Sources */, - C07828F818B4D72E00BD2287 /* main.m in Sources */, - C0619CD81896894800872C26 /* Runtime_ios-mac.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -869,8 +831,6 @@ 5023812517EBBCAC00990C9B /* RootViewController.mm in Sources */, F293BB9C15EB831F00256477 /* AppDelegate.cpp in Sources */, 5023812417EBBCAC00990C9B /* main.m in Sources */, - C0619CD71896894800872C26 /* Runtime_ios-mac.mm in Sources */, - C07828FD18B4DC6F00BD2287 /* Runtime.cpp in Sources */, 5023811817EBBCAC00990C9B /* AppController.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -966,7 +926,7 @@ 10000, ); SDKROOT = macosx; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../lua-bindings/cocos2d-x/cocos/2d/platform/mac $(SRCROOT)/../../lua-bindings/cocos2d-x/external/glfw3/include/mac"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/cocos/2d/platform/mac $(SRCROOT)/../../cocos2d-x/external/glfw3/include/mac"; }; name = Debug; }; @@ -992,7 +952,7 @@ 10000, ); SDKROOT = macosx; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../lua-bindings/cocos2d-x/cocos/2d/platform/mac $(SRCROOT)/../../lua-bindings/cocos2d-x/external/glfw3/include/mac"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/cocos/2d/platform/mac $(SRCROOT)/../../cocos2d-x/external/glfw3/include/mac"; }; name = Release; }; @@ -1018,7 +978,7 @@ HEADER_SEARCH_PATHS = ""; ONLY_ACTIVE_ARCH = YES; PRODUCT_NAME = "$(TARGET_NAME)"; - USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../lua-bindings/cocos2d-x $(SRCROOT)/../../lua-bindings/cocos2d-x/cocos $(SRCROOT)/../../lua-bindings/cocos2d-x/cocos/base $(SRCROOT)/../../lua-bindings/cocos2d-x/cocos/physics $(SRCROOT)/../../lua-bindings/cocos2d-x/cocos/math/kazmath $(SRCROOT)/../../lua-bindings/cocos2d-x/cocos/2d $(SRCROOT)/../../lua-bindings/cocos2d-x/cocos/gui $(SRCROOT)/../../lua-bindings/cocos2d-x/cocos/network $(SRCROOT)/../../lua-bindings/cocos2d-x/cocos/audio/include $(SRCROOT)/../../lua-bindings/cocos2d-x/cocos/editor-support $(SRCROOT)/../../lua-bindings/cocos2d-x/extensions $(SRCROOT)/../../lua-bindings/cocos2d-x/external $(SRCROOT)/../../lua-bindings/cocos2d-x/external/chipmunk/include/chipmunk $(SRCROOT)/../../lua-bindings/external/luajit/include $(SRCROOT)/../../lua-bindings/external/tolua $(SRCROOT)/../../lua-bindings/bindings/manual $(SRCROOT)/../../lua-bindings/bindings/auto"; + USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../cocos2d-x $(SRCROOT)/../../cocos2d-x/cocos $(SRCROOT)/../../cocos2d-x/cocos/base $(SRCROOT)/../../cocos2d-x/cocos/physics $(SRCROOT)/../../cocos2d-x/cocos/math/kazmath $(SRCROOT)/../../cocos2d-x/cocos/2d $(SRCROOT)/../../cocos2d-x/cocos/gui $(SRCROOT)/../../cocos2d-x/cocos/network $(SRCROOT)/../../cocos2d-x/cocos/audio/include $(SRCROOT)/../../cocos2d-x/cocos/editor-support $(SRCROOT)/../../cocos2d-x/extensions $(SRCROOT)/../../cocos2d-x/external $(SRCROOT)/../../cocos2d-x/external/chipmunk/include/chipmunk $(SRCROOT)/../../cocos2d-x/external/lua/luajit/include $(SRCROOT)/../../cocos2d-x/external/lua/tolua $(SRCROOT)/../../cocos2d-x/cocos/scripting/lua-bindings/manual $(SRCROOT)/../../cocos2d-x/cocos/scripting/lua-bindings/auto"; }; name = Debug; }; @@ -1039,7 +999,7 @@ HEADER_SEARCH_PATHS = ""; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; PRODUCT_NAME = "$(TARGET_NAME)"; - USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../lua-bindings/cocos2d-x $(SRCROOT)/../../lua-bindings/cocos2d-x/cocos $(SRCROOT)/../../lua-bindings/cocos2d-x/cocos/base $(SRCROOT)/../../lua-bindings/cocos2d-x/cocos/physics $(SRCROOT)/../../lua-bindings/cocos2d-x/cocos/math/kazmath $(SRCROOT)/../../lua-bindings/cocos2d-x/cocos/2d $(SRCROOT)/../../lua-bindings/cocos2d-x/cocos/gui $(SRCROOT)/../../lua-bindings/cocos2d-x/cocos/network $(SRCROOT)/../../lua-bindings/cocos2d-x/cocos/audio/include $(SRCROOT)/../../lua-bindings/cocos2d-x/cocos/editor-support $(SRCROOT)/../../lua-bindings/cocos2d-x/extensions $(SRCROOT)/../../lua-bindings/cocos2d-x/external $(SRCROOT)/../../lua-bindings/cocos2d-x/external/chipmunk/include/chipmunk $(SRCROOT)/../../lua-bindings/external/luajit/include $(SRCROOT)/../../lua-bindings/external/tolua $(SRCROOT)/../../lua-bindings/bindings/manual $(SRCROOT)/../../lua-bindings/bindings/auto"; + USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../cocos2d-x $(SRCROOT)/../../cocos2d-x/cocos $(SRCROOT)/../../cocos2d-x/cocos/base $(SRCROOT)/../../cocos2d-x/cocos/physics $(SRCROOT)/../../cocos2d-x/cocos/math/kazmath $(SRCROOT)/../../cocos2d-x/cocos/2d $(SRCROOT)/../../cocos2d-x/cocos/gui $(SRCROOT)/../../cocos2d-x/cocos/network $(SRCROOT)/../../cocos2d-x/cocos/audio/include $(SRCROOT)/../../cocos2d-x/cocos/editor-support $(SRCROOT)/../../cocos2d-x/extensions $(SRCROOT)/../../cocos2d-x/external $(SRCROOT)/../../cocos2d-x/external/chipmunk/include/chipmunk $(SRCROOT)/../../cocos2d-x/external/lua/luajit/include $(SRCROOT)/../../cocos2d-x/external/lua/tolua $(SRCROOT)/../../cocos2d-x/cocos/scripting/lua-bindings/manual $(SRCROOT)/../../cocos2d-x/cocos/scripting/lua-bindings/auto"; VALIDATE_PRODUCT = YES; }; name = Release; @@ -1063,7 +1023,7 @@ LIBRARY_SEARCH_PATHS = ""; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../lua-bindings/cocos2d-x/cocos/2d/platform/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/cocos/2d/platform/ios"; }; name = Debug; }; @@ -1085,7 +1045,7 @@ LIBRARY_SEARCH_PATHS = ""; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../lua-bindings/cocos2d-x/cocos/2d/platform/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/cocos/2d/platform/ios"; }; name = Release; }; diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/mac/main.cpp b/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/mac/main.cpp new file mode 100644 index 0000000000..96f027e13d --- /dev/null +++ b/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/mac/main.cpp @@ -0,0 +1,34 @@ +/**************************************************************************** + Copyright (c) 2010 cocos2d-x.org + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +#include "AppDelegate.h" +#include "cocos2d.h" + +USING_NS_CC; + +int main(int argc, char *argv[]) +{ + AppDelegate app; + return Application::getInstance()->run(); +} diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.sln b/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.sln index a81a898b48..96979213d0 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.sln +++ b/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.sln @@ -11,32 +11,32 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloLua", "HelloLua.vcxpro {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6} = {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libExtensions", "..\..\lua-bindings\cocos2d-x\extensions\proj.win32\libExtensions.vcxproj", "{21B2C324-891F-48EA-AD1A-5AE13DE12E28}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libExtensions", "..\..\cocos2d-x\extensions\proj.win32\libExtensions.vcxproj", "{21B2C324-891F-48EA-AD1A-5AE13DE12E28}" ProjectSection(ProjectDependencies) = postProject {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} {207BC7A9-CCF1-4F2F-A04D-45F72242AE25} = {207BC7A9-CCF1-4F2F-A04D-45F72242AE25} {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6} = {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libchipmunk", "..\..\lua-bindings\cocos2d-x\external\chipmunk\proj.win32\chipmunk.vcxproj", "{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libchipmunk", "..\..\cocos2d-x\external\chipmunk\proj.win32\chipmunk.vcxproj", "{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\..\lua-bindings\cocos2d-x\cocos\2d\cocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\..\cocos2d-x\cocos\2d\cocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libAudio", "..\..\lua-bindings\cocos2d-x\cocos\audio\proj.win32\CocosDenshion.vcxproj", "{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libAudio", "..\..\cocos2d-x\cocos\audio\proj.win32\CocosDenshion.vcxproj", "{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libNetwork", "..\..\lua-bindings\cocos2d-x\cocos\network\proj.win32\libNetwork.vcxproj", "{DF2638C0-8128-4847-867C-6EAFE3DEE7B5}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libNetwork", "..\..\cocos2d-x\cocos\network\proj.win32\libNetwork.vcxproj", "{DF2638C0-8128-4847-867C-6EAFE3DEE7B5}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosBuilder", "..\..\lua-bindings\cocos2d-x\cocos\editor-support\cocosbuilder\proj.win32\libCocosBuilder.vcxproj", "{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosBuilder", "..\..\cocos2d-x\cocos\editor-support\cocosbuilder\proj.win32\libCocosBuilder.vcxproj", "{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosStudio", "..\..\lua-bindings\cocos2d-x\cocos\editor-support\cocostudio\proj.win32\libCocosStudio.vcxproj", "{B57CF53F-2E49-4031-9822-047CC0E6BDE2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosStudio", "..\..\cocos2d-x\cocos\editor-support\cocostudio\proj.win32\libCocosStudio.vcxproj", "{B57CF53F-2E49-4031-9822-047CC0E6BDE2}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGUI", "..\..\lua-bindings\cocos2d-x\cocos\gui\proj.win32\libGUI.vcxproj", "{7E06E92C-537A-442B-9E4A-4761C84F8A1A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGUI", "..\..\cocos2d-x\cocos\gui\proj.win32\libGUI.vcxproj", "{7E06E92C-537A-442B-9E4A-4761C84F8A1A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "..\..\lua-bindings\cocos2d-x\cocos\editor-support\spine\proj.win32\libSpine.vcxproj", "{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "..\..\cocos2d-x\cocos\editor-support\spine\proj.win32\libSpine.vcxproj", "{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblua", "..\..\lua-bindings\bindings\proj.win32\liblua.vcxproj", "{DDC3E27F-004D-4DD4-9DD3-931A013D2159}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblua", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\liblua.vcxproj", "{DDC3E27F-004D-4DD4-9DD3-931A013D2159}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libLocalStorage", "..\..\lua-bindings\cocos2d-x\cocos\storage\local-storage\proj.win32\libLocalStorage.vcxproj", "{632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libLocalStorage", "..\..\cocos2d-x\cocos\storage\local-storage\proj.win32\libLocalStorage.vcxproj", "{632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj b/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj index aaa77750ba..36985508d8 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj +++ b/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj @@ -36,13 +36,13 @@ - - + + - - + + @@ -66,7 +66,7 @@ - $(ProjectDir)..\Classes;$(EngineRoot)..\bindings\auto;$(EngineRoot)..\bindings\manual;$(EngineRoot)cocos\audio\include;$(EngineRoot)..\external\lua;$(EngineRoot)..\external\tolua;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(EngineRoot);%(AdditionalIncludeDirectories) + $(ProjectDir)..\Classes;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\lua\lua;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(EngineRoot);%(AdditionalIncludeDirectories) Level3 @@ -75,7 +75,7 @@ EditAndContinue EnableFastChecks Disabled - WIN32;_WINDOWS;STRICT;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS_DEBUG;COCOS2D_DEBUG=1;GLFW_EXPOSE_NATIVE_WIN32;GLFW_EXPOSE_NATIVE_WGL;%(PreprocessorDefinitions) + WIN32;_WINDOWS;STRICT;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) 4267;4251;4244;%(DisableSpecificWarnings) true @@ -109,7 +109,7 @@ if exist "$(OutDir)\Resource" rd /s /q "$(OutDir)\Resource" mkdir "$(OutDir)\Resource" mkdir "$(OutDir)\Resource\src" mkdir "$(OutDir)\Resource\res" -xcopy "$(ProjectDir)..\..\lua-bindings\bindings\script" "$(OutDir)\Resource" /e /Y +xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script" "$(OutDir)\Resource" /e /Y xcopy "$(ProjectDir)..\..\..\src" "$(OutDir)\Resource\src" /e /Y xcopy "$(ProjectDir)..\..\..\res" "$(OutDir)\Resource\res" /e /Y copy files @@ -121,7 +121,7 @@ xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)" - $(ProjectDir)..\Classes;$(EngineRoot)..\bindings\auto;$(EngineRoot)..\bindings\manual;$(EngineRoot)cocos\audio\include;$(EngineRoot)..\external\lua;$(EngineRoot)..\external\tolua;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(EngineRoot);%(AdditionalIncludeDirectories) + $(ProjectDir)..\Classes;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\lua\lua;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(EngineRoot);%(AdditionalIncludeDirectories) Level3 @@ -129,7 +129,7 @@ xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)" ProgramDatabase - WIN32;_WINDOWS;STRICT;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGSNDEBUG;GLFW_EXPOSE_NATIVE_WIN32;GLFW_EXPOSE_NATIVE_WGL;%(PreprocessorDefinitions) + WIN32;_WINDOWS;STRICT;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGSNDEBUG;%(PreprocessorDefinitions) 4267;4251;4244;%(DisableSpecificWarnings) true @@ -163,12 +163,11 @@ if exist "$(OutDir)\Resource" rd /s /q "$(OutDir)\Resource" mkdir "$(OutDir)\Resource" mkdir "$(OutDir)\Resource\src" mkdir "$(OutDir)\Resource\res" -xcopy "$(ProjectDir)..\..\lua-bindings\bindings\script" "$(OutDir)\Resource" /e /Y +xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script" "$(OutDir)\Resource" /e /Y xcopy "$(ProjectDir)..\..\..\src" "$(OutDir)\Resource\src" /e /Y xcopy "$(ProjectDir)..\..\..\res" "$(OutDir)\Resource\res" /e /Y copy files - if not exist "$(OutDir)" mkdir "$(OutDir)" xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)" @@ -176,55 +175,54 @@ xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)" - - + - - - - + {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} - + {f8edd7fa-9a51-4e80-baeb-860825d2eac6} - + {811c0dab-7b96-4bd3-a154-b7572b58e4ab} - + {b57cf53f-2e49-4031-9822-047cc0e6bde2} - + {b7c2a162-dec9-4418-972e-240ab3cbfcae} - + {7e06e92c-537a-442b-9e4a-4761c84f8a1a} - + {df2638c0-8128-4847-867c-6eafe3dee7b5} - + {ddc3e27f-004d-4dd4-9dd3-931a013d2159} - + {632a8f38-d0f0-4d22-86b3-d69f5e6bf63a} - + {21b2c324-891f-48ea-ad1a-5ae13de12e28} - + {207bc7a9-ccf1-4f2f-a04d-45f72242ae25} + + + diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj.filters b/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj.filters index 4e00a2831f..fd45c190ea 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj.filters +++ b/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj.filters @@ -18,12 +18,7 @@ win32 - - win32 - - - Classes - + @@ -32,19 +27,13 @@ win32 - - win32 - - - win32 - - - Classes - resource + + + \ No newline at end of file diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.win32/Runtime_win32.cpp b/templates/lua-template-default/frameworks/runtime-src/proj.win32/Runtime_win32.cpp deleted file mode 100644 index c2eea64042..0000000000 --- a/templates/lua-template-default/frameworks/runtime-src/proj.win32/Runtime_win32.cpp +++ /dev/null @@ -1,52 +0,0 @@ - -#include -#include -#include -#include -#include - -#include "cocos2d.h" -using namespace std; - - -string getProjSearchPath() -{ - extern std::string getCurAppPath(void); - string searchPath = getCurAppPath(); - searchPath += "/../.."; - char fuldir[MAX_PATH]={0}; - _fullpath(fuldir,searchPath.c_str(),MAX_PATH); - return fuldir; -} - -vector getSearchPath() -{ - extern std::string getCurAppPath(void); - vector searchPathArray; - string searchPathRes = getCurAppPath(); - searchPathRes += "/Resources"; - searchPathArray.push_back(getProjSearchPath()); - searchPathArray.push_back(searchPathRes); - return searchPathArray; -} - -string getIPAddress() -{ - WSADATA wsaData; - char name[155]={0}; - char *ip=nullptr; - PHOSTENT hostinfo; - - if ( WSAStartup( MAKEWORD(2,0), &wsaData ) == 0 ) - { - if( gethostname ( name, sizeof(name)) == 0) - { - if((hostinfo = gethostbyname(name)) != NULL) - { - ip = inet_ntoa (*(struct in_addr *)*hostinfo->h_addr_list); - } - } - WSACleanup( ); - } - return ip; -} diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.win32/game.rc b/templates/lua-template-default/frameworks/runtime-src/proj.win32/game.rc index 40a3b1e3df..b9f2307b2e 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.win32/game.rc +++ b/templates/lua-template-default/frameworks/runtime-src/proj.win32/game.rc @@ -14,29 +14,37 @@ ///////////////////////////////////////////////////////////////////////////// // Chinese (Simplified, PRC) resources + #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS) LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED #pragma code_page(936) + #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // // TEXTINCLUDE // + 2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" "\0" END + 3 TEXTINCLUDE BEGIN "\r\n" "\0" END + #endif // APSTUDIO_INVOKED + + ///////////////////////////////////////////////////////////////////////////// // // Menu // + IDR_MENU_COCOS MENU BEGIN POPUP "&File" @@ -50,7 +58,10 @@ BEGIN MENUITEM "&Portrait", ID_VIEW_PORTRAIT MENUITEM "&Landscape", ID_VIEW_LANDSCAPE MENUITEM SEPARATOR - MENUITEM "&Custom", ID_VIEW_CUSTOM + MENUITEM "&Actual(100%)", ID_VIEW_ZOOMOUT100 + MENUITEM "Zoom Out(75%)", ID_VIEW_ZOOMOUT75 + MENUITEM "Zoom Out(50%)", ID_VIEW_ZOOMOUT50 + MENUITEM "Zoom Out(25%)", ID_VIEW_ZOOMOUT25 END POPUP "&Control" BEGIN @@ -61,10 +72,13 @@ BEGIN MENUITEM "&About ...", ID_HELP_ABOUT END END + + ///////////////////////////////////////////////////////////////////////////// // // Dialog // + IDD_DIALOG_ABOUT DIALOGEX 0, 0, 243, 94 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "About Simulator" @@ -73,6 +87,7 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,173,69,63,18 LTEXT "Cocos2d-x-Simulator",IDC_STATIC,29,17,169,25 END + IDD_DIALOG_VIEWCUSTOM DIALOGEX 0, 0, 179, 98 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Custom" @@ -85,10 +100,13 @@ BEGIN EDITTEXT IDC_EDIT_WIDTH,60,15,89,14,ES_AUTOHSCROLL EDITTEXT IDC_EDIT_HEIGHT,62,36,87,14,ES_AUTOHSCROLL END + + ///////////////////////////////////////////////////////////////////////////// // // DESIGNINFO // + #ifdef APSTUDIO_INVOKED GUIDELINES DESIGNINFO BEGIN @@ -99,6 +117,7 @@ BEGIN TOPMARGIN, 7 BOTTOMMARGIN, 87 END + IDD_DIALOG_VIEWCUSTOM, DIALOG BEGIN LEFTMARGIN, 7 @@ -108,8 +127,11 @@ BEGIN END END #endif // APSTUDIO_INVOKED + #endif // Chinese (Simplified, PRC) resources ///////////////////////////////////////////////////////////////////////////// + + ///////////////////////////////////////////////////////////////////////////// // English (United States) resources @@ -130,6 +152,7 @@ END #endif // APSTUDIO_INVOKED + ///////////////////////////////////////////////////////////////////////////// // // Icon @@ -137,7 +160,7 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -GLFW_ICON ICON "res\\game.ico" +GLFW_ICON ICON "res\\game.ico" ///////////////////////////////////////////////////////////////////////////// // @@ -179,10 +202,15 @@ END #endif // English (United States) resources ///////////////////////////////////////////////////////////////////////////// + + #ifndef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // // Generated from the TEXTINCLUDE 3 resource. // + + ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.win32/main.cpp b/templates/lua-template-default/frameworks/runtime-src/proj.win32/main.cpp index 14085d53d7..d9b2ddaa2e 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.win32/main.cpp +++ b/templates/lua-template-default/frameworks/runtime-src/proj.win32/main.cpp @@ -1,7 +1,6 @@ #include "main.h" #include "AppDelegate.h" #include "cocos2d.h" -#include "SimulatorWindow.h" USING_NS_CC; @@ -25,8 +24,6 @@ int APIENTRY _tWinMain(HINSTANCE hInstance, // create the application instance AppDelegate app; - createSimulator("HelloLua",960,640); - int ret = Application::getInstance()->run(); #ifdef USE_WIN32_CONSOLE @@ -35,25 +32,3 @@ int APIENTRY _tWinMain(HINSTANCE hInstance, return ret; } -std::string getCurAppPath(void) -{ - TCHAR szAppDir[MAX_PATH]={0}; - if (!GetModuleFileName(NULL,szAppDir,MAX_PATH)) - return ""; - int nEnd=0; - for (int i=0;szAppDir[i];i++) - { - if(szAppDir[i]=='\\') - nEnd = i; - } - szAppDir[nEnd] = 0; - int iLen = 2*wcslen(szAppDir); - char* chRtn = new char[iLen+1]; - wcstombs(chRtn,szAppDir,iLen+1); - std::string strPath = chRtn; - delete [] chRtn; - chRtn=NULL; - char fuldir[MAX_PATH]={0}; - _fullpath(fuldir,strPath.c_str(),MAX_PATH); - return fuldir; -} \ No newline at end of file diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.win32/resource.h b/templates/lua-template-default/frameworks/runtime-src/proj.win32/resource.h index 3a88e6420d..6f04655931 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.win32/resource.h +++ b/templates/lua-template-default/frameworks/runtime-src/proj.win32/resource.h @@ -1,10 +1,9 @@ //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. -// Used by game.RC +// Used by game.rc // - -#define IDS_PROJNAME 100 -#define IDR_TESTLUA 100 +#define IDS_PROJNAME 100 +#define IDR_TESTLUA 100 #define IDR_MENU_COCOS 201 #define IDD_DIALOG1 202 #define IDD_DIALOG_ABOUT 202 @@ -13,7 +12,7 @@ #define IDC_EDIT2 1001 #define IDC_EDIT_HEIGHT 1001 #define ID_VIEW_SIZE 30001 -#define ID_FILE_NEW_WINDOW 32771 +#define ID_FILE_NEW_WINDOW 32771 #define ID_VIEW_PORTRAIT 32775 #define ID_VIEW_LANDSCAPE 32776 #define ID_VIEW_CUSTOM 32777 @@ -24,14 +23,18 @@ #define ID_TEST_RESET 32782 #define ID_CONTROL 32783 #define ID_CONTROL_RELOAD 32784 +#define ID_VIEW_ZOOMOUT100 32785 +#define ID_VIEW_ZOOMOUT75 32786 +#define ID_VIEW_ZOOMOUT50 32787 +#define ID_VIEW_ZOOMOUT25 32788 // Next default values for new objects // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 201 -#define _APS_NEXT_COMMAND_VALUE 32785 -#define _APS_NEXT_CONTROL_VALUE 1000 -#define _APS_NEXT_SYMED_VALUE 101 +#define _APS_NEXT_RESOURCE_VALUE 201 +#define _APS_NEXT_COMMAND_VALUE 32793 +#define _APS_NEXT_CONTROL_VALUE 1000 +#define _APS_NEXT_SYMED_VALUE 101 #endif #endif diff --git a/templates/lua-template-default/src/main.lua b/templates/lua-template-default/src/main.lua index 9a638e175c..32bad3df7e 100644 --- a/templates/lua-template-default/src/main.lua +++ b/templates/lua-template-default/src/main.lua @@ -13,13 +13,13 @@ function __G__TRACKBACK__(msg) end local function main() - + collectgarbage("collect") -- avoid memory leak collectgarbage("setpause", 100) collectgarbage("setstepmul", 5000) cc.FileUtils:getInstance():addSearchResolutionsOrder("src"); cc.FileUtils:getInstance():addSearchResolutionsOrder("res"); - + local schedulerID = 0 --support debug local targetPlatform = cc.Application:getInstance():getTargetPlatform() if (cc.PLATFORM_OS_IPHONE == targetPlatform) or (cc.PLATFORM_OS_IPAD == targetPlatform) or @@ -76,7 +76,7 @@ local function main() spriteDog:setPositionX(x) end - cc.Director:getInstance():getScheduler():scheduleScriptFunc(tick, 0, false) + schedulerID = cc.Director:getInstance():getScheduler():scheduleScriptFunc(tick, 0, false) return spriteDog end @@ -148,6 +148,13 @@ local function main() listener:registerScriptHandler(onTouchEnded,cc.Handler.EVENT_TOUCH_ENDED ) local eventDispatcher = layerFarm:getEventDispatcher() eventDispatcher:addEventListenerWithSceneGraphPriority(listener, layerFarm) + + local function onNodeEvent(event) + if "exit" == event then + cc.Director:getInstance():getScheduler():unscheduleScriptEntry(schedulerID) + end + end + layerFarm:registerScriptHandler(onNodeEvent) return layerFarm end diff --git a/templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp b/templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp new file mode 100644 index 0000000000..704d5e65c0 --- /dev/null +++ b/templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp @@ -0,0 +1,66 @@ +#include "AppDelegate.h" +#include "CCLuaEngine.h" +#include "SimpleAudioEngine.h" +#include "cocos2d.h" +#include "Runtime.h" + +using namespace CocosDenshion; + +USING_NS_CC; +using namespace std; + +AppDelegate::AppDelegate() +{ +} + +AppDelegate::~AppDelegate() +{ + SimpleAudioEngine::end(); +} + +bool AppDelegate::applicationDidFinishLaunching() +{ + // initialize director + auto director = Director::getInstance(); + auto glview = director->getOpenGLView(); + if(!glview) { + glview = GLView::createWithRect("HelloLua", Rect(0,0,900,640)); + director->setOpenGLView(glview); + } + + glview->setDesignResolutionSize(480, 320, ResolutionPolicy::NO_BORDER); + + // turn on display FPS + director->setDisplayStats(true); + + // set FPS. the default value is 1.0/60 if you don't call this + director->setAnimationInterval(1.0 / 60); + + + +#ifdef COCOS2D_DEBUG + startRuntime(); +#else + auto engine = LuaEngine::getInstance(); + ScriptEngineManager::getInstance()->setScriptEngine(engine); + engine->executeScriptFile("src/main.lua"); +#endif + + return true; +} + +// This function will be called when the app is inactive. When comes a phone call,it's be invoked too +void AppDelegate::applicationDidEnterBackground() +{ + Director::getInstance()->stopAnimation(); + + SimpleAudioEngine::getInstance()->pauseBackgroundMusic(); +} + +// this function will be called when the app is active again +void AppDelegate::applicationWillEnterForeground() +{ + Director::getInstance()->startAnimation(); + + SimpleAudioEngine::getInstance()->resumeBackgroundMusic(); +} diff --git a/samples/lua-tests/project/Classes/AppDelegate.h b/templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.h similarity index 100% rename from samples/lua-tests/project/Classes/AppDelegate.h rename to templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.h diff --git a/templates/lua-template-default/frameworks/runtime-src/Classes/Runtime.cpp b/templates/lua-template-runtime/frameworks/runtime-src/Classes/Runtime.cpp similarity index 94% rename from templates/lua-template-default/frameworks/runtime-src/Classes/Runtime.cpp rename to templates/lua-template-runtime/frameworks/runtime-src/Classes/Runtime.cpp index 0078298226..de4c76df02 100644 --- a/templates/lua-template-default/frameworks/runtime-src/Classes/Runtime.cpp +++ b/templates/lua-template-runtime/frameworks/runtime-src/Classes/Runtime.cpp @@ -40,8 +40,10 @@ using namespace std; using namespace cocos2d; extern string getIPAddress(); -extern string getProjSearchPath(); - +string getRuntimeVersion() +{ + return "0.0.1"; +} void startScript(string strDebugArg) { // register lua engine @@ -54,9 +56,14 @@ void startScript(string strDebugArg) engine->executeScriptFile("src/main.lua"); } -void reloadScript() +void reloadScript(const string& modulefile) { - LuaEngine::getInstance()->reload("src/main.lua"); + string strfile = modulefile; + if (strfile.empty()) + { + strfile = "src/main.lua"; + } + LuaEngine::getInstance()->reload(strfile.c_str()); } @@ -462,9 +469,20 @@ void FileServer::loop() // clean up: ignore stdin, stdout and stderr for(const auto &fd: _fds ) + { +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) + closesocket(fd); +#else close(fd); - close(_listenfd); +#endif + } +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) + closesocket(_listenfd); + WSACleanup(); +#else + close(_listenfd); +#endif _running = false; } @@ -480,14 +498,15 @@ public: {"shutdownapp","exit runtime app",std::bind(&ConsoleCustomCommand::onShutDownApp, this, std::placeholders::_1, std::placeholders::_2)}, {"start-logic","run game logic script.Arg:[debugArg]",std::bind(&ConsoleCustomCommand::onRunLogicScript, this, std::placeholders::_1, std::placeholders::_2)}, {"reload","reload script.Args:[filepath]",std::bind(&ConsoleCustomCommand::onReloadScriptFile, this, std::placeholders::_1, std::placeholders::_2)}, + {"getversion","get runtime version.",std::bind(&ConsoleCustomCommand::onRuntimeVersion, this, std::placeholders::_1, std::placeholders::_2)}, }; for (int i=0;i< sizeof(commands)/sizeof(Console::Command);i++) { _console->addCommand(commands[i]); } - _console->listenOnTCP(5678); + _console->listenOnTCP(6001); _fileserver=new FileServer(); - _fileserver->listenOnTCP(6666); + _fileserver->listenOnTCP(6002); } ~ConsoleCustomCommand() { @@ -509,11 +528,17 @@ public: void onReloadScriptFile(int fd,const std::string &args) { - Director::getInstance()->getScheduler()->performFunctionInCocosThread([](){ - reloadScript(); + Director::getInstance()->getScheduler()->performFunctionInCocosThread([=](){ + reloadScript(args.c_str()); }); } + void onRuntimeVersion(int fd, const std::string &args) + { + string runtimeVer=getRuntimeVersion(); + send(fd, runtimeVer.c_str(), runtimeVer.size(),0); + } + void onShutDownApp(int fd, const std::string &args) { Director::getInstance()->getScheduler()->performFunctionInCocosThread([](){ diff --git a/templates/lua-template-default/frameworks/runtime-src/Classes/Runtime.h b/templates/lua-template-runtime/frameworks/runtime-src/Classes/Runtime.h similarity index 97% rename from templates/lua-template-default/frameworks/runtime-src/Classes/Runtime.h rename to templates/lua-template-runtime/frameworks/runtime-src/Classes/Runtime.h index 0f5c1cedff..7315cc01b1 100644 --- a/templates/lua-template-default/frameworks/runtime-src/Classes/Runtime.h +++ b/templates/lua-template-runtime/frameworks/runtime-src/Classes/Runtime.h @@ -32,7 +32,7 @@ using namespace std; void startRuntime(); -void reloadScript(); +void reloadScript(const string& modulefile); // SimulatorConfig typedef struct _SimulatorScreenSize { diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/.classpath b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/.classpath new file mode 100644 index 0000000000..d57ec02513 --- /dev/null +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/.classpath @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/.project b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/.project new file mode 100644 index 0000000000..046823a87b --- /dev/null +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/.project @@ -0,0 +1,33 @@ + + + HelloLua + + + + + + com.android.ide.eclipse.adt.ResourceManagerBuilder + + + + + com.android.ide.eclipse.adt.PreCompilerBuilder + + + + + org.eclipse.jdt.core.javabuilder + + + + + com.android.ide.eclipse.adt.ApkBuilder + + + + + + com.android.ide.eclipse.adt.AndroidNature + org.eclipse.jdt.core.javanature + + diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/.settings/org.eclipse.jdt.core.prefs b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000000..b080d2ddc8 --- /dev/null +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/AndroidManifest.xml b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/AndroidManifest.xml new file mode 100644 index 0000000000..706278b3a6 --- /dev/null +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/AndroidManifest.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/cpp-tests/proj.android/ant.properties b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/ant.properties similarity index 100% rename from samples/cpp-tests/proj.android/ant.properties rename to templates/lua-template-runtime/frameworks/runtime-src/proj.android/ant.properties diff --git a/samples/cpp-tests/proj.android/build.xml b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/build.xml similarity index 98% rename from samples/cpp-tests/proj.android/build.xml rename to templates/lua-template-runtime/frameworks/runtime-src/proj.android/build.xml index 0ab7005e21..331651a814 100644 --- a/samples/cpp-tests/proj.android/build.xml +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/build.xml @@ -1,5 +1,5 @@ - + delete + //EGL_GREEN_SIZE, 6, -->delete + //EGL_RED_SIZE, 5, -->delete + EGL_BUFFER_SIZE, 32, //-->new field + EGL_DEPTH_SIZE, 16, + EGL_STENCIL_SIZE, 8, + EGL_NONE + };*/ + + //2.Set the format of window + // getWindow().setFormat(PixelFormat.TRANSLUCENT); + if(!isWifiConnected()) + { + Toast.makeText(this, "wifi is closed!", Toast.LENGTH_SHORT).show(); + startActivity(new Intent(Settings.ACTION_WIFI_SETTINGS)); + } + } + + private boolean isWifiConnected() { + ConnectivityManager cm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE); + if (cm != null) { + NetworkInfo networkInfo = cm.getActiveNetworkInfo(); + if (networkInfo != null && networkInfo.getType() == ConnectivityManager.TYPE_WIFI) { + return true; + } + } + return false; + } + + public static String getLocalIpAddress() { + try { + for (Enumeration en = NetworkInterface + .getNetworkInterfaces(); en.hasMoreElements();) { + NetworkInterface intf = en.nextElement(); + for (Enumeration enumIpAddr = intf + .getInetAddresses(); enumIpAddr.hasMoreElements();) { + InetAddress inetAddress = enumIpAddr.nextElement(); + if (!inetAddress.isLoopbackAddress() && !inetAddress.isLinkLocalAddress()) { + return inetAddress.getHostAddress().toString(); + } + } + } + } catch (SocketException ex) { + Log.e("WifiPreference IpAddress", ex.toString()); + } + return null; + } + + public static String getSDCardPath() { + if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) { + String strSDCardPathString = Environment.getExternalStorageDirectory().getPath(); + return strSDCardPathString; + } + return null; + } + +} diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj new file mode 100644 index 0000000000..325c617515 --- /dev/null +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj @@ -0,0 +1,1125 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + 15A8A4441834C43700142BE0 /* libchipmunk iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4291834BDA200142BE0 /* libchipmunk iOS.a */; }; + 15A8A4451834C43700142BE0 /* libcocos2dx iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4251834BDA200142BE0 /* libcocos2dx iOS.a */; }; + 15A8A4461834C43700142BE0 /* libcocos2dx-extensions iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4271834BDA200142BE0 /* libcocos2dx-extensions iOS.a */; }; + 15A8A4471834C43700142BE0 /* libCocosDenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A42D1834BDA200142BE0 /* libCocosDenshion iOS.a */; }; + 15A8A4491834C64F00142BE0 /* Icon-114.png in Resources */ = {isa = PBXBuildFile; fileRef = 5023810C17EBBCAC00990C9B /* Icon-114.png */; }; + 15A8A4821834C73500142BE0 /* libchipmunk Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A41B1834BDA200142BE0 /* libchipmunk Mac.a */; }; + 15A8A4831834C73500142BE0 /* libcocos2dx Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4171834BDA200142BE0 /* libcocos2dx Mac.a */; }; + 15A8A4841834C73500142BE0 /* libcocos2dx-extensions Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4191834BDA200142BE0 /* libcocos2dx-extensions Mac.a */; }; + 15A8A4851834C73500142BE0 /* libCocosDenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A41F1834BDA200142BE0 /* libCocosDenshion Mac.a */; }; + 15A8A4881834C90F00142BE0 /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4871834C90E00142BE0 /* libcurl.dylib */; }; + 1AF4C403178663F200122817 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C402178663F200122817 /* libz.dylib */; }; + 5023811817EBBCAC00990C9B /* AppController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5023810817EBBCAC00990C9B /* AppController.mm */; }; + 5023811917EBBCAC00990C9B /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5023810917EBBCAC00990C9B /* Default-568h@2x.png */; }; + 5023811A17EBBCAC00990C9B /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 5023810A17EBBCAC00990C9B /* Default.png */; }; + 5023811B17EBBCAC00990C9B /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5023810B17EBBCAC00990C9B /* Default@2x.png */; }; + 5023811D17EBBCAC00990C9B /* Icon-120.png in Resources */ = {isa = PBXBuildFile; fileRef = 5023810D17EBBCAC00990C9B /* Icon-120.png */; }; + 5023811E17EBBCAC00990C9B /* Icon-144.png in Resources */ = {isa = PBXBuildFile; fileRef = 5023810E17EBBCAC00990C9B /* Icon-144.png */; }; + 5023811F17EBBCAC00990C9B /* Icon-152.png in Resources */ = {isa = PBXBuildFile; fileRef = 5023810F17EBBCAC00990C9B /* Icon-152.png */; }; + 5023812017EBBCAC00990C9B /* Icon-57.png in Resources */ = {isa = PBXBuildFile; fileRef = 5023811017EBBCAC00990C9B /* Icon-57.png */; }; + 5023812117EBBCAC00990C9B /* Icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = 5023811117EBBCAC00990C9B /* Icon-72.png */; }; + 5023812217EBBCAC00990C9B /* Icon-76.png in Resources */ = {isa = PBXBuildFile; fileRef = 5023811217EBBCAC00990C9B /* Icon-76.png */; }; + 5023812417EBBCAC00990C9B /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 5023811417EBBCAC00990C9B /* main.m */; }; + 5023812517EBBCAC00990C9B /* RootViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5023811717EBBCAC00990C9B /* RootViewController.mm */; }; + 5023813317EBBCE400990C9B /* AppDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F293BB7E15EB831F00256477 /* AppDelegate.cpp */; }; + 5023813717EBBCE400990C9B /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C402178663F200122817 /* libz.dylib */; }; + 5023813E17EBBCE400990C9B /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3CC15EB7BE500256477 /* QuartzCore.framework */; }; + 5023814017EBBCE400990C9B /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3D015EB7BE500256477 /* OpenAL.framework */; }; + 5023814117EBBCE400990C9B /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3D215EB7BE500256477 /* AudioToolbox.framework */; }; + 5023814217EBBCE400990C9B /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3D415EB7BE500256477 /* AVFoundation.framework */; }; + 5023814417EBBCE400990C9B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3D815EB7BE500256477 /* Foundation.framework */; }; + 5023814517EBBCE400990C9B /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3DA15EB7BE500256477 /* CoreGraphics.framework */; }; + 5023817617EBBE3400990C9B /* Icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 5023817217EBBE3400990C9B /* Icon.icns */; }; + 5023817A17EBBE8300990C9B /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5023817917EBBE8300990C9B /* OpenGLES.framework */; }; + 50805AAF17EBBEAA004CFAD3 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50805AAE17EBBEAA004CFAD3 /* UIKit.framework */; }; + 5091733617ECE17A00D62437 /* Icon-29.png in Resources */ = {isa = PBXBuildFile; fileRef = 5091733017ECE17A00D62437 /* Icon-29.png */; }; + 5091733717ECE17A00D62437 /* Icon-40.png in Resources */ = {isa = PBXBuildFile; fileRef = 5091733117ECE17A00D62437 /* Icon-40.png */; }; + 5091733817ECE17A00D62437 /* Icon-50.png in Resources */ = {isa = PBXBuildFile; fileRef = 5091733217ECE17A00D62437 /* Icon-50.png */; }; + 5091733917ECE17A00D62437 /* Icon-58.png in Resources */ = {isa = PBXBuildFile; fileRef = 5091733317ECE17A00D62437 /* Icon-58.png */; }; + 5091733A17ECE17A00D62437 /* Icon-80.png in Resources */ = {isa = PBXBuildFile; fileRef = 5091733417ECE17A00D62437 /* Icon-80.png */; }; + 5091733B17ECE17A00D62437 /* Icon-100.png in Resources */ = {isa = PBXBuildFile; fileRef = 5091733517ECE17A00D62437 /* Icon-100.png */; }; + 50D7C96C17EBBEDF005D0B91 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50D7C96B17EBBEDF005D0B91 /* OpenGL.framework */; }; + 50D7C96E17EBBEE6005D0B91 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50D7C96D17EBBEE6005D0B91 /* AppKit.framework */; }; + 50D7C97017EBBEEC005D0B91 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50D7C96F17EBBEEC005D0B91 /* IOKit.framework */; }; + C03781B918BF655400FE4F13 /* res in Resources */ = {isa = PBXBuildFile; fileRef = C03781B718BF655400FE4F13 /* res */; }; + C03781BA18BF655400FE4F13 /* res in Resources */ = {isa = PBXBuildFile; fileRef = C03781B718BF655400FE4F13 /* res */; }; + C03781BB18BF655400FE4F13 /* src in Resources */ = {isa = PBXBuildFile; fileRef = C03781B818BF655400FE4F13 /* src */; }; + C03781BC18BF655400FE4F13 /* src in Resources */ = {isa = PBXBuildFile; fileRef = C03781B818BF655400FE4F13 /* src */; }; + C03781CF18BF656A00FE4F13 /* AudioEngine.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781BD18BF656900FE4F13 /* AudioEngine.lua */; }; + C03781D018BF656A00FE4F13 /* AudioEngine.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781BD18BF656900FE4F13 /* AudioEngine.lua */; }; + C03781D118BF656A00FE4F13 /* CCBReaderLoad.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781BE18BF656900FE4F13 /* CCBReaderLoad.lua */; }; + C03781D218BF656A00FE4F13 /* CCBReaderLoad.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781BE18BF656900FE4F13 /* CCBReaderLoad.lua */; }; + C03781D318BF656A00FE4F13 /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781BF18BF656900FE4F13 /* Cocos2d.lua */; }; + C03781D418BF656A00FE4F13 /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781BF18BF656900FE4F13 /* Cocos2d.lua */; }; + C03781D518BF656A00FE4F13 /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C018BF656900FE4F13 /* Cocos2dConstants.lua */; }; + C03781D618BF656A00FE4F13 /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C018BF656900FE4F13 /* Cocos2dConstants.lua */; }; + C03781D718BF656A00FE4F13 /* CocoStudio.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C118BF656900FE4F13 /* CocoStudio.lua */; }; + C03781D818BF656A00FE4F13 /* CocoStudio.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C118BF656900FE4F13 /* CocoStudio.lua */; }; + C03781D918BF656A00FE4F13 /* Deprecated.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C218BF656900FE4F13 /* Deprecated.lua */; }; + C03781DA18BF656A00FE4F13 /* Deprecated.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C218BF656900FE4F13 /* Deprecated.lua */; }; + C03781DB18BF656A00FE4F13 /* DeprecatedClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C318BF656900FE4F13 /* DeprecatedClass.lua */; }; + C03781DC18BF656A00FE4F13 /* DeprecatedClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C318BF656900FE4F13 /* DeprecatedClass.lua */; }; + C03781DD18BF656A00FE4F13 /* DeprecatedEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C418BF656A00FE4F13 /* DeprecatedEnum.lua */; }; + C03781DE18BF656A00FE4F13 /* DeprecatedEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C418BF656A00FE4F13 /* DeprecatedEnum.lua */; }; + C03781DF18BF656A00FE4F13 /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C518BF656A00FE4F13 /* DeprecatedOpenglEnum.lua */; }; + C03781E018BF656A00FE4F13 /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C518BF656A00FE4F13 /* DeprecatedOpenglEnum.lua */; }; + C03781E118BF656A00FE4F13 /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C618BF656A00FE4F13 /* DrawPrimitives.lua */; }; + C03781E218BF656A00FE4F13 /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C618BF656A00FE4F13 /* DrawPrimitives.lua */; }; + C03781E318BF656A00FE4F13 /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C718BF656A00FE4F13 /* extern.lua */; }; + C03781E418BF656A00FE4F13 /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C718BF656A00FE4F13 /* extern.lua */; }; + C03781E518BF656A00FE4F13 /* GuiConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C818BF656A00FE4F13 /* GuiConstants.lua */; }; + C03781E618BF656A00FE4F13 /* GuiConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C818BF656A00FE4F13 /* GuiConstants.lua */; }; + C03781E718BF656A00FE4F13 /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C918BF656A00FE4F13 /* json.lua */; }; + C03781E818BF656A00FE4F13 /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C918BF656A00FE4F13 /* json.lua */; }; + C03781E918BF656A00FE4F13 /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CA18BF656A00FE4F13 /* luaj.lua */; }; + C03781EA18BF656A00FE4F13 /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CA18BF656A00FE4F13 /* luaj.lua */; }; + C03781EB18BF656A00FE4F13 /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CB18BF656A00FE4F13 /* luaoc.lua */; }; + C03781EC18BF656A00FE4F13 /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CB18BF656A00FE4F13 /* luaoc.lua */; }; + C03781ED18BF656A00FE4F13 /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CC18BF656A00FE4F13 /* Opengl.lua */; }; + C03781EE18BF656A00FE4F13 /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CC18BF656A00FE4F13 /* Opengl.lua */; }; + C03781EF18BF656A00FE4F13 /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CD18BF656A00FE4F13 /* OpenglConstants.lua */; }; + C03781F018BF656A00FE4F13 /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CD18BF656A00FE4F13 /* OpenglConstants.lua */; }; + C03781F118BF656A00FE4F13 /* StudioConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CE18BF656A00FE4F13 /* StudioConstants.lua */; }; + C03781F218BF656A00FE4F13 /* StudioConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CE18BF656A00FE4F13 /* StudioConstants.lua */; }; + C03781F518BF65A900FE4F13 /* libluabindings Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C03781B418BF654500FE4F13 /* libluabindings Mac.a */; }; + C03781F618BF65B100FE4F13 /* libluabindings iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C03781B618BF654500FE4F13 /* libluabindings iOS.a */; }; + C0619CD71896894800872C26 /* Runtime_ios-mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = C0619CD61896894800872C26 /* Runtime_ios-mac.mm */; }; + C0619CD81896894800872C26 /* Runtime_ios-mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = C0619CD61896894800872C26 /* Runtime_ios-mac.mm */; }; + C07828F818B4D72E00BD2287 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = C07828F418B4D72E00BD2287 /* main.m */; }; + C07828F918B4D72E00BD2287 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = C07828F518B4D72E00BD2287 /* MainMenu.xib */; }; + C07828FA18B4D72E00BD2287 /* SimulatorApp.mm in Sources */ = {isa = PBXBuildFile; fileRef = C07828F718B4D72E00BD2287 /* SimulatorApp.mm */; }; + C07828FD18B4DC6F00BD2287 /* Runtime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C07828FB18B4DC6F00BD2287 /* Runtime.cpp */; }; + C07828FE18B4DC7000BD2287 /* Runtime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C07828FB18B4DC6F00BD2287 /* Runtime.cpp */; }; + C09BA7E718BC929700A85A3E /* WorkSpaceDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = C09BA7E418BC929700A85A3E /* WorkSpaceDialog.xib */; }; + C09BA7E818BC929700A85A3E /* WorkSpaceDialogController.mm in Sources */ = {isa = PBXBuildFile; fileRef = C09BA7E618BC929700A85A3E /* WorkSpaceDialogController.mm */; }; + C09BA7EE18BCA49600A85A3E /* NSAppSheetAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = C09BA7ED18BCA49600A85A3E /* NSAppSheetAdditions.m */; }; + D6B061351803AC000077942B /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D6B061341803AC000077942B /* CoreMotion.framework */; }; + F293B3CD15EB7BE500256477 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3CC15EB7BE500256477 /* QuartzCore.framework */; }; + F293B3D115EB7BE500256477 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3D015EB7BE500256477 /* OpenAL.framework */; }; + F293B3D315EB7BE500256477 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3D215EB7BE500256477 /* AudioToolbox.framework */; }; + F293B3D515EB7BE500256477 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3D415EB7BE500256477 /* AVFoundation.framework */; }; + F293B3D915EB7BE500256477 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3D815EB7BE500256477 /* Foundation.framework */; }; + F293B3DB15EB7BE500256477 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3DA15EB7BE500256477 /* CoreGraphics.framework */; }; + F293BB9C15EB831F00256477 /* AppDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F293BB7E15EB831F00256477 /* AppDelegate.cpp */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 15A8A4161834BDA200142BE0 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1551A33F158F2AB200E66CFE; + remoteInfo = "cocos2dx Mac"; + }; + 15A8A4181834BDA200142BE0 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A03F2FD617814595006731B9; + remoteInfo = "cocos2dx-extensions Mac"; + }; + 15A8A41A1834BDA200142BE0 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A03F2CB81780BD04006731B9; + remoteInfo = "chipmunk Mac"; + }; + 15A8A41C1834BDA200142BE0 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A03F2D9B1780BDF7006731B9; + remoteInfo = "box2d Mac"; + }; + 15A8A41E1834BDA200142BE0 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A03F2ED617814268006731B9; + remoteInfo = "CocosDenshion Mac"; + }; + 15A8A4241834BDA200142BE0 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A07A4D641783777C0073F6A7; + remoteInfo = "cocos2dx iOS"; + }; + 15A8A4261834BDA200142BE0 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A07A4EFC1783867C0073F6A7; + remoteInfo = "cocos2dx-extensions iOS"; + }; + 15A8A4281834BDA200142BE0 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A07A4F3B178387670073F6A7; + remoteInfo = "chipmunk iOS"; + }; + 15A8A42A1834BDA200142BE0 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A07A4F9E1783876B0073F6A7; + remoteInfo = "box2d iOS"; + }; + 15A8A42C1834BDA200142BE0 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A07A4FB4178387730073F6A7; + remoteInfo = "CocosDenshion iOS"; + }; + C03781B318BF654500FE4F13 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1AACE74618BC45A000215002; + remoteInfo = "luabindings Mac"; + }; + C03781B518BF654500FE4F13 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1AACE74718BC45A000215002; + remoteInfo = "luabindings iOS"; + }; + C03781F318BF659D00FE4F13 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 1A6FB50417854BC200CDF010; + remoteInfo = "luabindings Mac"; + }; + C03781F718BF65B500FE4F13 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 1A119716178526AA00D62A44; + remoteInfo = "luabindings iOS"; + }; + C0A2F02618975FD30072A7AB /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = A03F2B781780BD04006731B9; + remoteInfo = "chipmunk Mac"; + }; + C0A2F03818975FDA0072A7AB /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = A03F2D5D1780BDF7006731B9; + remoteInfo = "box2d Mac"; + }; + C0A2F03A18975FE20072A7AB /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = A03F2FC117814595006731B9; + remoteInfo = "cocos2dx-extensions Mac"; + }; + C0A2F03C18975FEB0072A7AB /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = A03F2E9817814268006731B9; + remoteInfo = "CocosDenshion Mac"; + }; + C0A2F04018975FF80072A7AB /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 1551A33E158F2AB200E66CFE; + remoteInfo = "cocos2dx Mac"; + }; + C0A2F0421897600E0072A7AB /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = A07A4C241783777C0073F6A7; + remoteInfo = "cocos2dx iOS"; + }; + C0A2F0441897600E0072A7AB /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = A07A4E111783867C0073F6A7; + remoteInfo = "cocos2dx-extensions iOS"; + }; + C0A2F0461897600E0072A7AB /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = A07A4EFD178387670073F6A7; + remoteInfo = "chipmunk iOS"; + }; + C0A2F0481897600E0072A7AB /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = A07A4F3C1783876B0073F6A7; + remoteInfo = "box2d iOS"; + }; + C0A2F04A1897600E0072A7AB /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = A07A4F9F178387730073F6A7; + remoteInfo = "CocosDenshion iOS"; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXFileReference section */ + 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2d_libs.xcodeproj; path = "../../cocos2d-x/build/cocos2d_libs.xcodeproj"; sourceTree = ""; }; + 15A8A4871834C90E00142BE0 /* libcurl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcurl.dylib; path = usr/lib/libcurl.dylib; sourceTree = SDKROOT; }; + 15C1568D1683131500D239F2 /* libcurl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcurl.a; path = "../../cocos2d-x/cocos2dx/platform/third_party/ios/libraries/libcurl.a"; sourceTree = ""; }; + 1AF4C402178663F200122817 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; + 5023810717EBBCAC00990C9B /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppController.h; sourceTree = ""; }; + 5023810817EBBCAC00990C9B /* AppController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AppController.mm; sourceTree = ""; }; + 5023810917EBBCAC00990C9B /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; + 5023810A17EBBCAC00990C9B /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = ""; }; + 5023810B17EBBCAC00990C9B /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = ""; }; + 5023810C17EBBCAC00990C9B /* Icon-114.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-114.png"; sourceTree = ""; }; + 5023810D17EBBCAC00990C9B /* Icon-120.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-120.png"; sourceTree = ""; }; + 5023810E17EBBCAC00990C9B /* Icon-144.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-144.png"; sourceTree = ""; }; + 5023810F17EBBCAC00990C9B /* Icon-152.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-152.png"; sourceTree = ""; }; + 5023811017EBBCAC00990C9B /* Icon-57.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-57.png"; sourceTree = ""; }; + 5023811117EBBCAC00990C9B /* Icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-72.png"; sourceTree = ""; }; + 5023811217EBBCAC00990C9B /* Icon-76.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-76.png"; sourceTree = ""; }; + 5023811317EBBCAC00990C9B /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 5023811417EBBCAC00990C9B /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + 5023811517EBBCAC00990C9B /* Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Prefix.pch; sourceTree = ""; }; + 5023811617EBBCAC00990C9B /* RootViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RootViewController.h; sourceTree = ""; }; + 5023811717EBBCAC00990C9B /* RootViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RootViewController.mm; sourceTree = ""; }; + 5023816B17EBBCE400990C9B /* HelloLua Mac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "HelloLua Mac.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 5023817217EBBE3400990C9B /* Icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Icon.icns; sourceTree = ""; }; + 5023817317EBBE3400990C9B /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 5023817517EBBE3400990C9B /* Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Prefix.pch; sourceTree = ""; }; + 5023817917EBBE8300990C9B /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/System/Library/Frameworks/OpenGLES.framework; sourceTree = DEVELOPER_DIR; }; + 50805AAE17EBBEAA004CFAD3 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; }; + 5091733017ECE17A00D62437 /* Icon-29.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-29.png"; sourceTree = ""; }; + 5091733117ECE17A00D62437 /* Icon-40.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-40.png"; sourceTree = ""; }; + 5091733217ECE17A00D62437 /* Icon-50.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-50.png"; sourceTree = ""; }; + 5091733317ECE17A00D62437 /* Icon-58.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-58.png"; sourceTree = ""; }; + 5091733417ECE17A00D62437 /* Icon-80.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-80.png"; sourceTree = ""; }; + 5091733517ECE17A00D62437 /* Icon-100.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-100.png"; sourceTree = ""; }; + 50D7C96B17EBBEDF005D0B91 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; }; + 50D7C96D17EBBEE6005D0B91 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; }; + 50D7C96F17EBBEEC005D0B91 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; + C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2d_lua_bindings.xcodeproj; path = "../../cocos2d-x/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj"; sourceTree = ""; }; + C03781B718BF655400FE4F13 /* res */ = {isa = PBXFileReference; lastKnownFileType = folder; name = res; path = ../../../res; sourceTree = ""; }; + C03781B818BF655400FE4F13 /* src */ = {isa = PBXFileReference; lastKnownFileType = folder; name = src; path = ../../../src; sourceTree = ""; }; + C03781BD18BF656900FE4F13 /* AudioEngine.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = AudioEngine.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/AudioEngine.lua"; sourceTree = ""; }; + C03781BE18BF656900FE4F13 /* CCBReaderLoad.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CCBReaderLoad.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/CCBReaderLoad.lua"; sourceTree = ""; }; + C03781BF18BF656900FE4F13 /* Cocos2d.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2d.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/Cocos2d.lua"; sourceTree = ""; }; + C03781C018BF656900FE4F13 /* Cocos2dConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2dConstants.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/Cocos2dConstants.lua"; sourceTree = ""; }; + C03781C118BF656900FE4F13 /* CocoStudio.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CocoStudio.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/CocoStudio.lua"; sourceTree = ""; }; + C03781C218BF656900FE4F13 /* Deprecated.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Deprecated.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/Deprecated.lua"; sourceTree = ""; }; + C03781C318BF656900FE4F13 /* DeprecatedClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedClass.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/DeprecatedClass.lua"; sourceTree = ""; }; + C03781C418BF656A00FE4F13 /* DeprecatedEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedEnum.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/DeprecatedEnum.lua"; sourceTree = ""; }; + C03781C518BF656A00FE4F13 /* DeprecatedOpenglEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedOpenglEnum.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/DeprecatedOpenglEnum.lua"; sourceTree = ""; }; + C03781C618BF656A00FE4F13 /* DrawPrimitives.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DrawPrimitives.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/DrawPrimitives.lua"; sourceTree = ""; }; + C03781C718BF656A00FE4F13 /* extern.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = extern.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/extern.lua"; sourceTree = ""; }; + C03781C818BF656A00FE4F13 /* GuiConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = GuiConstants.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/GuiConstants.lua"; sourceTree = ""; }; + C03781C918BF656A00FE4F13 /* json.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = json.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/json.lua"; sourceTree = ""; }; + C03781CA18BF656A00FE4F13 /* luaj.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = luaj.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/luaj.lua"; sourceTree = ""; }; + C03781CB18BF656A00FE4F13 /* luaoc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = luaoc.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/luaoc.lua"; sourceTree = ""; }; + C03781CC18BF656A00FE4F13 /* Opengl.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Opengl.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/Opengl.lua"; sourceTree = ""; }; + C03781CD18BF656A00FE4F13 /* OpenglConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = OpenglConstants.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/OpenglConstants.lua"; sourceTree = ""; }; + C03781CE18BF656A00FE4F13 /* StudioConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = StudioConstants.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/StudioConstants.lua"; sourceTree = ""; }; + C0619CD61896894800872C26 /* Runtime_ios-mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "Runtime_ios-mac.mm"; sourceTree = ""; }; + C07828F418B4D72E00BD2287 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + C07828F518B4D72E00BD2287 /* MainMenu.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MainMenu.xib; sourceTree = ""; }; + C07828F618B4D72E00BD2287 /* SimulatorApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SimulatorApp.h; sourceTree = ""; }; + C07828F718B4D72E00BD2287 /* SimulatorApp.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SimulatorApp.mm; sourceTree = ""; }; + C07828FB18B4DC6F00BD2287 /* Runtime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Runtime.cpp; path = ../Classes/Runtime.cpp; sourceTree = ""; }; + C07828FC18B4DC6F00BD2287 /* Runtime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Runtime.h; path = ../Classes/Runtime.h; sourceTree = ""; }; + C09BA7E418BC929700A85A3E /* WorkSpaceDialog.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = WorkSpaceDialog.xib; sourceTree = ""; }; + C09BA7E518BC929700A85A3E /* WorkSpaceDialogController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkSpaceDialogController.h; sourceTree = ""; }; + C09BA7E618BC929700A85A3E /* WorkSpaceDialogController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WorkSpaceDialogController.mm; sourceTree = ""; }; + C09BA7EC18BCA49600A85A3E /* NSAppSheetAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSAppSheetAdditions.h; sourceTree = ""; }; + C09BA7ED18BCA49600A85A3E /* NSAppSheetAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSAppSheetAdditions.m; sourceTree = ""; }; + D6B061341803AC000077942B /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/System/Library/Frameworks/CoreMotion.framework; sourceTree = DEVELOPER_DIR; }; + F293B3C815EB7BE500256477 /* HelloLua iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "HelloLua iOS.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; }; + F293B3D015EB7BE500256477 /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; }; + F293B3D215EB7BE500256477 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; + F293B3D415EB7BE500256477 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; + F293B3D615EB7BE500256477 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; + F293B3D815EB7BE500256477 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; + F293B3DA15EB7BE500256477 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; + F293BB7E15EB831F00256477 /* AppDelegate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AppDelegate.cpp; path = ../Classes/AppDelegate.cpp; sourceTree = ""; }; + F293BB7F15EB831F00256477 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = ../Classes/AppDelegate.h; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 5023813617EBBCE400990C9B /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + C03781F518BF65A900FE4F13 /* libluabindings Mac.a in Frameworks */, + 15A8A4881834C90F00142BE0 /* libcurl.dylib in Frameworks */, + 15A8A4821834C73500142BE0 /* libchipmunk Mac.a in Frameworks */, + 15A8A4831834C73500142BE0 /* libcocos2dx Mac.a in Frameworks */, + 15A8A4841834C73500142BE0 /* libcocos2dx-extensions Mac.a in Frameworks */, + 15A8A4851834C73500142BE0 /* libCocosDenshion Mac.a in Frameworks */, + 50D7C97017EBBEEC005D0B91 /* IOKit.framework in Frameworks */, + 50D7C96E17EBBEE6005D0B91 /* AppKit.framework in Frameworks */, + 50D7C96C17EBBEDF005D0B91 /* OpenGL.framework in Frameworks */, + 5023813717EBBCE400990C9B /* libz.dylib in Frameworks */, + 5023813E17EBBCE400990C9B /* QuartzCore.framework in Frameworks */, + 5023814017EBBCE400990C9B /* OpenAL.framework in Frameworks */, + 5023814117EBBCE400990C9B /* AudioToolbox.framework in Frameworks */, + 5023814217EBBCE400990C9B /* AVFoundation.framework in Frameworks */, + 5023814417EBBCE400990C9B /* Foundation.framework in Frameworks */, + 5023814517EBBCE400990C9B /* CoreGraphics.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + F293B3C515EB7BE500256477 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + C03781F618BF65B100FE4F13 /* libluabindings iOS.a in Frameworks */, + 15A8A4441834C43700142BE0 /* libchipmunk iOS.a in Frameworks */, + 15A8A4451834C43700142BE0 /* libcocos2dx iOS.a in Frameworks */, + 15A8A4461834C43700142BE0 /* libcocos2dx-extensions iOS.a in Frameworks */, + 15A8A4471834C43700142BE0 /* libCocosDenshion iOS.a in Frameworks */, + D6B061351803AC000077942B /* CoreMotion.framework in Frameworks */, + 1AF4C403178663F200122817 /* libz.dylib in Frameworks */, + 50805AAF17EBBEAA004CFAD3 /* UIKit.framework in Frameworks */, + 5023817A17EBBE8300990C9B /* OpenGLES.framework in Frameworks */, + F293B3CD15EB7BE500256477 /* QuartzCore.framework in Frameworks */, + F293B3D115EB7BE500256477 /* OpenAL.framework in Frameworks */, + F293B3D315EB7BE500256477 /* AudioToolbox.framework in Frameworks */, + F293B3D515EB7BE500256477 /* AVFoundation.framework in Frameworks */, + F293B3D915EB7BE500256477 /* Foundation.framework in Frameworks */, + F293B3DB15EB7BE500256477 /* CoreGraphics.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 15A8A4041834BDA200142BE0 /* Products */ = { + isa = PBXGroup; + children = ( + 15A8A4171834BDA200142BE0 /* libcocos2dx Mac.a */, + 15A8A4191834BDA200142BE0 /* libcocos2dx-extensions Mac.a */, + 15A8A41B1834BDA200142BE0 /* libchipmunk Mac.a */, + 15A8A41D1834BDA200142BE0 /* libbox2d Mac.a */, + 15A8A41F1834BDA200142BE0 /* libCocosDenshion Mac.a */, + 15A8A4251834BDA200142BE0 /* libcocos2dx iOS.a */, + 15A8A4271834BDA200142BE0 /* libcocos2dx-extensions iOS.a */, + 15A8A4291834BDA200142BE0 /* libchipmunk iOS.a */, + 15A8A42B1834BDA200142BE0 /* libbox2d iOS.a */, + 15A8A42D1834BDA200142BE0 /* libCocosDenshion iOS.a */, + ); + name = Products; + sourceTree = ""; + }; + 1A0227A417A3AA1A00B867AD /* Lua Common */ = { + isa = PBXGroup; + children = ( + C03781BD18BF656900FE4F13 /* AudioEngine.lua */, + C03781BE18BF656900FE4F13 /* CCBReaderLoad.lua */, + C03781BF18BF656900FE4F13 /* Cocos2d.lua */, + C03781C018BF656900FE4F13 /* Cocos2dConstants.lua */, + C03781C118BF656900FE4F13 /* CocoStudio.lua */, + C03781C218BF656900FE4F13 /* Deprecated.lua */, + C03781C318BF656900FE4F13 /* DeprecatedClass.lua */, + C03781C418BF656A00FE4F13 /* DeprecatedEnum.lua */, + C03781C518BF656A00FE4F13 /* DeprecatedOpenglEnum.lua */, + C03781C618BF656A00FE4F13 /* DrawPrimitives.lua */, + C03781C718BF656A00FE4F13 /* extern.lua */, + C03781C818BF656A00FE4F13 /* GuiConstants.lua */, + C03781C918BF656A00FE4F13 /* json.lua */, + C03781CA18BF656A00FE4F13 /* luaj.lua */, + C03781CB18BF656A00FE4F13 /* luaoc.lua */, + C03781CC18BF656A00FE4F13 /* Opengl.lua */, + C03781CD18BF656A00FE4F13 /* OpenglConstants.lua */, + C03781CE18BF656A00FE4F13 /* StudioConstants.lua */, + ); + name = "Lua Common"; + sourceTree = ""; + }; + 5023810617EBBCAC00990C9B /* ios */ = { + isa = PBXGroup; + children = ( + 5023810717EBBCAC00990C9B /* AppController.h */, + 5023810817EBBCAC00990C9B /* AppController.mm */, + 5023810917EBBCAC00990C9B /* Default-568h@2x.png */, + 5023810A17EBBCAC00990C9B /* Default.png */, + 5023810B17EBBCAC00990C9B /* Default@2x.png */, + 5091734A17ECE18300D62437 /* Icons */, + 5023811317EBBCAC00990C9B /* Info.plist */, + 5023811417EBBCAC00990C9B /* main.m */, + 5023811517EBBCAC00990C9B /* Prefix.pch */, + 5023811617EBBCAC00990C9B /* RootViewController.h */, + 5023811717EBBCAC00990C9B /* RootViewController.mm */, + ); + path = ios; + sourceTree = ""; + }; + 5023817117EBBE3400990C9B /* mac */ = { + isa = PBXGroup; + children = ( + C09BA7EC18BCA49600A85A3E /* NSAppSheetAdditions.h */, + C09BA7ED18BCA49600A85A3E /* NSAppSheetAdditions.m */, + C09BA7E418BC929700A85A3E /* WorkSpaceDialog.xib */, + C09BA7E518BC929700A85A3E /* WorkSpaceDialogController.h */, + C09BA7E618BC929700A85A3E /* WorkSpaceDialogController.mm */, + 5023817217EBBE3400990C9B /* Icon.icns */, + C07828F418B4D72E00BD2287 /* main.m */, + C07828F518B4D72E00BD2287 /* MainMenu.xib */, + C07828F618B4D72E00BD2287 /* SimulatorApp.h */, + C07828F718B4D72E00BD2287 /* SimulatorApp.mm */, + 5023817317EBBE3400990C9B /* Info.plist */, + 5023817517EBBE3400990C9B /* Prefix.pch */, + ); + path = mac; + sourceTree = ""; + }; + 5091734A17ECE18300D62437 /* Icons */ = { + isa = PBXGroup; + children = ( + 5091733017ECE17A00D62437 /* Icon-29.png */, + 5091733117ECE17A00D62437 /* Icon-40.png */, + 5091733217ECE17A00D62437 /* Icon-50.png */, + 5091733317ECE17A00D62437 /* Icon-58.png */, + 5091733417ECE17A00D62437 /* Icon-80.png */, + 5091733517ECE17A00D62437 /* Icon-100.png */, + 5023810C17EBBCAC00990C9B /* Icon-114.png */, + 5023810D17EBBCAC00990C9B /* Icon-120.png */, + 5023810E17EBBCAC00990C9B /* Icon-144.png */, + 5023810F17EBBCAC00990C9B /* Icon-152.png */, + 5023811017EBBCAC00990C9B /* Icon-57.png */, + 5023811117EBBCAC00990C9B /* Icon-72.png */, + 5023811217EBBCAC00990C9B /* Icon-76.png */, + ); + name = Icons; + sourceTree = ""; + }; + C03781AF18BF654500FE4F13 /* Products */ = { + isa = PBXGroup; + children = ( + C03781B418BF654500FE4F13 /* libluabindings Mac.a */, + C03781B618BF654500FE4F13 /* libluabindings iOS.a */, + ); + name = Products; + sourceTree = ""; + }; + F293B3BD15EB7BE500256477 = { + isa = PBXGroup; + children = ( + C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */, + 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */, + 5023810617EBBCAC00990C9B /* ios */, + 5023817117EBBE3400990C9B /* mac */, + F293BB7C15EB830F00256477 /* Classes */, + F293B3CB15EB7BE500256477 /* Frameworks */, + 1A0227A417A3AA1A00B867AD /* Lua Common */, + F293B3C915EB7BE500256477 /* Products */, + F293BC4615EB859D00256477 /* Resources */, + ); + sourceTree = ""; + }; + F293B3C915EB7BE500256477 /* Products */ = { + isa = PBXGroup; + children = ( + F293B3C815EB7BE500256477 /* HelloLua iOS.app */, + 5023816B17EBBCE400990C9B /* HelloLua Mac.app */, + ); + name = Products; + sourceTree = ""; + }; + F293B3CB15EB7BE500256477 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 15A8A4871834C90E00142BE0 /* libcurl.dylib */, + D6B061341803AC000077942B /* CoreMotion.framework */, + 50D7C96F17EBBEEC005D0B91 /* IOKit.framework */, + 50D7C96D17EBBEE6005D0B91 /* AppKit.framework */, + 50D7C96B17EBBEDF005D0B91 /* OpenGL.framework */, + 50805AAE17EBBEAA004CFAD3 /* UIKit.framework */, + 5023817917EBBE8300990C9B /* OpenGLES.framework */, + 1AF4C402178663F200122817 /* libz.dylib */, + 15C1568D1683131500D239F2 /* libcurl.a */, + F293B3CC15EB7BE500256477 /* QuartzCore.framework */, + F293B3CE15EB7BE500256477 /* OpenGLES.framework */, + F293B3D015EB7BE500256477 /* OpenAL.framework */, + F293B3D215EB7BE500256477 /* AudioToolbox.framework */, + F293B3D415EB7BE500256477 /* AVFoundation.framework */, + F293B3D615EB7BE500256477 /* UIKit.framework */, + F293B3D815EB7BE500256477 /* Foundation.framework */, + F293B3DA15EB7BE500256477 /* CoreGraphics.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; + F293BB7C15EB830F00256477 /* Classes */ = { + isa = PBXGroup; + children = ( + C07828FB18B4DC6F00BD2287 /* Runtime.cpp */, + C07828FC18B4DC6F00BD2287 /* Runtime.h */, + C0619CD61896894800872C26 /* Runtime_ios-mac.mm */, + F293BB7E15EB831F00256477 /* AppDelegate.cpp */, + F293BB7F15EB831F00256477 /* AppDelegate.h */, + ); + name = Classes; + sourceTree = ""; + }; + F293BC4615EB859D00256477 /* Resources */ = { + isa = PBXGroup; + children = ( + C03781B718BF655400FE4F13 /* res */, + C03781B818BF655400FE4F13 /* src */, + ); + name = Resources; + path = ../Resources; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 5023812617EBBCE400990C9B /* HelloLua Mac */ = { + isa = PBXNativeTarget; + buildConfigurationList = 5023816817EBBCE400990C9B /* Build configuration list for PBXNativeTarget "HelloLua Mac" */; + buildPhases = ( + 5023813117EBBCE400990C9B /* Sources */, + 5023813617EBBCE400990C9B /* Frameworks */, + 5023814617EBBCE400990C9B /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + C03781F418BF659D00FE4F13 /* PBXTargetDependency */, + C0A2F04118975FF80072A7AB /* PBXTargetDependency */, + C0A2F03D18975FEB0072A7AB /* PBXTargetDependency */, + C0A2F03B18975FE20072A7AB /* PBXTargetDependency */, + C0A2F03918975FDA0072A7AB /* PBXTargetDependency */, + C0A2F02718975FD30072A7AB /* PBXTargetDependency */, + ); + name = "HelloLua Mac"; + productName = HelloLua; + productReference = 5023816B17EBBCE400990C9B /* HelloLua Mac.app */; + productType = "com.apple.product-type.application"; + }; + F293B3C715EB7BE500256477 /* HelloLua iOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = F293B6C415EB7BEA00256477 /* Build configuration list for PBXNativeTarget "HelloLua iOS" */; + buildPhases = ( + F293B3C415EB7BE500256477 /* Sources */, + F293B3C515EB7BE500256477 /* Frameworks */, + F293B3C615EB7BE500256477 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + C03781F818BF65B500FE4F13 /* PBXTargetDependency */, + C0A2F0431897600E0072A7AB /* PBXTargetDependency */, + C0A2F0451897600E0072A7AB /* PBXTargetDependency */, + C0A2F0471897600E0072A7AB /* PBXTargetDependency */, + C0A2F0491897600E0072A7AB /* PBXTargetDependency */, + C0A2F04B1897600E0072A7AB /* PBXTargetDependency */, + ); + name = "HelloLua iOS"; + productName = HelloLua; + productReference = F293B3C815EB7BE500256477 /* HelloLua iOS.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + F293B3BF15EB7BE500256477 /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0500; + TargetAttributes = { + F293B3C715EB7BE500256477 = { + DevelopmentTeam = MDDB52YB8L; + }; + }; + }; + buildConfigurationList = F293B3C215EB7BE500256477 /* Build configuration list for PBXProject "HelloLua" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + en, + ); + mainGroup = F293B3BD15EB7BE500256477; + productRefGroup = F293B3C915EB7BE500256477 /* Products */; + projectDirPath = ""; + projectReferences = ( + { + ProductGroup = 15A8A4041834BDA200142BE0 /* Products */; + ProjectRef = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + }, + { + ProductGroup = C03781AF18BF654500FE4F13 /* Products */; + ProjectRef = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + }, + ); + projectRoot = ""; + targets = ( + F293B3C715EB7BE500256477 /* HelloLua iOS */, + 5023812617EBBCE400990C9B /* HelloLua Mac */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXReferenceProxy section */ + 15A8A4171834BDA200142BE0 /* libcocos2dx Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocos2dx Mac.a"; + remoteRef = 15A8A4161834BDA200142BE0 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15A8A4191834BDA200142BE0 /* libcocos2dx-extensions Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocos2dx-extensions Mac.a"; + remoteRef = 15A8A4181834BDA200142BE0 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15A8A41B1834BDA200142BE0 /* libchipmunk Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libchipmunk Mac.a"; + remoteRef = 15A8A41A1834BDA200142BE0 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15A8A41D1834BDA200142BE0 /* libbox2d Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libbox2d Mac.a"; + remoteRef = 15A8A41C1834BDA200142BE0 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15A8A41F1834BDA200142BE0 /* libCocosDenshion Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libCocosDenshion Mac.a"; + remoteRef = 15A8A41E1834BDA200142BE0 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15A8A4251834BDA200142BE0 /* libcocos2dx iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocos2dx iOS.a"; + remoteRef = 15A8A4241834BDA200142BE0 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15A8A4271834BDA200142BE0 /* libcocos2dx-extensions iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocos2dx-extensions iOS.a"; + remoteRef = 15A8A4261834BDA200142BE0 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15A8A4291834BDA200142BE0 /* libchipmunk iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libchipmunk iOS.a"; + remoteRef = 15A8A4281834BDA200142BE0 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15A8A42B1834BDA200142BE0 /* libbox2d iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libbox2d iOS.a"; + remoteRef = 15A8A42A1834BDA200142BE0 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15A8A42D1834BDA200142BE0 /* libCocosDenshion iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libCocosDenshion iOS.a"; + remoteRef = 15A8A42C1834BDA200142BE0 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + C03781B418BF654500FE4F13 /* libluabindings Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluabindings Mac.a"; + remoteRef = C03781B318BF654500FE4F13 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + C03781B618BF654500FE4F13 /* libluabindings iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluabindings iOS.a"; + remoteRef = C03781B518BF654500FE4F13 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; +/* End PBXReferenceProxy section */ + +/* Begin PBXResourcesBuildPhase section */ + 5023814617EBBCE400990C9B /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + C03781EE18BF656A00FE4F13 /* Opengl.lua in Resources */, + C03781F018BF656A00FE4F13 /* OpenglConstants.lua in Resources */, + C03781E418BF656A00FE4F13 /* extern.lua in Resources */, + C03781E618BF656A00FE4F13 /* GuiConstants.lua in Resources */, + C03781D418BF656A00FE4F13 /* Cocos2d.lua in Resources */, + C03781BA18BF655400FE4F13 /* res in Resources */, + C09BA7E718BC929700A85A3E /* WorkSpaceDialog.xib in Resources */, + C03781BC18BF655400FE4F13 /* src in Resources */, + C03781E218BF656A00FE4F13 /* DrawPrimitives.lua in Resources */, + C03781DA18BF656A00FE4F13 /* Deprecated.lua in Resources */, + C03781E018BF656A00FE4F13 /* DeprecatedOpenglEnum.lua in Resources */, + C03781EC18BF656A00FE4F13 /* luaoc.lua in Resources */, + C07828F918B4D72E00BD2287 /* MainMenu.xib in Resources */, + 5023817617EBBE3400990C9B /* Icon.icns in Resources */, + C03781D218BF656A00FE4F13 /* CCBReaderLoad.lua in Resources */, + C03781D018BF656A00FE4F13 /* AudioEngine.lua in Resources */, + C03781D818BF656A00FE4F13 /* CocoStudio.lua in Resources */, + C03781DC18BF656A00FE4F13 /* DeprecatedClass.lua in Resources */, + C03781F218BF656A00FE4F13 /* StudioConstants.lua in Resources */, + C03781EA18BF656A00FE4F13 /* luaj.lua in Resources */, + C03781DE18BF656A00FE4F13 /* DeprecatedEnum.lua in Resources */, + C03781E818BF656A00FE4F13 /* json.lua in Resources */, + C03781D618BF656A00FE4F13 /* Cocos2dConstants.lua in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + F293B3C615EB7BE500256477 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 15A8A4491834C64F00142BE0 /* Icon-114.png in Resources */, + C03781DB18BF656A00FE4F13 /* DeprecatedClass.lua in Resources */, + 5023811D17EBBCAC00990C9B /* Icon-120.png in Resources */, + 5091733B17ECE17A00D62437 /* Icon-100.png in Resources */, + C03781E918BF656A00FE4F13 /* luaj.lua in Resources */, + 5023811B17EBBCAC00990C9B /* Default@2x.png in Resources */, + 5091733617ECE17A00D62437 /* Icon-29.png in Resources */, + C03781E718BF656A00FE4F13 /* json.lua in Resources */, + 5023811917EBBCAC00990C9B /* Default-568h@2x.png in Resources */, + C03781D318BF656A00FE4F13 /* Cocos2d.lua in Resources */, + 5091733917ECE17A00D62437 /* Icon-58.png in Resources */, + C03781ED18BF656A00FE4F13 /* Opengl.lua in Resources */, + C03781F118BF656A00FE4F13 /* StudioConstants.lua in Resources */, + 5023811F17EBBCAC00990C9B /* Icon-152.png in Resources */, + C03781D118BF656A00FE4F13 /* CCBReaderLoad.lua in Resources */, + 5023812017EBBCAC00990C9B /* Icon-57.png in Resources */, + C03781CF18BF656A00FE4F13 /* AudioEngine.lua in Resources */, + C03781B918BF655400FE4F13 /* res in Resources */, + C03781EF18BF656A00FE4F13 /* OpenglConstants.lua in Resources */, + C03781E518BF656A00FE4F13 /* GuiConstants.lua in Resources */, + 5023812217EBBCAC00990C9B /* Icon-76.png in Resources */, + C03781DF18BF656A00FE4F13 /* DeprecatedOpenglEnum.lua in Resources */, + 5091733A17ECE17A00D62437 /* Icon-80.png in Resources */, + 5091733717ECE17A00D62437 /* Icon-40.png in Resources */, + 5023811E17EBBCAC00990C9B /* Icon-144.png in Resources */, + 5023811A17EBBCAC00990C9B /* Default.png in Resources */, + C03781E118BF656A00FE4F13 /* DrawPrimitives.lua in Resources */, + C03781BB18BF655400FE4F13 /* src in Resources */, + C03781EB18BF656A00FE4F13 /* luaoc.lua in Resources */, + 5091733817ECE17A00D62437 /* Icon-50.png in Resources */, + C03781D718BF656A00FE4F13 /* CocoStudio.lua in Resources */, + C03781D518BF656A00FE4F13 /* Cocos2dConstants.lua in Resources */, + 5023812117EBBCAC00990C9B /* Icon-72.png in Resources */, + C03781DD18BF656A00FE4F13 /* DeprecatedEnum.lua in Resources */, + C03781E318BF656A00FE4F13 /* extern.lua in Resources */, + C03781D918BF656A00FE4F13 /* Deprecated.lua in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 5023813117EBBCE400990C9B /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + C07828FA18B4D72E00BD2287 /* SimulatorApp.mm in Sources */, + 5023813317EBBCE400990C9B /* AppDelegate.cpp in Sources */, + C09BA7EE18BCA49600A85A3E /* NSAppSheetAdditions.m in Sources */, + C07828FE18B4DC7000BD2287 /* Runtime.cpp in Sources */, + C09BA7E818BC929700A85A3E /* WorkSpaceDialogController.mm in Sources */, + C07828F818B4D72E00BD2287 /* main.m in Sources */, + C0619CD81896894800872C26 /* Runtime_ios-mac.mm in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + F293B3C415EB7BE500256477 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 5023812517EBBCAC00990C9B /* RootViewController.mm in Sources */, + F293BB9C15EB831F00256477 /* AppDelegate.cpp in Sources */, + 5023812417EBBCAC00990C9B /* main.m in Sources */, + C0619CD71896894800872C26 /* Runtime_ios-mac.mm in Sources */, + C07828FD18B4DC6F00BD2287 /* Runtime.cpp in Sources */, + 5023811817EBBCAC00990C9B /* AppController.mm in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + C03781F418BF659D00FE4F13 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "luabindings Mac"; + targetProxy = C03781F318BF659D00FE4F13 /* PBXContainerItemProxy */; + }; + C03781F818BF65B500FE4F13 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "luabindings iOS"; + targetProxy = C03781F718BF65B500FE4F13 /* PBXContainerItemProxy */; + }; + C0A2F02718975FD30072A7AB /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "chipmunk Mac"; + targetProxy = C0A2F02618975FD30072A7AB /* PBXContainerItemProxy */; + }; + C0A2F03918975FDA0072A7AB /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "box2d Mac"; + targetProxy = C0A2F03818975FDA0072A7AB /* PBXContainerItemProxy */; + }; + C0A2F03B18975FE20072A7AB /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocos2dx-extensions Mac"; + targetProxy = C0A2F03A18975FE20072A7AB /* PBXContainerItemProxy */; + }; + C0A2F03D18975FEB0072A7AB /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "CocosDenshion Mac"; + targetProxy = C0A2F03C18975FEB0072A7AB /* PBXContainerItemProxy */; + }; + C0A2F04118975FF80072A7AB /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocos2dx Mac"; + targetProxy = C0A2F04018975FF80072A7AB /* PBXContainerItemProxy */; + }; + C0A2F0431897600E0072A7AB /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocos2dx iOS"; + targetProxy = C0A2F0421897600E0072A7AB /* PBXContainerItemProxy */; + }; + C0A2F0451897600E0072A7AB /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocos2dx-extensions iOS"; + targetProxy = C0A2F0441897600E0072A7AB /* PBXContainerItemProxy */; + }; + C0A2F0471897600E0072A7AB /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "chipmunk iOS"; + targetProxy = C0A2F0461897600E0072A7AB /* PBXContainerItemProxy */; + }; + C0A2F0491897600E0072A7AB /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "box2d iOS"; + targetProxy = C0A2F0481897600E0072A7AB /* PBXContainerItemProxy */; + }; + C0A2F04B1897600E0072A7AB /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "CocosDenshion iOS"; + targetProxy = C0A2F04A1897600E0072A7AB /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin XCBuildConfiguration section */ + 5023816917EBBCE400990C9B /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + COMBINE_HIDPI_IMAGES = YES; + GCC_DYNAMIC_NO_PIC = NO; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = mac/Prefix.pch; + GCC_PREPROCESSOR_DEFINITIONS = ( + GLFW_EXPOSE_NATIVE_COCOA, + GLFW_EXPOSE_NATIVE_NSGL, + CC_TARGET_OS_MAC, + "$(inherited)", + ); + HEADER_SEARCH_PATHS = ""; + INFOPLIST_FILE = mac/Info.plist; + LIBRARY_SEARCH_PATHS = ""; + OTHER_LDFLAGS = ( + "-image_base", + 100000000, + "-pagezero_size", + 10000, + ); + SDKROOT = macosx; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/cocos/2d/platform/mac $(SRCROOT)/../../cocos2d-x/external/glfw3/include/mac"; + }; + name = Debug; + }; + 5023816A17EBBCE400990C9B /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + COMBINE_HIDPI_IMAGES = YES; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = mac/Prefix.pch; + GCC_PREPROCESSOR_DEFINITIONS = ( + CC_TARGET_OS_MAC, + "$(inherited)", + ); + HEADER_SEARCH_PATHS = ""; + INFOPLIST_FILE = mac/Info.plist; + LIBRARY_SEARCH_PATHS = ""; + OTHER_LDFLAGS = ( + "-image_base", + 100000000, + "-pagezero_size", + 10000, + ); + SDKROOT = macosx; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/cocos/2d/platform/mac $(SRCROOT)/../../cocos2d-x/external/glfw3/include/mac"; + }; + name = Release; + }; + F293B6C215EB7BEA00256477 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + CLANG_CXX_LIBRARY = "libc++"; + COPY_PHASE_STRIP = NO; + GCC_C_LANGUAGE_STANDARD = c99; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + DEBUG, + "COCOS2D_DEBUG=1", + USE_FILE32API, + "CC_LUA_ENGINE_ENABLED=1", + "CC_ENABLE_CHIPMUNK_INTEGRATION=1", + GLFW_EXPOSE_NATIVE_COCOA, + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = ""; + ONLY_ACTIVE_ARCH = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; + USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../cocos2d-x $(SRCROOT)/../../cocos2d-x/cocos $(SRCROOT)/../../cocos2d-x/cocos/base $(SRCROOT)/../../cocos2d-x/cocos/physics $(SRCROOT)/../../cocos2d-x/cocos/math/kazmath $(SRCROOT)/../../cocos2d-x/cocos/2d $(SRCROOT)/../../cocos2d-x/cocos/gui $(SRCROOT)/../../cocos2d-x/cocos/network $(SRCROOT)/../../cocos2d-x/cocos/audio/include $(SRCROOT)/../../cocos2d-x/cocos/editor-support $(SRCROOT)/../../cocos2d-x/extensions $(SRCROOT)/../../cocos2d-x/external $(SRCROOT)/../../cocos2d-x/external/chipmunk/include/chipmunk $(SRCROOT)/../../cocos2d-x/external/lua/luajit/include $(SRCROOT)/../../cocos2d-x/external/lua/tolua $(SRCROOT)/../../cocos2d-x/cocos/scripting/lua-bindings/manual $(SRCROOT)/../../cocos2d-x/cocos/scripting/lua-bindings/auto"; + }; + name = Debug; + }; + F293B6C315EB7BEA00256477 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + CLANG_CXX_LIBRARY = "libc++"; + GCC_C_LANGUAGE_STANDARD = c99; + GCC_PREPROCESSOR_DEFINITIONS = ( + NDEBUG, + USE_FILE32API, + "CC_LUA_ENGINE_ENABLED=1", + "CC_ENABLE_CHIPMUNK_INTEGRATION=1", + ); + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = ""; + OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; + PRODUCT_NAME = "$(TARGET_NAME)"; + USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../cocos2d-x $(SRCROOT)/../../cocos2d-x/cocos $(SRCROOT)/../../cocos2d-x/cocos/base $(SRCROOT)/../../cocos2d-x/cocos/physics $(SRCROOT)/../../cocos2d-x/cocos/math/kazmath $(SRCROOT)/../../cocos2d-x/cocos/2d $(SRCROOT)/../../cocos2d-x/cocos/gui $(SRCROOT)/../../cocos2d-x/cocos/network $(SRCROOT)/../../cocos2d-x/cocos/audio/include $(SRCROOT)/../../cocos2d-x/cocos/editor-support $(SRCROOT)/../../cocos2d-x/extensions $(SRCROOT)/../../cocos2d-x/external $(SRCROOT)/../../cocos2d-x/external/chipmunk/include/chipmunk $(SRCROOT)/../../cocos2d-x/external/lua/luajit/include $(SRCROOT)/../../cocos2d-x/external/lua/tolua $(SRCROOT)/../../cocos2d-x/cocos/scripting/lua-bindings/manual $(SRCROOT)/../../cocos2d-x/cocos/scripting/lua-bindings/auto"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + F293B6C515EB7BEA00256477 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + CODE_SIGN_IDENTITY = "iPhone Developer"; + COMPRESS_PNG_FILES = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = ios/Prefix.pch; + GCC_PREPROCESSOR_DEFINITIONS = ( + CC_TARGET_OS_IPHONE, + "$(inherited)", + ); + HEADER_SEARCH_PATHS = ""; + INFOPLIST_FILE = ios/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 5.0; + LIBRARY_SEARCH_PATHS = ""; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/cocos/2d/platform/ios"; + }; + name = Debug; + }; + F293B6C615EB7BEA00256477 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + CODE_SIGN_IDENTITY = "iPhone Developer"; + COMPRESS_PNG_FILES = NO; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = ios/Prefix.pch; + GCC_PREPROCESSOR_DEFINITIONS = ( + CC_TARGET_OS_IPHONE, + "$(inherited)", + ); + HEADER_SEARCH_PATHS = ""; + INFOPLIST_FILE = ios/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 5.0; + LIBRARY_SEARCH_PATHS = ""; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../cocos2d-x/cocos/2d/platform/ios"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 5023816817EBBCE400990C9B /* Build configuration list for PBXNativeTarget "HelloLua Mac" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 5023816917EBBCE400990C9B /* Debug */, + 5023816A17EBBCE400990C9B /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + F293B3C215EB7BE500256477 /* Build configuration list for PBXProject "HelloLua" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + F293B6C215EB7BEA00256477 /* Debug */, + F293B6C315EB7BEA00256477 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + F293B6C415EB7BEA00256477 /* Build configuration list for PBXNativeTarget "HelloLua iOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + F293B6C515EB7BEA00256477 /* Debug */, + F293B6C615EB7BEA00256477 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = F293B3BF15EB7BE500256477 /* Project object */; +} diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/Runtime_ios-mac.mm b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/Runtime_ios-mac.mm similarity index 76% rename from templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/Runtime_ios-mac.mm rename to templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/Runtime_ios-mac.mm index 82aa46654f..f89ad9bc02 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/Runtime_ios-mac.mm +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/Runtime_ios-mac.mm @@ -7,21 +7,6 @@ #include using namespace std; -string getProjSearchPath() -{ - NSString *bundlePath = [[NSBundle mainBundle] resourcePath]; - if (bundlePath != nil) { - return [bundlePath UTF8String]; - } - return ""; -} - -vector getSearchPath() -{ - vector searchPathArray; - return searchPathArray; -} - string getIPAddress() { BOOL success; diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/AppController.h b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/AppController.h new file mode 100644 index 0000000000..2e8186124e --- /dev/null +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/AppController.h @@ -0,0 +1,35 @@ +/**************************************************************************** + Copyright (c) 2010-2013 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +@class RootViewController; + +@interface AppController : NSObject +{ + UIWindow *window; + RootViewController *viewController; +} + +@end + diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm new file mode 100644 index 0000000000..6e1d42e9c0 --- /dev/null +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm @@ -0,0 +1,144 @@ +/**************************************************************************** + Copyright (c) 2010-2013 cocos2d-x.org + Copyright (c) 2013-2014 Chukong Technologies Inc. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +#import +#import "cocos2d.h" + +#import "AppController.h" +#import "AppDelegate.h" +#import "RootViewController.h" +#import "CCEAGLView.h" + +@implementation AppController + +#pragma mark - +#pragma mark Application lifecycle + +// cocos2d application instance +static AppDelegate s_sharedApplication; + +- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions +{ + + // Override point for customization after application launch. + + // Add the view controller's view to the window and display. + window = [[UIWindow alloc] initWithFrame: [[UIScreen mainScreen] bounds]]; + CCEAGLView *eaglView = [CCEAGLView viewWithFrame: [window bounds] + pixelFormat: kEAGLColorFormatRGBA8 + depthFormat: GL_DEPTH24_STENCIL8_OES + preserveBackbuffer: NO + sharegroup: nil + multiSampling: NO + numberOfSamples: 0 ]; + + [eaglView setMultipleTouchEnabled:YES]; + + // Use RootViewController manage CCEAGLView + viewController = [[RootViewController alloc] initWithNibName:nil bundle:nil]; + viewController.wantsFullScreenLayout = YES; + viewController.view = eaglView; + + // Set RootViewController to window + if ( [[UIDevice currentDevice].systemVersion floatValue] < 6.0) + { + // warning: addSubView doesn't work on iOS6 + [window addSubview: viewController.view]; + } + else + { + // use this method on ios6 + [window setRootViewController:viewController]; + } + + [window makeKeyAndVisible]; + + [[UIApplication sharedApplication] setStatusBarHidden: YES]; + + // IMPORTANT: Setting the GLView should be done after creating the RootViewController + cocos2d::GLView *glview = cocos2d::GLView::createWithEAGLView(eaglView); + cocos2d::Director::getInstance()->setOpenGLView(glview); + + cocos2d::Application::getInstance()->run(); + return YES; +} + + +- (void)applicationWillResignActive:(UIApplication *)application { + /* + Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state. + Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game. + */ + cocos2d::Director::getInstance()->pause(); +} + +- (void)applicationDidBecomeActive:(UIApplication *)application { + /* + Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. + */ + cocos2d::Director::getInstance()->resume(); +} + +- (void)applicationDidEnterBackground:(UIApplication *)application { + /* + Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. + If your application supports background execution, called instead of applicationWillTerminate: when the user quits. + */ + cocos2d::Application::getInstance()->applicationDidEnterBackground(); +} + +- (void)applicationWillEnterForeground:(UIApplication *)application { + /* + Called as part of transition from the background to the inactive state: here you can undo many of the changes made on entering the background. + */ + cocos2d::Application::getInstance()->applicationWillEnterForeground(); +} + +- (void)applicationWillTerminate:(UIApplication *)application { + /* + Called when the application is about to terminate. + See also applicationDidEnterBackground:. + */ +} + + +#pragma mark - +#pragma mark Memory management + +- (void)applicationDidReceiveMemoryWarning:(UIApplication *)application { + /* + Free up as much memory as possible by purging cached data objects that can be recreated (or reloaded from disk) later. + */ + cocos2d::Director::getInstance()->purgeCachedData(); +} + + +- (void)dealloc { + [super dealloc]; +} + + +@end + diff --git a/samples/cpp-tests/proj.ios/Default-568h@2x.png.REMOVED.git-id b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/Default-568h@2x.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/proj.ios/Default-568h@2x.png.REMOVED.git-id rename to templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/Default-568h@2x.png.REMOVED.git-id diff --git a/samples/cpp-tests/proj.ios/Default@2x.png.REMOVED.git-id b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/Default@2x.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/proj.ios/Default@2x.png.REMOVED.git-id rename to templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/Default@2x.png.REMOVED.git-id diff --git a/samples/lua-tests/project/proj.ios_mac/ios/TestLua_Prefix.pch b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/Prefix.pch similarity index 50% rename from samples/lua-tests/project/proj.ios_mac/ios/TestLua_Prefix.pch rename to templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/Prefix.pch index 4c4fc38a96..b4311a0a3d 100644 --- a/samples/lua-tests/project/proj.ios_mac/ios/TestLua_Prefix.pch +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/Prefix.pch @@ -1,5 +1,5 @@ // -// Prefix header for all source files of the 'TestLua' target in the 'TestLua' project +// Prefix header for all source files of the 'HelloLua' target in the 'HelloLua' project // #ifdef __OBJC__ diff --git a/samples/lua-tests/project/proj.ios_mac/ios/RootViewController.h b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/RootViewController.h similarity index 100% rename from samples/lua-tests/project/proj.ios_mac/ios/RootViewController.h rename to templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/RootViewController.h diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/RootViewController.mm b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/RootViewController.mm new file mode 100644 index 0000000000..dfbe298774 --- /dev/null +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/RootViewController.mm @@ -0,0 +1,105 @@ +/**************************************************************************** + Copyright (c) 2010-2011 cocos2d-x.org + Copyright (c) 2010 Ricardo Quesada + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +#import "RootViewController.h" +#import "cocos2d.h" +#import "CCEAGLView.h" + +@implementation RootViewController + +/* + // The designated initializer. Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad. +- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { + if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) { + // Custom initialization + } + return self; +} +*/ + +/* +// Implement loadView to create a view hierarchy programmatically, without using a nib. +- (void)loadView { +} +*/ + +/* +// Implement viewDidLoad to do additional setup after loading the view, typically from a nib. +- (void)viewDidLoad { + [super viewDidLoad]; +} + +*/ +// Override to allow orientations other than the default portrait orientation. +// This method is deprecated on ios6 +- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { + return UIInterfaceOrientationIsLandscape( interfaceOrientation ); +} + +// For ios6, use supportedInterfaceOrientations & shouldAutorotate instead +- (NSUInteger) supportedInterfaceOrientations{ +#ifdef __IPHONE_6_0 + return UIInterfaceOrientationMaskAllButUpsideDown; +#endif +} + +- (BOOL) shouldAutorotate { + return YES; +} + +- (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation { + [super didRotateFromInterfaceOrientation:fromInterfaceOrientation]; + + CGSize s = CGSizeMake([[CCEAGLView sharedEGLView] getWidth], [[CCEAGLView sharedEGLView] getHeight]); + + cocos2d::Application::getInstance()->applicationScreenSizeChanged((int) s.width, (int) s.height); +} + +//fix not hide status on ios7 +- (BOOL)prefersStatusBarHidden +{ + return YES; +} + +- (void)didReceiveMemoryWarning { + // Releases the view if it doesn't have a superview. + [super didReceiveMemoryWarning]; + + // Release any cached data, images, etc that aren't in use. +} + +- (void)viewDidUnload { + [super viewDidUnload]; + // Release any retained subviews of the main view. + // e.g. self.myOutlet = nil; +} + + +- (void)dealloc { + [super dealloc]; +} + + +@end diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/main.m b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/main.m new file mode 100644 index 0000000000..c7052953c8 --- /dev/null +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/ios/main.m @@ -0,0 +1,16 @@ +// +// main.m +// HelloLua +// +// Copyright __MyCompanyName__ 2011. All rights reserved. +// + +#import + +int main(int argc, char *argv[]) { + + NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init]; + int retVal = UIApplicationMain(argc, argv, nil, @"AppController"); + [pool release]; + return retVal; +} diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/Icon.icns.REMOVED.git-id b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/Icon.icns.REMOVED.git-id new file mode 100644 index 0000000000..0c90afdb6d --- /dev/null +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/Icon.icns.REMOVED.git-id @@ -0,0 +1 @@ +2040fc6fe624353ae1d3db50cd3d450f4fda5afc \ No newline at end of file diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/mac/MainMenu.xib b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/MainMenu.xib similarity index 100% rename from templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/mac/MainMenu.xib rename to templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/MainMenu.xib diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/mac/NSAppSheetAdditions.h b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/NSAppSheetAdditions.h similarity index 100% rename from templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/mac/NSAppSheetAdditions.h rename to templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/NSAppSheetAdditions.h diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/mac/NSAppSheetAdditions.m b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/NSAppSheetAdditions.m similarity index 100% rename from templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/mac/NSAppSheetAdditions.m rename to templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/NSAppSheetAdditions.m diff --git a/samples/cpp-tests/proj.mac/Test_Prefix.pch b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/Prefix.pch similarity index 100% rename from samples/cpp-tests/proj.mac/Test_Prefix.pch rename to templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/Prefix.pch diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.h b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.h similarity index 100% rename from templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.h rename to templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.h diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.mm b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.mm similarity index 92% rename from templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.mm rename to templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.mm index d6873cab68..f79e3924d2 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.mm +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.mm @@ -65,7 +65,7 @@ using namespace cocos2d; { AppDelegate app; - [self createSimulator:[NSString stringWithUTF8String:"HelloJavascript"] viewWidth:960 viewHeight:640 factor:1.0]; + [self createSimulator:[NSString stringWithUTF8String:"HelloLua"] viewWidth:960 viewHeight:640 factor:1.0]; int ret = Application::getInstance()->run(); } @@ -138,7 +138,7 @@ using namespace cocos2d; [itemLandscape setState:NSOffState]; } - int scale = 100; + int scale = g_eglView->getFrameZoomFactor()*100; NSMenuItem *itemZoom100 = [menuScreen itemWithTitle:@"Actual (100%)"]; NSMenuItem *itemZoom75 = [menuScreen itemWithTitle:@"Zoom Out (75%)"]; @@ -194,14 +194,20 @@ using namespace cocos2d; - (void) updateView { + auto policy = g_eglView->getResolutionPolicy(); + auto designSize = g_eglView->getDesignResolutionSize(); + if (g_landscape) { - glfwSetWindowSize(g_eglView->getWindow(),g_screenSize.width,g_screenSize.height); + g_eglView->setFrameSize(g_screenSize.width, g_screenSize.height); } else { - glfwSetWindowSize(g_eglView->getWindow(),g_screenSize.height,g_screenSize.width); + g_eglView->setFrameSize(g_screenSize.height, g_screenSize.width); } + + g_eglView->setDesignResolutionSize(designSize.width, designSize.height, policy); + [self updateMenu]; } @@ -255,7 +261,7 @@ using namespace cocos2d; - (IBAction) onReloadScript:(id)sender { - reloadScript(); + reloadScript(""); } @@ -276,7 +282,8 @@ using namespace cocos2d; { if ([sender state] == NSOnState) return; float scale = (float)[sender tag] / 100.0f; - [self setZoom:scale]; + g_eglView->setFrameZoomFactor(scale); + [self updateView]; } diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/mac/WorkSpaceDialog.xib b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/WorkSpaceDialog.xib similarity index 100% rename from templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/mac/WorkSpaceDialog.xib rename to templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/WorkSpaceDialog.xib diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/mac/WorkSpaceDialogController.h b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/WorkSpaceDialogController.h similarity index 100% rename from templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/mac/WorkSpaceDialogController.h rename to templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/WorkSpaceDialogController.h diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/mac/WorkSpaceDialogController.mm b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/WorkSpaceDialogController.mm similarity index 93% rename from templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/mac/WorkSpaceDialogController.mm rename to templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/WorkSpaceDialogController.mm index 79392e8d89..223803e55e 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/mac/WorkSpaceDialogController.mm +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/WorkSpaceDialogController.mm @@ -32,7 +32,7 @@ NSString* projectPath=nil; // Implement this method to handle any initialization after your window controller's window has been loaded from its nib file. [self.window makeFirstResponder:textFieldProjectDirectory]; - if (projectPath) + if (nil != projectPath && 0 != projectPath.length) { [textFieldProjectDirectory setStringValue:projectPath]; } @@ -89,6 +89,8 @@ NSString* projectPath=nil; return; } projectPath = [textFieldProjectDirectory stringValue]; + [self close]; + [NSApp endSheet:self.window returnCode:NSRunAbortedResponse]; } diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/mac/main.m b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/main.m similarity index 100% rename from templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/mac/main.m rename to templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/main.m diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.sln b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.sln new file mode 100644 index 0000000000..96979213d0 --- /dev/null +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.sln @@ -0,0 +1,99 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloLua", "HelloLua.vcxproj", "{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}" + ProjectSection(ProjectDependencies) = postProject + {21B2C324-891F-48EA-AD1A-5AE13DE12E28} = {21B2C324-891F-48EA-AD1A-5AE13DE12E28} + {B7C2A162-DEC9-4418-972E-240AB3CBFCAE} = {B7C2A162-DEC9-4418-972E-240AB3CBFCAE} + {DDC3E27F-004D-4DD4-9DD3-931A013D2159} = {DDC3E27F-004D-4DD4-9DD3-931A013D2159} + {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} + {207BC7A9-CCF1-4F2F-A04D-45F72242AE25} = {207BC7A9-CCF1-4F2F-A04D-45F72242AE25} + {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6} = {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libExtensions", "..\..\cocos2d-x\extensions\proj.win32\libExtensions.vcxproj", "{21B2C324-891F-48EA-AD1A-5AE13DE12E28}" + ProjectSection(ProjectDependencies) = postProject + {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} + {207BC7A9-CCF1-4F2F-A04D-45F72242AE25} = {207BC7A9-CCF1-4F2F-A04D-45F72242AE25} + {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6} = {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libchipmunk", "..\..\cocos2d-x\external\chipmunk\proj.win32\chipmunk.vcxproj", "{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\..\cocos2d-x\cocos\2d\cocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libAudio", "..\..\cocos2d-x\cocos\audio\proj.win32\CocosDenshion.vcxproj", "{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libNetwork", "..\..\cocos2d-x\cocos\network\proj.win32\libNetwork.vcxproj", "{DF2638C0-8128-4847-867C-6EAFE3DEE7B5}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosBuilder", "..\..\cocos2d-x\cocos\editor-support\cocosbuilder\proj.win32\libCocosBuilder.vcxproj", "{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosStudio", "..\..\cocos2d-x\cocos\editor-support\cocostudio\proj.win32\libCocosStudio.vcxproj", "{B57CF53F-2E49-4031-9822-047CC0E6BDE2}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGUI", "..\..\cocos2d-x\cocos\gui\proj.win32\libGUI.vcxproj", "{7E06E92C-537A-442B-9E4A-4761C84F8A1A}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "..\..\cocos2d-x\cocos\editor-support\spine\proj.win32\libSpine.vcxproj", "{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblua", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\liblua.vcxproj", "{DDC3E27F-004D-4DD4-9DD3-931A013D2159}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libLocalStorage", "..\..\cocos2d-x\cocos\storage\local-storage\proj.win32\libLocalStorage.vcxproj", "{632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Debug|Win32.ActiveCfg = Debug|Win32 + {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Debug|Win32.Build.0 = Debug|Win32 + {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Release|Win32.ActiveCfg = Release|Win32 + {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Release|Win32.Build.0 = Release|Win32 + {21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Debug|Win32.ActiveCfg = Debug|Win32 + {21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Debug|Win32.Build.0 = Debug|Win32 + {21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Release|Win32.ActiveCfg = Release|Win32 + {21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Release|Win32.Build.0 = Release|Win32 + {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Debug|Win32.ActiveCfg = Debug|Win32 + {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Debug|Win32.Build.0 = Debug|Win32 + {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Release|Win32.ActiveCfg = Release|Win32 + {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Release|Win32.Build.0 = Release|Win32 + {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.ActiveCfg = Debug|Win32 + {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.Build.0 = Debug|Win32 + {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.ActiveCfg = Release|Win32 + {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.Build.0 = Release|Win32 + {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Debug|Win32.ActiveCfg = Debug|Win32 + {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Debug|Win32.Build.0 = Debug|Win32 + {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Release|Win32.ActiveCfg = Release|Win32 + {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Release|Win32.Build.0 = Release|Win32 + {DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Debug|Win32.ActiveCfg = Debug|Win32 + {DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Debug|Win32.Build.0 = Debug|Win32 + {DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Release|Win32.ActiveCfg = Release|Win32 + {DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Release|Win32.Build.0 = Release|Win32 + {811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Debug|Win32.ActiveCfg = Debug|Win32 + {811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Debug|Win32.Build.0 = Debug|Win32 + {811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Release|Win32.ActiveCfg = Release|Win32 + {811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Release|Win32.Build.0 = Release|Win32 + {B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Debug|Win32.ActiveCfg = Debug|Win32 + {B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Debug|Win32.Build.0 = Debug|Win32 + {B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Release|Win32.ActiveCfg = Release|Win32 + {B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Release|Win32.Build.0 = Release|Win32 + {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Debug|Win32.ActiveCfg = Debug|Win32 + {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Debug|Win32.Build.0 = Debug|Win32 + {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Release|Win32.ActiveCfg = Release|Win32 + {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Release|Win32.Build.0 = Release|Win32 + {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.ActiveCfg = Debug|Win32 + {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.Build.0 = Debug|Win32 + {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.ActiveCfg = Release|Win32 + {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.Build.0 = Release|Win32 + {DDC3E27F-004D-4DD4-9DD3-931A013D2159}.Debug|Win32.ActiveCfg = Debug|Win32 + {DDC3E27F-004D-4DD4-9DD3-931A013D2159}.Debug|Win32.Build.0 = Debug|Win32 + {DDC3E27F-004D-4DD4-9DD3-931A013D2159}.Release|Win32.ActiveCfg = Release|Win32 + {DDC3E27F-004D-4DD4-9DD3-931A013D2159}.Release|Win32.Build.0 = Release|Win32 + {632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}.Debug|Win32.ActiveCfg = Debug|Win32 + {632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}.Debug|Win32.Build.0 = Debug|Win32 + {632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}.Release|Win32.ActiveCfg = Release|Win32 + {632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.vcxproj b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.vcxproj new file mode 100644 index 0000000000..8e1830ec70 --- /dev/null +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.vcxproj @@ -0,0 +1,234 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED} + HelloLua + + + + Application + true + Unicode + v100 + v110 + v110_xp + + + Application + false + Unicode + v100 + v110 + v110_xp + + + + + + + + + + + + + + + + + $(SolutionDir)$(Configuration).win32\ + $(Configuration).win32\ + true + $(IncludePath) + $(SourcePath); + AllRules.ruleset + + + $(SolutionDir)$(Configuration).win32\ + $(Configuration).win32\ + false + + + $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) + + + $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) + + + + $(ProjectDir)..\Classes;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\lua\lua;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(EngineRoot);%(AdditionalIncludeDirectories) + + + Level3 + MultiThreadedDebugDLL + false + EditAndContinue + EnableFastChecks + Disabled + WIN32;_WINDOWS;STRICT;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS_DEBUG;COCOS2D_DEBUG=1;GLFW_EXPOSE_NATIVE_WIN32;GLFW_EXPOSE_NATIVE_WGL;%(PreprocessorDefinitions) + 4267;4251;4244;%(DisableSpecificWarnings) + true + + + Windows + MachineX86 + true + $(OutDir);%(AdditionalLibraryDirectories) + libcurl_imp.lib;lua51.lib;websockets.lib;%(AdditionalDependencies) + + + 0x0409 + $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + + + false + Win32 + _DEBUG;%(PreprocessorDefinitions) + HelloLua.h + HelloLua_i.c + HelloLua_p.c + true + $(IntDir)/HelloLua.tlb + + + + + if not exist "$(OutDir)" mkdir "$(OutDir)" +if exist "$(OutDir)\Resource" rd /s /q "$(OutDir)\Resource" +mkdir "$(OutDir)\Resource" +mkdir "$(OutDir)\Resource\src" +mkdir "$(OutDir)\Resource\res" +xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script" "$(OutDir)\Resource" /e /Y +xcopy "$(ProjectDir)..\..\..\src" "$(OutDir)\Resource\src" /e /Y +xcopy "$(ProjectDir)..\..\..\res" "$(OutDir)\Resource\res" /e /Y + copy files + + + if not exist "$(OutDir)" mkdir "$(OutDir)" +xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)" + + + + + $(ProjectDir)..\Classes;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\lua\lua;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(EngineRoot);%(AdditionalIncludeDirectories) + + + Level3 + MultiThreadedDLL + + + ProgramDatabase + WIN32;_WINDOWS;STRICT;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGSNDEBUG;GLFW_EXPOSE_NATIVE_WIN32;GLFW_EXPOSE_NATIVE_WGL;%(PreprocessorDefinitions) + 4267;4251;4244;%(DisableSpecificWarnings) + true + + + Windows + MachineX86 + $(OutDir);%(AdditionalLibraryDirectories) + libcurl_imp.lib;lua51.lib;websockets.lib;%(AdditionalDependencies) + true + + + 0x0409 + $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories) + NDEBUG;%(PreprocessorDefinitions) + + + false + Win32 + NDEBUG;%(PreprocessorDefinitions) + HelloLua.h + HelloLua_i.c + HelloLua_p.c + true + $(IntDir)/HelloLua.tlb + + + + + if not exist "$(OutDir)" mkdir "$(OutDir)" +if exist "$(OutDir)\Resource" rd /s /q "$(OutDir)\Resource" +mkdir "$(OutDir)\Resource" +mkdir "$(OutDir)\Resource\src" +mkdir "$(OutDir)\Resource\res" +xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script" "$(OutDir)\Resource" /e /Y +xcopy "$(ProjectDir)..\..\..\src" "$(OutDir)\Resource\src" /e /Y +xcopy "$(ProjectDir)..\..\..\res" "$(OutDir)\Resource\res" /e /Y + copy files + + + if not exist "$(OutDir)" mkdir "$(OutDir)" +xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)" + + + + + + + + + + + + + + + + + + + + + + {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} + + + {f8edd7fa-9a51-4e80-baeb-860825d2eac6} + + + {811c0dab-7b96-4bd3-a154-b7572b58e4ab} + + + {b57cf53f-2e49-4031-9822-047cc0e6bde2} + + + {b7c2a162-dec9-4418-972e-240ab3cbfcae} + + + {7e06e92c-537a-442b-9e4a-4761c84f8a1a} + + + {df2638c0-8128-4847-867c-6eafe3dee7b5} + + + {ddc3e27f-004d-4dd4-9dd3-931a013d2159} + + + {632a8f38-d0f0-4d22-86b3-d69f5e6bf63a} + + + {21b2c324-891f-48ea-ad1a-5ae13de12e28} + + + {207bc7a9-ccf1-4f2f-a04d-45f72242ae25} + + + + + + + + + \ No newline at end of file diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.vcxproj.filters b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.vcxproj.filters new file mode 100644 index 0000000000..4d432f454a --- /dev/null +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.vcxproj.filters @@ -0,0 +1,54 @@ + + + + + {fc5cb953-2953-4968-83b3-39e3ff951754} + + + {037a9a02-b906-4cc5-ad98-304acd4e25ee} + + + {2d1d0979-58cd-4ab6-b91c-13650158f1fa} + + + + + Classes + + + win32 + + + win32 + + + Classes + + + + + + Classes + + + win32 + + + win32 + + + win32 + + + Classes + + + + + resource + + + + + + \ No newline at end of file diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.vcxproj.user b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.vcxproj.user new file mode 100644 index 0000000000..16617e63da --- /dev/null +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.vcxproj.user @@ -0,0 +1,10 @@ + + + + false + $(OutDir)/Resource + $(OutDir)/Resource + WindowsLocalDebugger + WindowsLocalDebugger + + \ No newline at end of file diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/Runtime_win32.cpp b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/Runtime_win32.cpp new file mode 100644 index 0000000000..e1083e80de --- /dev/null +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/Runtime_win32.cpp @@ -0,0 +1,30 @@ + +#include +#include +#include +#include +#include + +#include "cocos2d.h" +using namespace std; + +string getIPAddress() +{ + WSADATA wsaData; + char name[155]={0}; + char *ip=nullptr; + PHOSTENT hostinfo; + + if ( WSAStartup( MAKEWORD(2,0), &wsaData ) == 0 ) + { + if( gethostname ( name, sizeof(name)) == 0) + { + if((hostinfo = gethostbyname(name)) != NULL) + { + ip = inet_ntoa (*(struct in_addr *)*hostinfo->h_addr_list); + } + } + WSACleanup( ); + } + return ip; +} diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.win32/SimulatorWindow.cpp b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/SimulatorWindow.cpp similarity index 79% rename from templates/lua-template-default/frameworks/runtime-src/proj.win32/SimulatorWindow.cpp rename to templates/lua-template-runtime/frameworks/runtime-src/proj.win32/SimulatorWindow.cpp index f0f8bc9070..f72f3e2468 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.win32/SimulatorWindow.cpp +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/SimulatorWindow.cpp @@ -103,19 +103,49 @@ void updateMenu() } CheckMenuItem(viewMenu, i, MF_BYPOSITION | (bSel? MF_CHECKED : MF_UNCHECKED)); } + + int scale=g_eglView->getFrameZoomFactor()*100; + CheckMenuItem(viewMenu, ID_VIEW_ZOOMOUT100, MF_BYCOMMAND | MF_UNCHECKED); + CheckMenuItem(viewMenu, ID_VIEW_ZOOMOUT75, MF_BYCOMMAND | MF_UNCHECKED); + CheckMenuItem(viewMenu, ID_VIEW_ZOOMOUT50, MF_BYCOMMAND | MF_UNCHECKED); + CheckMenuItem(viewMenu, ID_VIEW_ZOOMOUT25, MF_BYCOMMAND | MF_UNCHECKED); + switch (scale) + { + case 100: + CheckMenuItem(viewMenu, ID_VIEW_ZOOMOUT100, MF_BYCOMMAND | MF_CHECKED); + break; + case 75: + CheckMenuItem(viewMenu, ID_VIEW_ZOOMOUT75, MF_BYCOMMAND | MF_CHECKED); + break; + case 50: + CheckMenuItem(viewMenu, ID_VIEW_ZOOMOUT50, MF_BYCOMMAND | MF_CHECKED); + break; + case 25: + CheckMenuItem(viewMenu, ID_VIEW_ZOOMOUT25, MF_BYCOMMAND | MF_CHECKED); + break; + default: + break; + } } /*@brief updateView*/ void updateView() { + + auto policy = g_eglView->getResolutionPolicy(); + auto designSize = g_eglView->getDesignResolutionSize(); + if (g_landscape) { - glfwSetWindowSize(g_eglView->getWindow(),g_screenSize.width,g_screenSize.height); + g_eglView->setFrameSize(g_screenSize.width, g_screenSize.height); } else { - glfwSetWindowSize(g_eglView->getWindow(),g_screenSize.height,g_screenSize.width); + g_eglView->setFrameSize(g_screenSize.height, g_screenSize.width); } + + g_eglView->setDesignResolutionSize(designSize.width, designSize.height, policy); + updateMenu(); } @@ -133,6 +163,30 @@ void onViewChangeOrientation(int viewMenuID) } } +void onViewZoomOut(int viewMenuID) +{ + float scale = 1.0; + switch (viewMenuID) + { + case ID_VIEW_ZOOMOUT100: + scale=1.0; + break; + case ID_VIEW_ZOOMOUT75: + scale=0.75; + break; + case ID_VIEW_ZOOMOUT50: + scale=0.50; + break; + case ID_VIEW_ZOOMOUT25: + scale=0.25; + break; + default: + break; + } + g_eglView->setFrameZoomFactor(scale); + updateView(); +} + void onViewChangeFrameSize(int viewMenuID) { int index = viewMenuID - ID_VIEW_SIZE; @@ -172,8 +226,15 @@ LRESULT CALLBACK SNewWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPar onViewChangeOrientation(wmId); break; + case ID_VIEW_ZOOMOUT100: + case ID_VIEW_ZOOMOUT75: + case ID_VIEW_ZOOMOUT50: + case ID_VIEW_ZOOMOUT25: + onViewZoomOut(wmId); + break; + case ID_CONTROL_RELOAD: - reloadScript(); + reloadScript(""); break; case ID_HELP_ABOUT: diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.win32/SimulatorWindow.h b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/SimulatorWindow.h similarity index 100% rename from templates/lua-template-default/frameworks/runtime-src/proj.win32/SimulatorWindow.h rename to templates/lua-template-runtime/frameworks/runtime-src/proj.win32/SimulatorWindow.h diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/game.rc b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/game.rc new file mode 100644 index 0000000000..b9f2307b2e --- /dev/null +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/game.rc @@ -0,0 +1,216 @@ +// Microsoft Visual C++ generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// Chinese (Simplified, PRC) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS) +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED +#pragma code_page(936) + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +2 TEXTINCLUDE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDR_MENU_COCOS MENU +BEGIN + POPUP "&File" + BEGIN + MENUITEM SEPARATOR + MENUITEM "E&xit", ID_FILE_EXIT + END + POPUP "&View" + BEGIN + MENUITEM SEPARATOR + MENUITEM "&Portrait", ID_VIEW_PORTRAIT + MENUITEM "&Landscape", ID_VIEW_LANDSCAPE + MENUITEM SEPARATOR + MENUITEM "&Actual(100%)", ID_VIEW_ZOOMOUT100 + MENUITEM "Zoom Out(75%)", ID_VIEW_ZOOMOUT75 + MENUITEM "Zoom Out(50%)", ID_VIEW_ZOOMOUT50 + MENUITEM "Zoom Out(25%)", ID_VIEW_ZOOMOUT25 + END + POPUP "&Control" + BEGIN + MENUITEM "Reload", ID_CONTROL_RELOAD + END + POPUP "&Help" + BEGIN + MENUITEM "&About ...", ID_HELP_ABOUT + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_DIALOG_ABOUT DIALOGEX 0, 0, 243, 94 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About Simulator" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK",IDOK,173,69,63,18 + LTEXT "Cocos2d-x-Simulator",IDC_STATIC,29,17,169,25 +END + +IDD_DIALOG_VIEWCUSTOM DIALOGEX 0, 0, 179, 98 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Custom" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK",IDOK,47,77,50,14 + PUSHBUTTON "Cancel",IDCANCEL,104,77,50,14 + LTEXT "WidthŁş",IDC_STATIC,15,14,30,8 + LTEXT "HeightŁş",IDC_STATIC,15,36,36,12 + EDITTEXT IDC_EDIT_WIDTH,60,15,89,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_HEIGHT,62,36,87,14,ES_AUTOHSCROLL +END + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO +BEGIN + IDD_DIALOG_ABOUT, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 236 + TOPMARGIN, 7 + BOTTOMMARGIN, 87 + END + + IDD_DIALOG_VIEWCUSTOM, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 172 + TOPMARGIN, 7 + BOTTOMMARGIN, 91 + END +END +#endif // APSTUDIO_INVOKED + +#endif // Chinese (Simplified, PRC) resources +///////////////////////////////////////////////////////////////////////////// + + +///////////////////////////////////////////////////////////////////////////// +// English (United States) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +GLFW_ICON ICON "res\\game.ico" + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 1,0,0,1 + PRODUCTVERSION 1,0,0,1 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904B0" + BEGIN + VALUE "FileDescription", "game Module" + VALUE "FileVersion", "1, 0, 0, 1" + VALUE "InternalName", "game" + VALUE "LegalCopyright", "Copyright " + VALUE "OriginalFilename", "game.exe" + VALUE "ProductName", "game Module" + VALUE "ProductVersion", "1, 0, 0, 1" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // English (United States) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/main.cpp b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/main.cpp new file mode 100644 index 0000000000..14085d53d7 --- /dev/null +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/main.cpp @@ -0,0 +1,59 @@ +#include "main.h" +#include "AppDelegate.h" +#include "cocos2d.h" +#include "SimulatorWindow.h" + +USING_NS_CC; + +// uncomment below line, open debug console +#define USE_WIN32_CONSOLE + +int APIENTRY _tWinMain(HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPTSTR lpCmdLine, + int nCmdShow) +{ + UNREFERENCED_PARAMETER(hPrevInstance); + UNREFERENCED_PARAMETER(lpCmdLine); + +#ifdef USE_WIN32_CONSOLE + AllocConsole(); + freopen("CONIN$", "r", stdin); + freopen("CONOUT$", "w", stdout); + freopen("CONOUT$", "w", stderr); +#endif + + // create the application instance + AppDelegate app; + createSimulator("HelloLua",960,640); + + int ret = Application::getInstance()->run(); + +#ifdef USE_WIN32_CONSOLE + FreeConsole(); +#endif + + return ret; +} +std::string getCurAppPath(void) +{ + TCHAR szAppDir[MAX_PATH]={0}; + if (!GetModuleFileName(NULL,szAppDir,MAX_PATH)) + return ""; + int nEnd=0; + for (int i=0;szAppDir[i];i++) + { + if(szAppDir[i]=='\\') + nEnd = i; + } + szAppDir[nEnd] = 0; + int iLen = 2*wcslen(szAppDir); + char* chRtn = new char[iLen+1]; + wcstombs(chRtn,szAppDir,iLen+1); + std::string strPath = chRtn; + delete [] chRtn; + chRtn=NULL; + char fuldir[MAX_PATH]={0}; + _fullpath(fuldir,strPath.c_str(),MAX_PATH); + return fuldir; +} \ No newline at end of file diff --git a/samples/lua-tests/project/proj.win32/main.h b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/main.h similarity index 100% rename from samples/lua-tests/project/proj.win32/main.h rename to templates/lua-template-runtime/frameworks/runtime-src/proj.win32/main.h diff --git a/samples/lua-tests/project/proj.win32/res/TestLua.ico b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/res/game.ico similarity index 100% rename from samples/lua-tests/project/proj.win32/res/TestLua.ico rename to templates/lua-template-runtime/frameworks/runtime-src/proj.win32/res/game.ico diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/resource.h b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/resource.h new file mode 100644 index 0000000000..6f04655931 --- /dev/null +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/resource.h @@ -0,0 +1,40 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by game.rc +// +#define IDS_PROJNAME 100 +#define IDR_TESTLUA 100 +#define IDR_MENU_COCOS 201 +#define IDD_DIALOG1 202 +#define IDD_DIALOG_ABOUT 202 +#define IDD_DIALOG_VIEWCUSTOM 203 +#define IDC_EDIT_WIDTH 1000 +#define IDC_EDIT2 1001 +#define IDC_EDIT_HEIGHT 1001 +#define ID_VIEW_SIZE 30001 +#define ID_FILE_NEW_WINDOW 32771 +#define ID_VIEW_PORTRAIT 32775 +#define ID_VIEW_LANDSCAPE 32776 +#define ID_VIEW_CUSTOM 32777 +#define ID_HELP_ABOUT 32778 +#define ID_FILE_EXIT 32779 +#define ID_Menu 32780 +#define ID_Menu32781 32781 +#define ID_TEST_RESET 32782 +#define ID_CONTROL 32783 +#define ID_CONTROL_RELOAD 32784 +#define ID_VIEW_ZOOMOUT100 32785 +#define ID_VIEW_ZOOMOUT75 32786 +#define ID_VIEW_ZOOMOUT50 32787 +#define ID_VIEW_ZOOMOUT25 32788 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 201 +#define _APS_NEXT_COMMAND_VALUE 32793 +#define _APS_NEXT_CONTROL_VALUE 1000 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/samples/cpp-tests/Resources/background.mp3.REMOVED.git-id b/templates/lua-template-runtime/res/background.mp3.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/background.mp3.REMOVED.git-id rename to templates/lua-template-runtime/res/background.mp3.REMOVED.git-id diff --git a/templates/lua-template-runtime/res/farm.jpg.REMOVED.git-id b/templates/lua-template-runtime/res/farm.jpg.REMOVED.git-id new file mode 100644 index 0000000000..4609f3cf02 --- /dev/null +++ b/templates/lua-template-runtime/res/farm.jpg.REMOVED.git-id @@ -0,0 +1 @@ +d7290c34702d1c6bdb368acb060d93b42d5deff8 \ No newline at end of file diff --git a/templates/lua-template-runtime/runtime/ios/ios-sim b/templates/lua-template-runtime/runtime/ios/ios-sim new file mode 100755 index 0000000000..4f997e03a6 Binary files /dev/null and b/templates/lua-template-runtime/runtime/ios/ios-sim differ diff --git a/templates/lua-template-runtime/src/hello2.lua b/templates/lua-template-runtime/src/hello2.lua new file mode 100644 index 0000000000..27158aa788 --- /dev/null +++ b/templates/lua-template-runtime/src/hello2.lua @@ -0,0 +1,3 @@ +function myadd(x, y) + return x + y +end \ No newline at end of file diff --git a/templates/lua-template-runtime/src/main.lua b/templates/lua-template-runtime/src/main.lua new file mode 100644 index 0000000000..32bad3df7e --- /dev/null +++ b/templates/lua-template-runtime/src/main.lua @@ -0,0 +1,227 @@ +require "Cocos2d" +-- cclog +cclog = function(...) + print(string.format(...)) +end + +-- for CCLuaEngine traceback +function __G__TRACKBACK__(msg) + cclog("----------------------------------------") + cclog("LUA ERROR: " .. tostring(msg) .. "\n") + cclog(debug.traceback()) + cclog("----------------------------------------") +end + +local function main() + collectgarbage("collect") + -- avoid memory leak + collectgarbage("setpause", 100) + collectgarbage("setstepmul", 5000) + cc.FileUtils:getInstance():addSearchResolutionsOrder("src"); + cc.FileUtils:getInstance():addSearchResolutionsOrder("res"); + local schedulerID = 0 + --support debug + local targetPlatform = cc.Application:getInstance():getTargetPlatform() + if (cc.PLATFORM_OS_IPHONE == targetPlatform) or (cc.PLATFORM_OS_IPAD == targetPlatform) or + (cc.PLATFORM_OS_ANDROID == targetPlatform) or (cc.PLATFORM_OS_WINDOWS == targetPlatform) or + (cc.PLATFORM_OS_MAC == targetPlatform) then + cclog("result is ") + --require('debugger')() + + end + require "hello2" + cclog("result is " .. myadd(1, 1)) + + --------------- + + local visibleSize = cc.Director:getInstance():getVisibleSize() + local origin = cc.Director:getInstance():getVisibleOrigin() + + -- add the moving dog + local function creatDog() + local frameWidth = 105 + local frameHeight = 95 + + -- create dog animate + local textureDog = cc.TextureCache:getInstance():addImage("dog.png") + local rect = cc.rect(0, 0, frameWidth, frameHeight) + local frame0 = cc.SpriteFrame:createWithTexture(textureDog, rect) + rect = cc.rect(frameWidth, 0, frameWidth, frameHeight) + local frame1 = cc.SpriteFrame:createWithTexture(textureDog, rect) + + local spriteDog = cc.Sprite:createWithSpriteFrame(frame0) + spriteDog.isPaused = false + spriteDog:setPosition(origin.x, origin.y + visibleSize.height / 4 * 3) +--[[ + local animFrames = CCArray:create() + + animFrames:addObject(frame0) + animFrames:addObject(frame1) +]]-- + + local animation = cc.Animation:createWithSpriteFrames({frame0,frame1}, 0.5) + local animate = cc.Animate:create(animation); + spriteDog:runAction(cc.RepeatForever:create(animate)) + + -- moving dog at every frame + local function tick() + if spriteDog.isPaused then return end + local x, y = spriteDog:getPosition() + if x > origin.x + visibleSize.width then + x = origin.x + else + x = x + 1 + end + + spriteDog:setPositionX(x) + end + + schedulerID = cc.Director:getInstance():getScheduler():scheduleScriptFunc(tick, 0, false) + + return spriteDog + end + + -- create farm + local function createLayerFarm() + local layerFarm = cc.Layer:create() + + -- add in farm background + local bg = cc.Sprite:create("farm.jpg") + bg:setPosition(origin.x + visibleSize.width / 2 + 80, origin.y + visibleSize.height / 2) + layerFarm:addChild(bg) + + -- add land sprite + for i = 0, 3 do + for j = 0, 1 do + local spriteLand = cc.Sprite:create("land.png") + spriteLand:setPosition(200 + j * 180 - i % 2 * 90, 10 + i * 95 / 2) + layerFarm:addChild(spriteLand) + end + end + + -- add crop + local frameCrop = cc.SpriteFrame:create("crop.png", cc.rect(0, 0, 105, 95)) + for i = 0, 3 do + for j = 0, 1 do + local spriteCrop = cc.Sprite:createWithSpriteFrame(frameCrop); + spriteCrop:setPosition(10 + 200 + j * 180 - i % 2 * 90, 30 + 10 + i * 95 / 2) + layerFarm:addChild(spriteCrop) + end + end + + -- add moving dog + local spriteDog = creatDog() + layerFarm:addChild(spriteDog) + + -- handing touch events + local touchBeginPoint = nil + local function onTouchBegan(touch, event) + local location = touch:getLocation() + cclog("onTouchBegan: %0.2f, %0.2f", location.x, location.y) + touchBeginPoint = {x = location.x, y = location.y} + spriteDog.isPaused = true + -- CCTOUCHBEGAN event must return true + return true + end + + local function onTouchMoved(touch, event) + local location = touch:getLocation() + cclog("onTouchMoved: %0.2f, %0.2f", location.x, location.y) + if touchBeginPoint then + local cx, cy = layerFarm:getPosition() + layerFarm:setPosition(cx + location.x - touchBeginPoint.x, + cy + location.y - touchBeginPoint.y) + touchBeginPoint = {x = location.x, y = location.y} + end + end + + local function onTouchEnded(touch, event) + local location = touch:getLocation() + cclog("onTouchEnded: %0.2f, %0.2f", location.x, location.y) + touchBeginPoint = nil + spriteDog.isPaused = false + end + + local listener = cc.EventListenerTouchOneByOne:create() + listener:registerScriptHandler(onTouchBegan,cc.Handler.EVENT_TOUCH_BEGAN ) + listener:registerScriptHandler(onTouchMoved,cc.Handler.EVENT_TOUCH_MOVED ) + listener:registerScriptHandler(onTouchEnded,cc.Handler.EVENT_TOUCH_ENDED ) + local eventDispatcher = layerFarm:getEventDispatcher() + eventDispatcher:addEventListenerWithSceneGraphPriority(listener, layerFarm) + + local function onNodeEvent(event) + if "exit" == event then + cc.Director:getInstance():getScheduler():unscheduleScriptEntry(schedulerID) + end + end + layerFarm:registerScriptHandler(onNodeEvent) + + return layerFarm + end + + + -- create menu + local function createLayerMenu() + local layerMenu = cc.Layer:create() + + local menuPopup, menuTools, effectID + + local function menuCallbackClosePopup() + -- stop test sound effect + cc.SimpleAudioEngine:getInstance():stopEffect(effectID) + menuPopup:setVisible(false) + end + + local function menuCallbackOpenPopup() + -- loop test sound effect + local effectPath = cc.FileUtils:getInstance():fullPathForFilename("effect1.wav") + effectID = cc.SimpleAudioEngine:getInstance():playEffect(effectPath) + menuPopup:setVisible(true) + end + + -- add a popup menu + local menuPopupItem = cc.MenuItemImage:create("menu2.png", "menu2.png") + menuPopupItem:setPosition(0, 0) + menuPopupItem:registerScriptTapHandler(menuCallbackClosePopup) + menuPopup = cc.Menu:create(menuPopupItem) + menuPopup:setPosition(origin.x + visibleSize.width / 2, origin.y + visibleSize.height / 2) + menuPopup:setVisible(false) + layerMenu:addChild(menuPopup) + + -- add the left-bottom "tools" menu to invoke menuPopup + local menuToolsItem = cc.MenuItemImage:create("menu1.png", "menu1.png") + menuToolsItem:setPosition(0, 0) + menuToolsItem:registerScriptTapHandler(menuCallbackOpenPopup) + menuTools = cc.Menu:create(menuToolsItem) + local itemWidth = menuToolsItem:getContentSize().width + local itemHeight = menuToolsItem:getContentSize().height + menuTools:setPosition(origin.x + itemWidth/2, origin.y + itemHeight/2) + layerMenu:addChild(menuTools) + + return layerMenu + end + + -- play background music, preload effect + + -- uncomment below for the BlackBerry version + -- local bgMusicPath = CCFileUtils:getInstance():fullPathForFilename("background.ogg") + local bgMusicPath = cc.FileUtils:getInstance():fullPathForFilename("background.mp3") + cc.SimpleAudioEngine:getInstance():playMusic(bgMusicPath, true) + local effectPath = cc.FileUtils:getInstance():fullPathForFilename("effect1.wav") + cc.SimpleAudioEngine:getInstance():preloadEffect(effectPath) + + -- run + local sceneGame = cc.Scene:create() + sceneGame:addChild(createLayerFarm()) + sceneGame:addChild(createLayerMenu()) + + if cc.Director:getInstance():getRunningScene() then + cc.Director:getInstance():replaceScene(sceneGame) + else + cc.Director:getInstance():runWithScene(sceneGame) + end + +end + + +xpcall(main, __G__TRACKBACK__) diff --git a/tests/cpp-empty-test/CMakeLists.txt b/tests/cpp-empty-test/CMakeLists.txt new file mode 100644 index 0000000000..88ebaceb4e --- /dev/null +++ b/tests/cpp-empty-test/CMakeLists.txt @@ -0,0 +1,75 @@ +set(APP_NAME cpp-empty-test) + +if(QT) + set(PLATFORM_SRC + proj.qt/main.cpp + ) +elseif(ANDROID) + set(PLATFORM_SRC + proj.android/jni/hellocpp/main.cpp + ) +elseif(WIN32) + set(PLATFORM_SRC + proj.win32/main.cpp + ) +elseif(APPLE) + if(IOS) + set(PLATFORM_SRC + proj.ios/main.m + proj.ios/AppController.mm + proj.ios/RootViewController.mm + ) + else() + set(PLATFORM_SRC + proj.mac/main.m + ) + endif() +else() + set(PLATFORM_SRC + proj.linux/main.cpp + ) + endif() + +set(SAMPLE_SRC + ${PLATFORM_SRC} + Classes/AppDelegate.cpp + Classes/HelloWorldScene.cpp +) + +# add the executable +add_executable(${APP_NAME} + ${SAMPLE_SRC} +) + +if(WIN32 AND MSVC) + #get our resources + add_custom_command(TARGET ${APP_NAME} PRE_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_directory + ${CMAKE_CURRENT_SOURCE_DIR}/Resources ${CMAKE_CURRENT_BINARY_DIR}) + #get our dlls + add_custom_command(TARGET ${APP_NAME} PRE_BUILD + COMMAND ${CMAKE_COMMAND} -E copy + ${CMAKE_CURRENT_SOURCE_DIR}/../../../external/win32-specific/gles/prebuilt/glew32.dll + ${CMAKE_CURRENT_BINARY_DIR}) + + add_custom_command(TARGET ${APP_NAME} PRE_BUILD + COMMAND ${CMAKE_COMMAND} -E copy + ${CMAKE_CURRENT_SOURCE_DIR}/../../../external/win32-specific/zlib/prebuilt/zlib1.dll + ${CMAKE_CURRENT_BINARY_DIR}/Debug) + + #Visual Studio Defaults to wrong type + set_target_properties(${APP_NAME} PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:WINDOWS") + set_target_properties(${APP_NAME} PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:WINDOWS") +else() + set(APP_BIN_DIR "${CMAKE_BINARY_DIR}/bin/${APP_NAME}") + + set_target_properties(${APP_NAME} PROPERTIES + RUNTIME_OUTPUT_DIRECTORY "${APP_BIN_DIR}") + + pre_build(${APP_NAME} + COMMAND ${CMAKE_COMMAND} -E remove_directory ${APP_BIN_DIR}/Resources + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/Resources ${APP_BIN_DIR}/Resources + ) +endif() + +target_link_libraries(${APP_NAME} audio cocos2d) diff --git a/tests/cpp-empty-test/Classes/AppDelegate.cpp b/tests/cpp-empty-test/Classes/AppDelegate.cpp new file mode 100644 index 0000000000..396605feac --- /dev/null +++ b/tests/cpp-empty-test/Classes/AppDelegate.cpp @@ -0,0 +1,97 @@ +#include "AppDelegate.h" + +#include +#include + +#include "HelloWorldScene.h" +#include "AppMacros.h" + +USING_NS_CC; +using namespace std; + +AppDelegate::AppDelegate() { + +} + +AppDelegate::~AppDelegate() +{ +} + +bool AppDelegate::applicationDidFinishLaunching() { + // initialize director + auto director = Director::getInstance(); + auto glview = director->getOpenGLView(); + if(!glview) { + glview = GLView::create("Cpp Empty Test"); + director->setOpenGLView(glview); + } + + director->setOpenGLView(glview); + + // Set the design resolution + glview->setDesignResolutionSize(designResolutionSize.width, designResolutionSize.height, ResolutionPolicy::NO_BORDER); + + Size frameSize = glview->getFrameSize(); + + vector searchPath; + + // In this demo, we select resource according to the frame's height. + // If the resource size is different from design resolution size, you need to set contentScaleFactor. + // We use the ratio of resource's height to the height of design resolution, + // this can make sure that the resource's height could fit for the height of design resolution. + + // if the frame's height is larger than the height of medium resource size, select large resource. + if (frameSize.height > mediumResource.size.height) + { + searchPath.push_back(largeResource.directory); + + director->setContentScaleFactor(MIN(largeResource.size.height/designResolutionSize.height, largeResource.size.width/designResolutionSize.width)); + } + // if the frame's height is larger than the height of small resource size, select medium resource. + else if (frameSize.height > smallResource.size.height) + { + searchPath.push_back(mediumResource.directory); + + director->setContentScaleFactor(MIN(mediumResource.size.height/designResolutionSize.height, mediumResource.size.width/designResolutionSize.width)); + } + // if the frame's height is smaller than the height of medium resource size, select small resource. + else + { + searchPath.push_back(smallResource.directory); + + director->setContentScaleFactor(MIN(smallResource.size.height/designResolutionSize.height, smallResource.size.width/designResolutionSize.width)); + } + + // set searching path + FileUtils::getInstance()->setSearchPaths(searchPath); + + // turn on display FPS + director->setDisplayStats(true); + + // set FPS. the default value is 1.0/60 if you don't call this + director->setAnimationInterval(1.0 / 60); + + // create a scene. it's an autorelease object + auto scene = HelloWorld::scene(); + + // run + director->runWithScene(scene); + + return true; +} + +// This function will be called when the app is inactive. When comes a phone call,it's be invoked too +void AppDelegate::applicationDidEnterBackground() { + Director::getInstance()->stopAnimation(); + + // if you use SimpleAudioEngine, it must be pause + // SimpleAudioEngine::sharedEngine()->pauseBackgroundMusic(); +} + +// this function will be called when the app is active again +void AppDelegate::applicationWillEnterForeground() { + Director::getInstance()->startAnimation(); + + // if you use SimpleAudioEngine, it must resume here + // SimpleAudioEngine::sharedEngine()->resumeBackgroundMusic(); +} diff --git a/tests/cpp-empty-test/Classes/AppDelegate.h b/tests/cpp-empty-test/Classes/AppDelegate.h new file mode 100644 index 0000000000..18ee8aeb63 --- /dev/null +++ b/tests/cpp-empty-test/Classes/AppDelegate.h @@ -0,0 +1,38 @@ +#ifndef _APP_DELEGATE_H_ +#define _APP_DELEGATE_H_ + +#include "cocos2d.h" + +/** +@brief The cocos2d Application. + +The reason for implement as private inheritance is to hide some interface call by Director. +*/ +class AppDelegate : private cocos2d::Application +{ +public: + AppDelegate(); + virtual ~AppDelegate(); + + /** + @brief Implement Director and Scene init code here. + @return true Initialize success, app continue. + @return false Initialize failed, app terminate. + */ + virtual bool applicationDidFinishLaunching(); + + /** + @brief The function be called when the application enter background + @param the pointer of the application + */ + virtual void applicationDidEnterBackground(); + + /** + @brief The function be called when the application enter foreground + @param the pointer of the application + */ + virtual void applicationWillEnterForeground(); +}; + +#endif // _APP_DELEGATE_H_ + diff --git a/tests/cpp-empty-test/Classes/AppMacros.h b/tests/cpp-empty-test/Classes/AppMacros.h new file mode 100644 index 0000000000..417da9a190 --- /dev/null +++ b/tests/cpp-empty-test/Classes/AppMacros.h @@ -0,0 +1,56 @@ +#ifndef __APPMACROS_H__ +#define __APPMACROS_H__ + +#include "cocos2d.h" + +/* For demonstrating using one design resolution to match different resources, + or one resource to match different design resolutions. + + [Situation 1] Using one design resolution to match different resources. + Please look into Appdelegate::applicationDidFinishLaunching. + We check current device frame size to decide which resource need to be selected. + So if you want to test this situation which said in title '[Situation 1]', + you should change ios simulator to different device(e.g. iphone, iphone-retina3.5, iphone-retina4.0, ipad, ipad-retina), + or change the window size in "proj.XXX/main.cpp" by "CCEGLView::setFrameSize" if you are using win32 or linux plaform + and modify "proj.mac/AppController.mm" by changing the window rectangle. + + [Situation 2] Using one resource to match different design resolutions. + The coordinates in your codes is based on your current design resolution rather than resource size. + Therefore, your design resolution could be very large and your resource size could be small. + To test this, just define the marco 'TARGET_DESIGN_RESOLUTION_SIZE' to 'DESIGN_RESOLUTION_2048X1536' + and open iphone simulator or create a window of 480x320 size. + + [Note] Normally, developer just need to define one design resolution(e.g. 960x640) with one or more resources. + */ + +#define DESIGN_RESOLUTION_480X320 0 +#define DESIGN_RESOLUTION_1024X768 1 +#define DESIGN_RESOLUTION_2048X1536 2 + +/* If you want to switch design resolution, change next line */ +#define TARGET_DESIGN_RESOLUTION_SIZE DESIGN_RESOLUTION_480X320 + +typedef struct tagResource +{ + cocos2d::Size size; + char directory[100]; +}Resource; + +static Resource smallResource = { cocos2d::Size(480, 320), "iphone" }; +static Resource mediumResource = { cocos2d::Size(1024, 768), "ipad" }; +static Resource largeResource = { cocos2d::Size(2048, 1536), "ipadhd" }; + +#if (TARGET_DESIGN_RESOLUTION_SIZE == DESIGN_RESOLUTION_480X320) +static cocos2d::Size designResolutionSize = cocos2d::Size(480, 320); +#elif (TARGET_DESIGN_RESOLUTION_SIZE == DESIGN_RESOLUTION_1024X768) +static cocos2d::Size designResolutionSize = cocos2d::Size(1024, 768); +#elif (TARGET_DESIGN_RESOLUTION_SIZE == DESIGN_RESOLUTION_2048X1536) +static cocos2d::Size designResolutionSize = cocos2d::Size(2048, 1536); +#else +#error unknown target design resolution! +#endif + +// The font size 24 is designed for small resolution, so we should change it to fit for current design resolution +#define TITLE_FONT_SIZE (cocos2d::Director::getInstance()->getOpenGLView()->getDesignResolutionSize().width / smallResource.size.width * 24) + +#endif /* __APPMACROS_H__ */ diff --git a/tests/cpp-empty-test/Classes/HelloWorldScene.cpp b/tests/cpp-empty-test/Classes/HelloWorldScene.cpp new file mode 100644 index 0000000000..959e2cd6cf --- /dev/null +++ b/tests/cpp-empty-test/Classes/HelloWorldScene.cpp @@ -0,0 +1,86 @@ +#include "HelloWorldScene.h" +#include "AppMacros.h" + +USING_NS_CC; + + +Scene* HelloWorld::scene() +{ + // 'scene' is an autorelease object + auto scene = Scene::create(); + + // 'layer' is an autorelease object + HelloWorld *layer = HelloWorld::create(); + + // add layer as a child to scene + scene->addChild(layer); + + // return the scene + return scene; +} + +// on "init" you need to initialize your instance +bool HelloWorld::init() +{ + ////////////////////////////// + // 1. super init first + if ( !Layer::init() ) + { + return false; + } + + auto visibleSize = Director::getInstance()->getVisibleSize(); + auto origin = Director::getInstance()->getVisibleOrigin(); + + ///////////////////////////// + // 2. add a menu item with "X" image, which is clicked to quit the program + // you may modify it. + + // add a "close" icon to exit the progress. it's an autorelease object + auto closeItem = MenuItemImage::create( + "CloseNormal.png", + "CloseSelected.png", + CC_CALLBACK_1(HelloWorld::menuCloseCallback,this)); + + closeItem->setPosition(origin + Point(visibleSize) - Point(closeItem->getContentSize() / 2)); + + // create menu, it's an autorelease object + auto menu = Menu::create(closeItem, NULL); + menu->setPosition(Point::ZERO); + this->addChild(menu, 1); + + ///////////////////////////// + // 3. add your codes below... + + // add a label shows "Hello World" + // create and initialize a label + + auto label = LabelTTF::create("Hello World", "Arial", TITLE_FONT_SIZE); + + // position the label on the center of the screen + label->setPosition(Point(origin.x + visibleSize.width/2, + origin.y + visibleSize.height - label->getContentSize().height)); + + // add the label as a child to this layer + this->addChild(label, 1); + + // add "HelloWorld" splash screen" + auto sprite = Sprite::create("HelloWorld.png"); + + // position the sprite on the center of the screen + sprite->setPosition(Point(visibleSize / 2) + origin); + + // add the sprite as a child to this layer + this->addChild(sprite); + + return true; +} + +void HelloWorld::menuCloseCallback(Ref* sender) +{ + Director::getInstance()->end(); + +#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) + exit(0); +#endif +} diff --git a/tests/cpp-empty-test/Classes/HelloWorldScene.h b/tests/cpp-empty-test/Classes/HelloWorldScene.h new file mode 100644 index 0000000000..de8a612e42 --- /dev/null +++ b/tests/cpp-empty-test/Classes/HelloWorldScene.h @@ -0,0 +1,22 @@ +#ifndef __HELLOWORLD_SCENE_H__ +#define __HELLOWORLD_SCENE_H__ + +#include "cocos2d.h" + +class HelloWorld : public cocos2d::Layer +{ +public: + // Here's a difference. Method 'init' in cocos2d-x returns bool, instead of returning 'id' in cocos2d-iphone + virtual bool init(); + + // there's no 'id' in cpp, so we recommend returning the class instance pointer + static cocos2d::Scene* scene(); + + // a selector callback + void menuCloseCallback(Ref* sender); + + // implement the "static node()" method manually + CREATE_FUNC(HelloWorld); +}; + +#endif // __HELLOWORLD_SCENE_H__ diff --git a/samples/cpp-tests/Resources/.gitignore b/tests/cpp-empty-test/Resources/.gitignore similarity index 100% rename from samples/cpp-tests/Resources/.gitignore rename to tests/cpp-empty-test/Resources/.gitignore diff --git a/tests/cpp-empty-test/Resources/ipad/HelloWorld.png.REMOVED.git-id b/tests/cpp-empty-test/Resources/ipad/HelloWorld.png.REMOVED.git-id new file mode 100644 index 0000000000..fda9923fa3 --- /dev/null +++ b/tests/cpp-empty-test/Resources/ipad/HelloWorld.png.REMOVED.git-id @@ -0,0 +1 @@ +709d78b7f3eab27056a98d63e9153b35d57b84bc \ No newline at end of file diff --git a/tests/cpp-empty-test/Resources/ipadhd/HelloWorld.png.REMOVED.git-id b/tests/cpp-empty-test/Resources/ipadhd/HelloWorld.png.REMOVED.git-id new file mode 100644 index 0000000000..45e6087f95 --- /dev/null +++ b/tests/cpp-empty-test/Resources/ipadhd/HelloWorld.png.REMOVED.git-id @@ -0,0 +1 @@ +7aa1e9dc799acf384a1c4603054242cc09c1b63e \ No newline at end of file diff --git a/tests/cpp-empty-test/Resources/iphone/HelloWorld.png.REMOVED.git-id b/tests/cpp-empty-test/Resources/iphone/HelloWorld.png.REMOVED.git-id new file mode 100644 index 0000000000..d391882e7d --- /dev/null +++ b/tests/cpp-empty-test/Resources/iphone/HelloWorld.png.REMOVED.git-id @@ -0,0 +1 @@ +9d6facb31897d010352e7b57f4a82715c260408a \ No newline at end of file diff --git a/samples/cpp-tests/proj.android/.classpath b/tests/cpp-empty-test/proj.android/.classpath similarity index 100% rename from samples/cpp-tests/proj.android/.classpath rename to tests/cpp-empty-test/proj.android/.classpath diff --git a/tests/cpp-empty-test/proj.android/.project b/tests/cpp-empty-test/proj.android/.project new file mode 100644 index 0000000000..b6c77b075d --- /dev/null +++ b/tests/cpp-empty-test/proj.android/.project @@ -0,0 +1,43 @@ + + + CppEmptyTest + + + + + + com.android.ide.eclipse.adt.ResourceManagerBuilder + + + + + com.android.ide.eclipse.adt.PreCompilerBuilder + + + + + org.eclipse.jdt.core.javabuilder + + + + + com.android.ide.eclipse.adt.ApkBuilder + + + + + org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder + full,incremental, + + + + + + com.android.ide.eclipse.adt.AndroidNature + org.eclipse.jdt.core.javanature + org.eclipse.cdt.core.cnature + org.eclipse.cdt.core.ccnature + org.eclipse.cdt.managedbuilder.core.managedBuildNature + org.eclipse.cdt.managedbuilder.core.ScannerConfigNature + + diff --git a/tests/cpp-empty-test/proj.android/AndroidManifest.xml b/tests/cpp-empty-test/proj.android/AndroidManifest.xml new file mode 100644 index 0000000000..db79f67eca --- /dev/null +++ b/tests/cpp-empty-test/proj.android/AndroidManifest.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/cpp-tests/proj.android/README.md b/tests/cpp-empty-test/proj.android/README.md similarity index 100% rename from samples/cpp-tests/proj.android/README.md rename to tests/cpp-empty-test/proj.android/README.md diff --git a/tests/cpp-empty-test/proj.android/build.xml b/tests/cpp-empty-test/proj.android/build.xml new file mode 100644 index 0000000000..c1d9bcdfca --- /dev/null +++ b/tests/cpp-empty-test/proj.android/build.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/cpp-empty-test/proj.android/jni/Android.mk b/tests/cpp-empty-test/proj.android/jni/Android.mk new file mode 100644 index 0000000000..92f4b91ec4 --- /dev/null +++ b/tests/cpp-empty-test/proj.android/jni/Android.mk @@ -0,0 +1,20 @@ +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) + +LOCAL_MODULE := cpp_empty_test_shared + +LOCAL_MODULE_FILENAME := libcpp_empty_test + +LOCAL_SRC_FILES := main.cpp \ + ../../Classes/AppDelegate.cpp \ + ../../Classes/HelloWorldScene.cpp + +LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes + +LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static cocosdenshion_static + +include $(BUILD_SHARED_LIBRARY) + +$(call import-module,2d) +$(call import-module,audio/android) diff --git a/tests/cpp-empty-test/proj.android/jni/Application.mk b/tests/cpp-empty-test/proj.android/jni/Application.mk new file mode 100644 index 0000000000..74af9626ab --- /dev/null +++ b/tests/cpp-empty-test/proj.android/jni/Application.mk @@ -0,0 +1,5 @@ +APP_STL := gnustl_static + +# add -Wno-literal-suffix to avoid warning: warning: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wliteral-suffix] +# in NDK_ROOT/arch-arm/usr/include/sys/cdefs_elf.h:35:28: when using ndk-r9 +APP_CPPFLAGS := -frtti -DCOCOS2D_DEBUG=1 -std=c++11 -Wno-literal-suffix -fsigned-char diff --git a/tests/cpp-empty-test/proj.android/jni/list.sh b/tests/cpp-empty-test/proj.android/jni/list.sh new file mode 100755 index 0000000000..b29f678cb8 --- /dev/null +++ b/tests/cpp-empty-test/proj.android/jni/list.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +append_str=' \' + +list_alldir() +{ + for file in $1/* + do + if [ -f $file ]; then + echo $file$append_str | grep .cpp + fi + + if [ -d $file ]; then + list_alldir $file + fi + done +} + +if [ $# -gt 0 ]; then + list_alldir "$1" +else + list_alldir "." +fi diff --git a/tests/cpp-empty-test/proj.android/jni/main.cpp b/tests/cpp-empty-test/proj.android/jni/main.cpp new file mode 100644 index 0000000000..2b344d9e04 --- /dev/null +++ b/tests/cpp-empty-test/proj.android/jni/main.cpp @@ -0,0 +1,16 @@ +#include "AppDelegate.h" +#include "platform/android/jni/JniHelper.h" +#include +#include + +#include "cocos2d.h" + +#define LOG_TAG "main" +#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__) + +using namespace cocos2d; + +void cocos_android_app_init (struct android_app* app) { + LOGD("cocos_android_app_init"); + AppDelegate *pAppDelegate = new AppDelegate(); +} diff --git a/tests/cpp-empty-test/proj.android/ndkgdb.sh b/tests/cpp-empty-test/proj.android/ndkgdb.sh new file mode 100755 index 0000000000..ecb419da0e --- /dev/null +++ b/tests/cpp-empty-test/proj.android/ndkgdb.sh @@ -0,0 +1,47 @@ +APPNAME="CppEmptyTest" +APP_ANDROID_NAME="org.cocos2dx.cpp_empty_test" + +if [ -z "${SDK_ROOT+aaa}" ]; then +# ... if SDK_ROOT is not set, use "$HOME/bin/android-sdk" + SDK_ROOT="$HOME/bin/android-sdk" +fi + +if [ -z "${NDK_ROOT+aaa}" ]; then +# ... if NDK_ROOT is not set, use "$HOME/bin/android-ndk" + NDK_ROOT="$HOME/bin/android-ndk" +fi + +if [ -z "${COCOS2DX_ROOT+aaa}" ]; then +# ... if COCOS2DX_ROOT is not set +# ... find current working directory + DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +# ... use paths relative to current directory + COCOS2DX_ROOT="$DIR/../../../.." + APP_ROOT="$DIR/.." + APP_ANDROID_ROOT="$DIR" +else + APP_ROOT="$COCOS2DX_ROOT/samples/$APPNAME" + APP_ANDROID_ROOT="$COCOS2DX_ROOT/samples/$APPNAME/proj.android" +fi + +echo "NDK_ROOT = $NDK_ROOT" +echo "SDK_ROOT = $SDK_ROOT" +echo "COCOS2DX_ROOT = $COCOS2DX_ROOT" +echo "APP_ROOT = $APP_ROOT" +echo "APP_ANDROID_ROOT = $APP_ANDROID_ROOT" +echo "APP_ANDROID_NAME = $APP_ANDROID_NAME" + +echo +echo "Killing and restarting ${APP_ANDROID_NAME}" +echo + +set -x + +"${SDK_ROOT}"/platform-tools/adb shell am force-stop "${APP_ANDROID_NAME}" + +NDK_MODULE_PATH="${COCOS2DX_ROOT}":"${COCOS2DX_ROOT}"/cocos2dx/platform/third_party/android/prebuilt \ + "${NDK_ROOT}"/ndk-gdb \ + --adb="${SDK_ROOT}"/platform-tools/adb \ + --verbose \ + --start \ + --force diff --git a/samples/lua-tests/project/proj.android/proguard-project.txt b/tests/cpp-empty-test/proj.android/proguard-project.txt similarity index 100% rename from samples/lua-tests/project/proj.android/proguard-project.txt rename to tests/cpp-empty-test/proj.android/proguard-project.txt diff --git a/samples/cpp-tests/proj.android/project.properties b/tests/cpp-empty-test/proj.android/project.properties similarity index 100% rename from samples/cpp-tests/proj.android/project.properties rename to tests/cpp-empty-test/proj.android/project.properties diff --git a/tests/cpp-empty-test/proj.android/res/values/strings.xml b/tests/cpp-empty-test/proj.android/res/values/strings.xml new file mode 100644 index 0000000000..7f9d0ba2fd --- /dev/null +++ b/tests/cpp-empty-test/proj.android/res/values/strings.xml @@ -0,0 +1,4 @@ + + + CppEmptyTest + diff --git a/tests/cpp-empty-test/proj.android/src/org/cocos2dx/cpp_empty_test/Cocos2dxActivity.java b/tests/cpp-empty-test/proj.android/src/org/cocos2dx/cpp_empty_test/Cocos2dxActivity.java new file mode 100644 index 0000000000..d2b8e642dd --- /dev/null +++ b/tests/cpp-empty-test/proj.android/src/org/cocos2dx/cpp_empty_test/Cocos2dxActivity.java @@ -0,0 +1,32 @@ +package org.cocos2dx.cpp_empty_test; + +import android.app.NativeActivity; +import android.os.Bundle; + +public class Cocos2dxActivity extends NativeActivity{ + + @Override + protected void onCreate(Bundle savedInstanceState) { + // TODO Auto-generated method stub + super.onCreate(savedInstanceState); + + //For supports translucency + + //1.change "attribs" in cocos\2d\platform\android\nativeactivity.cpp + /*const EGLint attribs[] = { + EGL_SURFACE_TYPE, EGL_WINDOW_BIT, + EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT, + //EGL_BLUE_SIZE, 5, -->delete + //EGL_GREEN_SIZE, 6, -->delete + //EGL_RED_SIZE, 5, -->delete + EGL_BUFFER_SIZE, 32, //-->new field + EGL_DEPTH_SIZE, 16, + EGL_STENCIL_SIZE, 8, + EGL_NONE + };*/ + + //2.Set the format of window + // getWindow().setFormat(PixelFormat.TRANSLUCENT); + + } +} diff --git a/samples/lua-tests/project/proj.ios_mac/ios/AppController.h b/tests/cpp-empty-test/proj.ios/AppController.h similarity index 100% rename from samples/lua-tests/project/proj.ios_mac/ios/AppController.h rename to tests/cpp-empty-test/proj.ios/AppController.h diff --git a/tests/cpp-empty-test/proj.ios/AppController.mm b/tests/cpp-empty-test/proj.ios/AppController.mm new file mode 100644 index 0000000000..c91d512703 --- /dev/null +++ b/tests/cpp-empty-test/proj.ios/AppController.mm @@ -0,0 +1,138 @@ +/**************************************************************************** + Copyright (c) 2010 cocos2d-x.org + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ +#import +#import "AppController.h" +#import "cocos2d.h" +#import "AppDelegate.h" +#import "CCEAGLView.h" +#import "RootViewController.h" + +@implementation AppController + +#pragma mark - +#pragma mark Application lifecycle + +// cocos2d application instance +static AppDelegate s_sharedApplication; + +- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { + + // Override point for customization after application launch. + + // Add the view controller's view to the window and display. + window = [[UIWindow alloc] initWithFrame: [[UIScreen mainScreen] bounds]]; + CCEAGLView *eaglView = [CCEAGLView viewWithFrame: [window bounds] + pixelFormat: kEAGLColorFormatRGBA8 + depthFormat: GL_DEPTH_COMPONENT16 + preserveBackbuffer: NO + sharegroup:nil + multiSampling:NO + numberOfSamples:0]; + + // Use RootViewController manage CCEAGLView + viewController = [[RootViewController alloc] initWithNibName:nil bundle:nil]; + viewController.wantsFullScreenLayout = YES; + viewController.view = eaglView; + + // Set RootViewController to window + if ( [[UIDevice currentDevice].systemVersion floatValue] < 6.0) + { + // warning: addSubView doesn't work on iOS6 + [window addSubview: viewController.view]; + } + else + { + // use this method on ios6 + [window setRootViewController:viewController]; + } + + [window makeKeyAndVisible]; + + [[UIApplication sharedApplication] setStatusBarHidden: YES]; + + // IMPORTANT: Setting the GLView should be done after creating the RootViewController + cocos2d::GLView *glview = cocos2d::GLView::createWithEAGLView(eaglView); + cocos2d::Director::getInstance()->setOpenGLView(glview); + + cocos2d::Application *app = cocos2d::Application::getInstance(); + app->run(); + return YES; +} + + +- (void)applicationWillResignActive:(UIApplication *)application { + /* + Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state. + Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game. + */ + cocos2d::Director::getInstance()->pause(); +} + +- (void)applicationDidBecomeActive:(UIApplication *)application { + /* + Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. + */ + cocos2d::Director::getInstance()->resume(); +} + +- (void)applicationDidEnterBackground:(UIApplication *)application { + /* + Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. + If your application supports background execution, called instead of applicationWillTerminate: when the user quits. + */ + cocos2d::Application::getInstance()->applicationDidEnterBackground(); +} + +- (void)applicationWillEnterForeground:(UIApplication *)application { + /* + Called as part of transition from the background to the inactive state: here you can undo many of the changes made on entering the background. + */ + cocos2d::Application::getInstance()->applicationWillEnterForeground(); +} + +- (void)applicationWillTerminate:(UIApplication *)application { + /* + Called when the application is about to terminate. + See also applicationDidEnterBackground:. + */ +} + + +#pragma mark - +#pragma mark Memory management + +- (void)applicationDidReceiveMemoryWarning:(UIApplication *)application { + /* + Free up as much memory as possible by purging cached data objects that can be recreated (or reloaded from disk) later. + */ +} + + +- (void)dealloc { + [super dealloc]; +} + + +@end + diff --git a/samples/lua-tests/project/proj.ios_mac/ios/Default-568h@2x.png.REMOVED.git-id b/tests/cpp-empty-test/proj.ios/Default-568h@2x.png.REMOVED.git-id similarity index 100% rename from samples/lua-tests/project/proj.ios_mac/ios/Default-568h@2x.png.REMOVED.git-id rename to tests/cpp-empty-test/proj.ios/Default-568h@2x.png.REMOVED.git-id diff --git a/samples/lua-tests/project/proj.ios_mac/ios/Default@2x.png.REMOVED.git-id b/tests/cpp-empty-test/proj.ios/Default@2x.png.REMOVED.git-id similarity index 100% rename from samples/lua-tests/project/proj.ios_mac/ios/Default@2x.png.REMOVED.git-id rename to tests/cpp-empty-test/proj.ios/Default@2x.png.REMOVED.git-id diff --git a/tests/cpp-empty-test/proj.ios/RootViewController.h b/tests/cpp-empty-test/proj.ios/RootViewController.h new file mode 100644 index 0000000000..11dfc4bf88 --- /dev/null +++ b/tests/cpp-empty-test/proj.ios/RootViewController.h @@ -0,0 +1,33 @@ +/**************************************************************************** + Copyright (c) 2010-2011 cocos2d-x.org + Copyright (c) 2010 Ricardo Quesada + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +#import + + +@interface RootViewController : UIViewController { + +} +- (BOOL)prefersStatusBarHidden; +@end diff --git a/tests/cpp-empty-test/proj.ios/RootViewController.mm b/tests/cpp-empty-test/proj.ios/RootViewController.mm new file mode 100644 index 0000000000..4984955c8a --- /dev/null +++ b/tests/cpp-empty-test/proj.ios/RootViewController.mm @@ -0,0 +1,97 @@ +/**************************************************************************** + Copyright (c) 2010-2011 cocos2d-x.org + Copyright (c) 2010 Ricardo Quesada + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +#import "RootViewController.h" + + +@implementation RootViewController + +/* + // The designated initializer. Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad. +- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { + if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) { + // Custom initialization + } + return self; +} +*/ + +/* +// Implement loadView to create a view hierarchy programmatically, without using a nib. +- (void)loadView { +} +*/ + +/* +// Implement viewDidLoad to do additional setup after loading the view, typically from a nib. +- (void)viewDidLoad { + [super viewDidLoad]; +} + +*/ +// Override to allow orientations other than the default portrait orientation. +// This method is deprecated on ios6 +- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { + return UIInterfaceOrientationIsLandscape( interfaceOrientation ); +} + +// For ios6.0 and higher, use supportedInterfaceOrientations & shouldAutorotate instead +- (NSUInteger) supportedInterfaceOrientations +{ +#ifdef __IPHONE_6_0 + return UIInterfaceOrientationMaskAllButUpsideDown; +#endif +} + +- (BOOL) shouldAutorotate { + return YES; +} + +//fix not hide status on ios7 +- (BOOL)prefersStatusBarHidden +{ + return YES; +} + +- (void)didReceiveMemoryWarning { + // Releases the view if it doesn't have a superview. + [super didReceiveMemoryWarning]; + + // Release any cached data, images, etc that aren't in use. +} + +- (void)viewDidUnload { + [super viewDidUnload]; + // Release any retained subviews of the main view. + // e.g. self.myOutlet = nil; +} + + +- (void)dealloc { + [super dealloc]; +} + + +@end diff --git a/tests/cpp-empty-test/proj.ios/main.m b/tests/cpp-empty-test/proj.ios/main.m new file mode 100644 index 0000000000..bd577a036e --- /dev/null +++ b/tests/cpp-empty-test/proj.ios/main.m @@ -0,0 +1,17 @@ +// +// main.m +// iphone +// +// Created by Walzer on 10-11-16. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import + +int main(int argc, char *argv[]) { + + NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init]; + int retVal = UIApplicationMain(argc, argv, nil, @"AppController"); + [pool release]; + return retVal; +} diff --git a/samples/cpp-tests/proj.linux/main.cpp b/tests/cpp-empty-test/proj.linux/main.cpp similarity index 100% rename from samples/cpp-tests/proj.linux/main.cpp rename to tests/cpp-empty-test/proj.linux/main.cpp diff --git a/samples/cpp-tests/proj.mac/Icon.icns.REMOVED.git-id b/tests/cpp-empty-test/proj.mac/Icon.icns.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/proj.mac/Icon.icns.REMOVED.git-id rename to tests/cpp-empty-test/proj.mac/Icon.icns.REMOVED.git-id diff --git a/samples/cpp-tests/proj.mac/en.lproj/InfoPlist.strings b/tests/cpp-empty-test/proj.mac/en.lproj/InfoPlist.strings similarity index 100% rename from samples/cpp-tests/proj.mac/en.lproj/InfoPlist.strings rename to tests/cpp-empty-test/proj.mac/en.lproj/InfoPlist.strings diff --git a/samples/lua-tests/project/proj.ios_mac/mac/en.lproj/MainMenu.xib b/tests/cpp-empty-test/proj.mac/en.lproj/MainMenu.xib similarity index 100% rename from samples/lua-tests/project/proj.ios_mac/mac/en.lproj/MainMenu.xib rename to tests/cpp-empty-test/proj.mac/en.lproj/MainMenu.xib diff --git a/tests/cpp-empty-test/proj.mac/main.cpp b/tests/cpp-empty-test/proj.mac/main.cpp new file mode 100644 index 0000000000..f2bc5c2a4e --- /dev/null +++ b/tests/cpp-empty-test/proj.mac/main.cpp @@ -0,0 +1,34 @@ +/**************************************************************************** + Copyright (c) 2010 cocos2d-x.org + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +#include "AppDelegate.h" + +USING_NS_CC; + +int main(int argc, char *argv[]) +{ + AppDelegate app; + return Application::getInstance()->run(); +} + diff --git a/tests/cpp-empty-test/proj.win32/HelloCpp.vcxproj b/tests/cpp-empty-test/proj.win32/HelloCpp.vcxproj new file mode 100644 index 0000000000..6da099a164 --- /dev/null +++ b/tests/cpp-empty-test/proj.win32/HelloCpp.vcxproj @@ -0,0 +1,147 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {B8BF9E81-35FD-4582-BA1C-B85FA365BABB} + HelloCppwin32 + Win32Proj + + + + Application + Unicode + true + v100 + v110 + v110_xp + + + Application + Unicode + v100 + v110 + v110_xp + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(Configuration).win32\ + $(Configuration).win32\ + true + $(SolutionDir)$(Configuration).win32\ + $(Configuration).win32\ + false + AllRules.ruleset + + + AllRules.ruleset + + + + + $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) + + + $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) + + + + Disabled + ..\Classes;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + 4267;4251;4244;%(DisableSpecificWarnings) + + + $(OutDir)$(ProjectName).exe + $(OutDir);%(AdditionalLibraryDirectories) + true + Windows + MachineX86 + libcocos2d.lib;libchipmunk.lib;%(AdditionalDependencies) + + + + + + + + + MaxSpeed + true + ..\Classes;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + 4267;4251;4244;%(DisableSpecificWarnings) + + + libcocos2d.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName).exe + $(OutDir);%(AdditionalLibraryDirectories) + true + Windows + true + true + MachineX86 + + + + + + + + + + + + + + + + + + + + {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} + false + + + {207bc7a9-ccf1-4f2f-a04d-45f72242ae25} + + + + + + \ No newline at end of file diff --git a/tests/cpp-empty-test/proj.win32/HelloCpp.vcxproj.filters b/tests/cpp-empty-test/proj.win32/HelloCpp.vcxproj.filters new file mode 100644 index 0000000000..eb52c5e24c --- /dev/null +++ b/tests/cpp-empty-test/proj.win32/HelloCpp.vcxproj.filters @@ -0,0 +1,38 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + + + Classes + + + Classes + + + win32 + + + + + Classes + + + Classes + + + win32 + + + Classes + + + \ No newline at end of file diff --git a/samples/cpp-tests/proj.win32/TestCpp.vcxproj.user b/tests/cpp-empty-test/proj.win32/HelloCpp.vcxproj.user similarity index 100% rename from samples/cpp-tests/proj.win32/TestCpp.vcxproj.user rename to tests/cpp-empty-test/proj.win32/HelloCpp.vcxproj.user diff --git a/tests/cpp-empty-test/proj.win32/main.cpp b/tests/cpp-empty-test/proj.win32/main.cpp new file mode 100644 index 0000000000..bcc0e091d4 --- /dev/null +++ b/tests/cpp-empty-test/proj.win32/main.cpp @@ -0,0 +1,20 @@ +#include "main.h" +#include "../Classes/AppDelegate.h" +#include "CCEGLView.h" + +USING_NS_CC; + +int APIENTRY _tWinMain(HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPTSTR lpCmdLine, + int nCmdShow) +{ + UNREFERENCED_PARAMETER(hPrevInstance); + UNREFERENCED_PARAMETER(lpCmdLine); + + // create the application instance + AppDelegate app; + EGLView eglView; + eglView.init("HelloCpp",900,640); + return Application::getInstance()->run(); +} diff --git a/samples/cpp-tests/proj.win32/main.h b/tests/cpp-empty-test/proj.win32/main.h similarity index 100% rename from samples/cpp-tests/proj.win32/main.h rename to tests/cpp-empty-test/proj.win32/main.h diff --git a/samples/cpp-tests/Android.mk b/tests/cpp-tests/Android.mk similarity index 99% rename from samples/cpp-tests/Android.mk rename to tests/cpp-tests/Android.mk index befb3222f1..c2d2c02978 100644 --- a/samples/cpp-tests/Android.mk +++ b/tests/cpp-tests/Android.mk @@ -2,9 +2,9 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE := cocos_testcpp_common +LOCAL_MODULE := cocos_cpp_tests_common -LOCAL_MODULE_FILENAME := libtestcppcommon +LOCAL_MODULE_FILENAME := libcpp_tests_common LOCAL_SRC_FILES := \ Classes/AppDelegate.cpp \ diff --git a/samples/cpp-tests/CMakeLists.txt b/tests/cpp-tests/CMakeLists.txt similarity index 99% rename from samples/cpp-tests/CMakeLists.txt rename to tests/cpp-tests/CMakeLists.txt index 8f16bf350d..7a36508532 100644 --- a/samples/cpp-tests/CMakeLists.txt +++ b/tests/cpp-tests/CMakeLists.txt @@ -1,4 +1,4 @@ -set(APP_NAME testcpp) +set(APP_NAME cpp-tests) if(WIN32) set(PLATFORM_SRC diff --git a/samples/cpp-tests/Classes/AccelerometerTest/AccelerometerTest.cpp b/tests/cpp-tests/Classes/AccelerometerTest/AccelerometerTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/AccelerometerTest/AccelerometerTest.cpp rename to tests/cpp-tests/Classes/AccelerometerTest/AccelerometerTest.cpp diff --git a/samples/cpp-tests/Classes/AccelerometerTest/AccelerometerTest.h b/tests/cpp-tests/Classes/AccelerometerTest/AccelerometerTest.h similarity index 100% rename from samples/cpp-tests/Classes/AccelerometerTest/AccelerometerTest.h rename to tests/cpp-tests/Classes/AccelerometerTest/AccelerometerTest.h diff --git a/samples/cpp-tests/Classes/ActionManagerTest/ActionManagerTest.cpp b/tests/cpp-tests/Classes/ActionManagerTest/ActionManagerTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ActionManagerTest/ActionManagerTest.cpp rename to tests/cpp-tests/Classes/ActionManagerTest/ActionManagerTest.cpp diff --git a/samples/cpp-tests/Classes/ActionManagerTest/ActionManagerTest.h b/tests/cpp-tests/Classes/ActionManagerTest/ActionManagerTest.h similarity index 100% rename from samples/cpp-tests/Classes/ActionManagerTest/ActionManagerTest.h rename to tests/cpp-tests/Classes/ActionManagerTest/ActionManagerTest.h diff --git a/samples/cpp-tests/Classes/ActionsEaseTest/ActionsEaseTest.cpp b/tests/cpp-tests/Classes/ActionsEaseTest/ActionsEaseTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ActionsEaseTest/ActionsEaseTest.cpp rename to tests/cpp-tests/Classes/ActionsEaseTest/ActionsEaseTest.cpp diff --git a/samples/cpp-tests/Classes/ActionsEaseTest/ActionsEaseTest.h b/tests/cpp-tests/Classes/ActionsEaseTest/ActionsEaseTest.h similarity index 100% rename from samples/cpp-tests/Classes/ActionsEaseTest/ActionsEaseTest.h rename to tests/cpp-tests/Classes/ActionsEaseTest/ActionsEaseTest.h diff --git a/samples/cpp-tests/Classes/ActionsProgressTest/ActionsProgressTest.cpp b/tests/cpp-tests/Classes/ActionsProgressTest/ActionsProgressTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ActionsProgressTest/ActionsProgressTest.cpp rename to tests/cpp-tests/Classes/ActionsProgressTest/ActionsProgressTest.cpp diff --git a/samples/cpp-tests/Classes/ActionsProgressTest/ActionsProgressTest.h b/tests/cpp-tests/Classes/ActionsProgressTest/ActionsProgressTest.h similarity index 100% rename from samples/cpp-tests/Classes/ActionsProgressTest/ActionsProgressTest.h rename to tests/cpp-tests/Classes/ActionsProgressTest/ActionsProgressTest.h diff --git a/samples/cpp-tests/Classes/ActionsTest/ActionsTest.cpp b/tests/cpp-tests/Classes/ActionsTest/ActionsTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ActionsTest/ActionsTest.cpp rename to tests/cpp-tests/Classes/ActionsTest/ActionsTest.cpp diff --git a/samples/cpp-tests/Classes/ActionsTest/ActionsTest.h b/tests/cpp-tests/Classes/ActionsTest/ActionsTest.h similarity index 100% rename from samples/cpp-tests/Classes/ActionsTest/ActionsTest.h rename to tests/cpp-tests/Classes/ActionsTest/ActionsTest.h diff --git a/samples/cpp-tests/Classes/AppDelegate.cpp b/tests/cpp-tests/Classes/AppDelegate.cpp similarity index 99% rename from samples/cpp-tests/Classes/AppDelegate.cpp rename to tests/cpp-tests/Classes/AppDelegate.cpp index 0572386d9c..d62b6c9ef9 100644 --- a/samples/cpp-tests/Classes/AppDelegate.cpp +++ b/tests/cpp-tests/Classes/AppDelegate.cpp @@ -54,7 +54,7 @@ bool AppDelegate::applicationDidFinishLaunching() auto director = Director::getInstance(); auto glview = director->getOpenGLView(); if(!glview) { - glview = GLView::create("Test Cpp"); + glview = GLView::create("Cpp Tests"); director->setOpenGLView(glview); } diff --git a/samples/cpp-tests/Classes/AppDelegate.h b/tests/cpp-tests/Classes/AppDelegate.h similarity index 100% rename from samples/cpp-tests/Classes/AppDelegate.h rename to tests/cpp-tests/Classes/AppDelegate.h diff --git a/samples/cpp-tests/Classes/BaseTest.cpp b/tests/cpp-tests/Classes/BaseTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/BaseTest.cpp rename to tests/cpp-tests/Classes/BaseTest.cpp diff --git a/samples/cpp-tests/Classes/BaseTest.h b/tests/cpp-tests/Classes/BaseTest.h similarity index 100% rename from samples/cpp-tests/Classes/BaseTest.h rename to tests/cpp-tests/Classes/BaseTest.h diff --git a/samples/cpp-tests/Classes/Box2DTest/Box2dTest.cpp b/tests/cpp-tests/Classes/Box2DTest/Box2dTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/Box2DTest/Box2dTest.cpp rename to tests/cpp-tests/Classes/Box2DTest/Box2dTest.cpp diff --git a/samples/cpp-tests/Classes/Box2DTest/Box2dTest.h b/tests/cpp-tests/Classes/Box2DTest/Box2dTest.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTest/Box2dTest.h rename to tests/cpp-tests/Classes/Box2DTest/Box2dTest.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Box2dView.cpp b/tests/cpp-tests/Classes/Box2DTestBed/Box2dView.cpp similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Box2dView.cpp rename to tests/cpp-tests/Classes/Box2DTestBed/Box2dView.cpp diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Box2dView.h b/tests/cpp-tests/Classes/Box2DTestBed/Box2dView.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Box2dView.h rename to tests/cpp-tests/Classes/Box2DTestBed/Box2dView.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/GLES-Render.cpp b/tests/cpp-tests/Classes/Box2DTestBed/GLES-Render.cpp similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/GLES-Render.cpp rename to tests/cpp-tests/Classes/Box2DTestBed/GLES-Render.cpp diff --git a/samples/cpp-tests/Classes/Box2DTestBed/GLES-Render.h b/tests/cpp-tests/Classes/Box2DTestBed/GLES-Render.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/GLES-Render.h rename to tests/cpp-tests/Classes/Box2DTestBed/GLES-Render.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Test.cpp b/tests/cpp-tests/Classes/Box2DTestBed/Test.cpp similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Test.cpp rename to tests/cpp-tests/Classes/Box2DTestBed/Test.cpp diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Test.h b/tests/cpp-tests/Classes/Box2DTestBed/Test.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Test.h rename to tests/cpp-tests/Classes/Box2DTestBed/Test.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/TestEntries.cpp b/tests/cpp-tests/Classes/Box2DTestBed/TestEntries.cpp similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/TestEntries.cpp rename to tests/cpp-tests/Classes/Box2DTestBed/TestEntries.cpp diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/AddPair.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/AddPair.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/AddPair.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/AddPair.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/ApplyForce.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/ApplyForce.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/ApplyForce.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/ApplyForce.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/BodyTypes.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/BodyTypes.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/BodyTypes.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/BodyTypes.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/Breakable.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/Breakable.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/Breakable.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/Breakable.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/Bridge.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/Bridge.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/Bridge.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/Bridge.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/BulletTest.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/BulletTest.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/BulletTest.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/BulletTest.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/Cantilever.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/Cantilever.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/Cantilever.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/Cantilever.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/Car.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/Car.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/Car.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/Car.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/Chain.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/Chain.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/Chain.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/Chain.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/CharacterCollision.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/CharacterCollision.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/CharacterCollision.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/CharacterCollision.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/CollisionFiltering.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/CollisionFiltering.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/CollisionFiltering.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/CollisionFiltering.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/CollisionProcessing.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/CollisionProcessing.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/CollisionProcessing.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/CollisionProcessing.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/CompoundShapes.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/CompoundShapes.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/CompoundShapes.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/CompoundShapes.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/Confined.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/Confined.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/Confined.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/Confined.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/ContinuousTest.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/ContinuousTest.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/ContinuousTest.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/ContinuousTest.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/ConvexHull.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/ConvexHull.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/ConvexHull.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/ConvexHull.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/ConveyorBelt.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/ConveyorBelt.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/ConveyorBelt.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/ConveyorBelt.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/DistanceTest.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/DistanceTest.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/DistanceTest.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/DistanceTest.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/Dominos.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/Dominos.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/Dominos.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/Dominos.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/DumpShell.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/DumpShell.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/DumpShell.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/DumpShell.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/DynamicTreeTest.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/DynamicTreeTest.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/DynamicTreeTest.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/DynamicTreeTest.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/EdgeShapes.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/EdgeShapes.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/EdgeShapes.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/EdgeShapes.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/EdgeTest.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/EdgeTest.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/EdgeTest.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/EdgeTest.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/Gears.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/Gears.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/Gears.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/Gears.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/Mobile.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/Mobile.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/Mobile.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/Mobile.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/MobileBalanced.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/MobileBalanced.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/MobileBalanced.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/MobileBalanced.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/MotorJoint.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/MotorJoint.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/MotorJoint.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/MotorJoint.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/OneSidedPlatform.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/OneSidedPlatform.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/OneSidedPlatform.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/OneSidedPlatform.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/Pinball.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/Pinball.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/Pinball.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/Pinball.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/PolyCollision.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/PolyCollision.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/PolyCollision.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/PolyCollision.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/PolyShapes.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/PolyShapes.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/PolyShapes.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/PolyShapes.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/Prismatic.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/Prismatic.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/Prismatic.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/Prismatic.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/Pulleys.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/Pulleys.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/Pulleys.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/Pulleys.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/Pyramid.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/Pyramid.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/Pyramid.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/Pyramid.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/RayCast.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/RayCast.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/RayCast.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/RayCast.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/Revolute.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/Revolute.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/Revolute.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/Revolute.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/Rope.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/Rope.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/Rope.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/Rope.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/RopeJoint.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/RopeJoint.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/RopeJoint.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/RopeJoint.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/SensorTest.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/SensorTest.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/SensorTest.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/SensorTest.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/ShapeEditing.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/ShapeEditing.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/ShapeEditing.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/ShapeEditing.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/SliderCrank.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/SliderCrank.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/SliderCrank.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/SliderCrank.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/SphereStack.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/SphereStack.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/SphereStack.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/SphereStack.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/TheoJansen.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/TheoJansen.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/TheoJansen.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/TheoJansen.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/Tiles.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/Tiles.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/Tiles.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/Tiles.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/TimeOfImpact.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/TimeOfImpact.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/TimeOfImpact.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/TimeOfImpact.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/Tumbler.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/Tumbler.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/Tumbler.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/Tumbler.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/VaryingFriction.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/VaryingFriction.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/VaryingFriction.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/VaryingFriction.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/VaryingRestitution.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/VaryingRestitution.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/VaryingRestitution.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/VaryingRestitution.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/VerticalStack.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/VerticalStack.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/VerticalStack.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/VerticalStack.h diff --git a/samples/cpp-tests/Classes/Box2DTestBed/Tests/Web.h b/tests/cpp-tests/Classes/Box2DTestBed/Tests/Web.h similarity index 100% rename from samples/cpp-tests/Classes/Box2DTestBed/Tests/Web.h rename to tests/cpp-tests/Classes/Box2DTestBed/Tests/Web.h diff --git a/samples/cpp-tests/Classes/BugsTest/Bug-1159.cpp b/tests/cpp-tests/Classes/BugsTest/Bug-1159.cpp similarity index 100% rename from samples/cpp-tests/Classes/BugsTest/Bug-1159.cpp rename to tests/cpp-tests/Classes/BugsTest/Bug-1159.cpp diff --git a/samples/cpp-tests/Classes/BugsTest/Bug-1159.h b/tests/cpp-tests/Classes/BugsTest/Bug-1159.h similarity index 100% rename from samples/cpp-tests/Classes/BugsTest/Bug-1159.h rename to tests/cpp-tests/Classes/BugsTest/Bug-1159.h diff --git a/samples/cpp-tests/Classes/BugsTest/Bug-1174.cpp b/tests/cpp-tests/Classes/BugsTest/Bug-1174.cpp similarity index 100% rename from samples/cpp-tests/Classes/BugsTest/Bug-1174.cpp rename to tests/cpp-tests/Classes/BugsTest/Bug-1174.cpp diff --git a/samples/cpp-tests/Classes/BugsTest/Bug-1174.h b/tests/cpp-tests/Classes/BugsTest/Bug-1174.h similarity index 100% rename from samples/cpp-tests/Classes/BugsTest/Bug-1174.h rename to tests/cpp-tests/Classes/BugsTest/Bug-1174.h diff --git a/samples/cpp-tests/Classes/BugsTest/Bug-350.cpp b/tests/cpp-tests/Classes/BugsTest/Bug-350.cpp similarity index 100% rename from samples/cpp-tests/Classes/BugsTest/Bug-350.cpp rename to tests/cpp-tests/Classes/BugsTest/Bug-350.cpp diff --git a/samples/cpp-tests/Classes/BugsTest/Bug-350.h b/tests/cpp-tests/Classes/BugsTest/Bug-350.h similarity index 100% rename from samples/cpp-tests/Classes/BugsTest/Bug-350.h rename to tests/cpp-tests/Classes/BugsTest/Bug-350.h diff --git a/samples/cpp-tests/Classes/BugsTest/Bug-422.cpp b/tests/cpp-tests/Classes/BugsTest/Bug-422.cpp similarity index 100% rename from samples/cpp-tests/Classes/BugsTest/Bug-422.cpp rename to tests/cpp-tests/Classes/BugsTest/Bug-422.cpp diff --git a/samples/cpp-tests/Classes/BugsTest/Bug-422.h b/tests/cpp-tests/Classes/BugsTest/Bug-422.h similarity index 100% rename from samples/cpp-tests/Classes/BugsTest/Bug-422.h rename to tests/cpp-tests/Classes/BugsTest/Bug-422.h diff --git a/samples/cpp-tests/Classes/BugsTest/Bug-458/Bug-458.cpp b/tests/cpp-tests/Classes/BugsTest/Bug-458/Bug-458.cpp similarity index 100% rename from samples/cpp-tests/Classes/BugsTest/Bug-458/Bug-458.cpp rename to tests/cpp-tests/Classes/BugsTest/Bug-458/Bug-458.cpp diff --git a/samples/cpp-tests/Classes/BugsTest/Bug-458/Bug-458.h b/tests/cpp-tests/Classes/BugsTest/Bug-458/Bug-458.h similarity index 100% rename from samples/cpp-tests/Classes/BugsTest/Bug-458/Bug-458.h rename to tests/cpp-tests/Classes/BugsTest/Bug-458/Bug-458.h diff --git a/samples/cpp-tests/Classes/BugsTest/Bug-458/QuestionContainerSprite.cpp b/tests/cpp-tests/Classes/BugsTest/Bug-458/QuestionContainerSprite.cpp similarity index 100% rename from samples/cpp-tests/Classes/BugsTest/Bug-458/QuestionContainerSprite.cpp rename to tests/cpp-tests/Classes/BugsTest/Bug-458/QuestionContainerSprite.cpp diff --git a/samples/cpp-tests/Classes/BugsTest/Bug-458/QuestionContainerSprite.h b/tests/cpp-tests/Classes/BugsTest/Bug-458/QuestionContainerSprite.h similarity index 100% rename from samples/cpp-tests/Classes/BugsTest/Bug-458/QuestionContainerSprite.h rename to tests/cpp-tests/Classes/BugsTest/Bug-458/QuestionContainerSprite.h diff --git a/samples/cpp-tests/Classes/BugsTest/Bug-624.cpp b/tests/cpp-tests/Classes/BugsTest/Bug-624.cpp similarity index 100% rename from samples/cpp-tests/Classes/BugsTest/Bug-624.cpp rename to tests/cpp-tests/Classes/BugsTest/Bug-624.cpp diff --git a/samples/cpp-tests/Classes/BugsTest/Bug-624.h b/tests/cpp-tests/Classes/BugsTest/Bug-624.h similarity index 100% rename from samples/cpp-tests/Classes/BugsTest/Bug-624.h rename to tests/cpp-tests/Classes/BugsTest/Bug-624.h diff --git a/samples/cpp-tests/Classes/BugsTest/Bug-886.cpp b/tests/cpp-tests/Classes/BugsTest/Bug-886.cpp similarity index 100% rename from samples/cpp-tests/Classes/BugsTest/Bug-886.cpp rename to tests/cpp-tests/Classes/BugsTest/Bug-886.cpp diff --git a/samples/cpp-tests/Classes/BugsTest/Bug-886.h b/tests/cpp-tests/Classes/BugsTest/Bug-886.h similarity index 100% rename from samples/cpp-tests/Classes/BugsTest/Bug-886.h rename to tests/cpp-tests/Classes/BugsTest/Bug-886.h diff --git a/samples/cpp-tests/Classes/BugsTest/Bug-899.cpp b/tests/cpp-tests/Classes/BugsTest/Bug-899.cpp similarity index 100% rename from samples/cpp-tests/Classes/BugsTest/Bug-899.cpp rename to tests/cpp-tests/Classes/BugsTest/Bug-899.cpp diff --git a/samples/cpp-tests/Classes/BugsTest/Bug-899.h b/tests/cpp-tests/Classes/BugsTest/Bug-899.h similarity index 100% rename from samples/cpp-tests/Classes/BugsTest/Bug-899.h rename to tests/cpp-tests/Classes/BugsTest/Bug-899.h diff --git a/samples/cpp-tests/Classes/BugsTest/Bug-914.cpp b/tests/cpp-tests/Classes/BugsTest/Bug-914.cpp similarity index 100% rename from samples/cpp-tests/Classes/BugsTest/Bug-914.cpp rename to tests/cpp-tests/Classes/BugsTest/Bug-914.cpp diff --git a/samples/cpp-tests/Classes/BugsTest/Bug-914.h b/tests/cpp-tests/Classes/BugsTest/Bug-914.h similarity index 100% rename from samples/cpp-tests/Classes/BugsTest/Bug-914.h rename to tests/cpp-tests/Classes/BugsTest/Bug-914.h diff --git a/samples/cpp-tests/Classes/BugsTest/BugsTest.cpp b/tests/cpp-tests/Classes/BugsTest/BugsTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/BugsTest/BugsTest.cpp rename to tests/cpp-tests/Classes/BugsTest/BugsTest.cpp diff --git a/samples/cpp-tests/Classes/BugsTest/BugsTest.h b/tests/cpp-tests/Classes/BugsTest/BugsTest.h similarity index 100% rename from samples/cpp-tests/Classes/BugsTest/BugsTest.h rename to tests/cpp-tests/Classes/BugsTest/BugsTest.h diff --git a/samples/cpp-tests/Classes/ChipmunkTest/ChipmunkTest.cpp b/tests/cpp-tests/Classes/ChipmunkTest/ChipmunkTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ChipmunkTest/ChipmunkTest.cpp rename to tests/cpp-tests/Classes/ChipmunkTest/ChipmunkTest.cpp diff --git a/samples/cpp-tests/Classes/ChipmunkTest/ChipmunkTest.h b/tests/cpp-tests/Classes/ChipmunkTest/ChipmunkTest.h similarity index 100% rename from samples/cpp-tests/Classes/ChipmunkTest/ChipmunkTest.h rename to tests/cpp-tests/Classes/ChipmunkTest/ChipmunkTest.h diff --git a/samples/cpp-tests/Classes/ClickAndMoveTest/ClickAndMoveTest.cpp b/tests/cpp-tests/Classes/ClickAndMoveTest/ClickAndMoveTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ClickAndMoveTest/ClickAndMoveTest.cpp rename to tests/cpp-tests/Classes/ClickAndMoveTest/ClickAndMoveTest.cpp diff --git a/samples/cpp-tests/Classes/ClickAndMoveTest/ClickAndMoveTest.h b/tests/cpp-tests/Classes/ClickAndMoveTest/ClickAndMoveTest.h similarity index 100% rename from samples/cpp-tests/Classes/ClickAndMoveTest/ClickAndMoveTest.h rename to tests/cpp-tests/Classes/ClickAndMoveTest/ClickAndMoveTest.h diff --git a/samples/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp b/tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp rename to tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp diff --git a/samples/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.h b/tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.h similarity index 100% rename from samples/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.h rename to tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.h diff --git a/samples/cpp-tests/Classes/CocosDenshionTest/CocosDenshionTest.cpp b/tests/cpp-tests/Classes/CocosDenshionTest/CocosDenshionTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/CocosDenshionTest/CocosDenshionTest.cpp rename to tests/cpp-tests/Classes/CocosDenshionTest/CocosDenshionTest.cpp diff --git a/samples/cpp-tests/Classes/CocosDenshionTest/CocosDenshionTest.h b/tests/cpp-tests/Classes/CocosDenshionTest/CocosDenshionTest.h similarity index 100% rename from samples/cpp-tests/Classes/CocosDenshionTest/CocosDenshionTest.h rename to tests/cpp-tests/Classes/CocosDenshionTest/CocosDenshionTest.h diff --git a/samples/cpp-tests/Classes/ConfigurationTest/ConfigurationTest.cpp b/tests/cpp-tests/Classes/ConfigurationTest/ConfigurationTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ConfigurationTest/ConfigurationTest.cpp rename to tests/cpp-tests/Classes/ConfigurationTest/ConfigurationTest.cpp diff --git a/samples/cpp-tests/Classes/ConfigurationTest/ConfigurationTest.h b/tests/cpp-tests/Classes/ConfigurationTest/ConfigurationTest.h similarity index 100% rename from samples/cpp-tests/Classes/ConfigurationTest/ConfigurationTest.h rename to tests/cpp-tests/Classes/ConfigurationTest/ConfigurationTest.h diff --git a/samples/cpp-tests/Classes/ConsoleTest/ConsoleTest.cpp b/tests/cpp-tests/Classes/ConsoleTest/ConsoleTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ConsoleTest/ConsoleTest.cpp rename to tests/cpp-tests/Classes/ConsoleTest/ConsoleTest.cpp diff --git a/samples/cpp-tests/Classes/ConsoleTest/ConsoleTest.h b/tests/cpp-tests/Classes/ConsoleTest/ConsoleTest.h similarity index 100% rename from samples/cpp-tests/Classes/ConsoleTest/ConsoleTest.h rename to tests/cpp-tests/Classes/ConsoleTest/ConsoleTest.h diff --git a/samples/cpp-tests/Classes/CurlTest/CurlTest.cpp b/tests/cpp-tests/Classes/CurlTest/CurlTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/CurlTest/CurlTest.cpp rename to tests/cpp-tests/Classes/CurlTest/CurlTest.cpp diff --git a/samples/cpp-tests/Classes/CurlTest/CurlTest.h b/tests/cpp-tests/Classes/CurlTest/CurlTest.h similarity index 100% rename from samples/cpp-tests/Classes/CurlTest/CurlTest.h rename to tests/cpp-tests/Classes/CurlTest/CurlTest.h diff --git a/samples/cpp-tests/Classes/CurrentLanguageTest/CurrentLanguageTest.cpp b/tests/cpp-tests/Classes/CurrentLanguageTest/CurrentLanguageTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/CurrentLanguageTest/CurrentLanguageTest.cpp rename to tests/cpp-tests/Classes/CurrentLanguageTest/CurrentLanguageTest.cpp diff --git a/samples/cpp-tests/Classes/CurrentLanguageTest/CurrentLanguageTest.h b/tests/cpp-tests/Classes/CurrentLanguageTest/CurrentLanguageTest.h similarity index 100% rename from samples/cpp-tests/Classes/CurrentLanguageTest/CurrentLanguageTest.h rename to tests/cpp-tests/Classes/CurrentLanguageTest/CurrentLanguageTest.h diff --git a/samples/cpp-tests/Classes/DataVisitorTest/DataVisitorTest.cpp b/tests/cpp-tests/Classes/DataVisitorTest/DataVisitorTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/DataVisitorTest/DataVisitorTest.cpp rename to tests/cpp-tests/Classes/DataVisitorTest/DataVisitorTest.cpp diff --git a/samples/cpp-tests/Classes/DataVisitorTest/DataVisitorTest.h b/tests/cpp-tests/Classes/DataVisitorTest/DataVisitorTest.h similarity index 100% rename from samples/cpp-tests/Classes/DataVisitorTest/DataVisitorTest.h rename to tests/cpp-tests/Classes/DataVisitorTest/DataVisitorTest.h diff --git a/samples/cpp-tests/Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp b/tests/cpp-tests/Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp rename to tests/cpp-tests/Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp diff --git a/samples/cpp-tests/Classes/DrawPrimitivesTest/DrawPrimitivesTest.h b/tests/cpp-tests/Classes/DrawPrimitivesTest/DrawPrimitivesTest.h similarity index 100% rename from samples/cpp-tests/Classes/DrawPrimitivesTest/DrawPrimitivesTest.h rename to tests/cpp-tests/Classes/DrawPrimitivesTest/DrawPrimitivesTest.h diff --git a/samples/cpp-tests/Classes/EffectsAdvancedTest/EffectsAdvancedTest.cpp b/tests/cpp-tests/Classes/EffectsAdvancedTest/EffectsAdvancedTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/EffectsAdvancedTest/EffectsAdvancedTest.cpp rename to tests/cpp-tests/Classes/EffectsAdvancedTest/EffectsAdvancedTest.cpp diff --git a/samples/cpp-tests/Classes/EffectsAdvancedTest/EffectsAdvancedTest.h b/tests/cpp-tests/Classes/EffectsAdvancedTest/EffectsAdvancedTest.h similarity index 100% rename from samples/cpp-tests/Classes/EffectsAdvancedTest/EffectsAdvancedTest.h rename to tests/cpp-tests/Classes/EffectsAdvancedTest/EffectsAdvancedTest.h diff --git a/samples/cpp-tests/Classes/EffectsTest/EffectsTest.cpp b/tests/cpp-tests/Classes/EffectsTest/EffectsTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/EffectsTest/EffectsTest.cpp rename to tests/cpp-tests/Classes/EffectsTest/EffectsTest.cpp diff --git a/samples/cpp-tests/Classes/EffectsTest/EffectsTest.h b/tests/cpp-tests/Classes/EffectsTest/EffectsTest.h similarity index 100% rename from samples/cpp-tests/Classes/EffectsTest/EffectsTest.h rename to tests/cpp-tests/Classes/EffectsTest/EffectsTest.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CocoStudioGUITest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CocoStudioGUITest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CocoStudioGUITest.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CocoStudioGUITest.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CocoStudioGUITest.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CocoStudioGUITest.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CocoStudioGUITest.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CocoStudioGUITest.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomGUIScene.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomGUIScene.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomGUIScene.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomGUIScene.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomGUIScene.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomGUIScene.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomGUIScene.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomGUIScene.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomTest/CustomImageTest/CustomImageTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomTest/CustomImageTest/CustomImageTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomTest/CustomImageTest/CustomImageTest.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomTest/CustomImageTest/CustomImageTest.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomTest/CustomImageTest/CustomImageTest.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomTest/CustomImageTest/CustomImageTest.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomTest/CustomImageTest/CustomImageTest.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomTest/CustomImageTest/CustomImageTest.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomTest/CustomParticleWidgetTest/CustomParticleWidgetTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomTest/CustomParticleWidgetTest/CustomParticleWidgetTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomTest/CustomParticleWidgetTest/CustomParticleWidgetTest.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomTest/CustomParticleWidgetTest/CustomParticleWidgetTest.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomTest/CustomParticleWidgetTest/CustomParticleWidgetTest.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomTest/CustomParticleWidgetTest/CustomParticleWidgetTest.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomTest/CustomParticleWidgetTest/CustomParticleWidgetTest.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomTest/CustomParticleWidgetTest/CustomParticleWidgetTest.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageView.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageView.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageView.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageView.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageView.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageView.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageView.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageView.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageViewReader.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageViewReader.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageViewReader.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageViewReader.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageViewReader.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageViewReader.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageViewReader.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageViewReader.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomParticleWidget.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomParticleWidget.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomParticleWidget.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomParticleWidget.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomParticleWidget.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomParticleWidget.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomParticleWidget.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomParticleWidget.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomParticleWidgetReader.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomParticleWidgetReader.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomParticleWidgetReader.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomParticleWidgetReader.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomParticleWidgetReader.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomParticleWidgetReader.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomParticleWidgetReader.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomParticleWidgetReader.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomReader.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomReader.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomReader.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomReader.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomReader.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomReader.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomReader.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomReader.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/GUIEditorTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/GUIEditorTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/GUIEditorTest.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/GUIEditorTest.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/GUIEditorTest.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/GUIEditorTest.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/GUIEditorTest.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/GUIEditorTest.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest_Editor.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest_Editor.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest_Editor.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest_Editor.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest_Editor.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest_Editor.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest_Editor.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest_Editor.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest_Editor.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest_Editor.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest_Editor.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest_Editor.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest_Editor.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest_Editor.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest_Editor.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest_Editor.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest_Editor.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest_Editor.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest_Editor.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest_Editor.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest_Editor.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest_Editor.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest_Editor.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest_Editor.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest_Editor.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest_Editor.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest_Editor.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest_Editor.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest_Editor.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest_Editor.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest_Editor.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest_Editor.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest_Editor.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest_Editor.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest_Editor.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest_Editor.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest_Editor.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest_Editor.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest_Editor.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest_Editor.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager_Editor.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager_Editor.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager_Editor.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager_Editor.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager_Editor.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager_Editor.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager_Editor.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager_Editor.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene_Editor.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene_Editor.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene_Editor.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene_Editor.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene_Editor.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene_Editor.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene_Editor.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene_Editor.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest_Editor.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest_Editor.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest_Editor.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest_Editor.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest_Editor.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest_Editor.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest_Editor.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest_Editor.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest_Editor.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest_Editor.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest_Editor.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest_Editor.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest_Editor.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest_Editor.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest_Editor.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest_Editor.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest_Editor.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest_Editor.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest_Editor.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest_Editor.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest_Editor.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest_Editor.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest_Editor.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest_Editor.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextTest/UITextTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextTest/UITextTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextTest/UITextTest.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextTest/UITextTest.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextTest/UITextTest.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextTest/UITextTest.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextTest/UITextTest.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextTest/UITextTest.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextTest/UITextTest_Editor.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextTest/UITextTest_Editor.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextTest/UITextTest_Editor.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextTest/UITextTest_Editor.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextTest/UITextTest_Editor.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextTest/UITextTest_Editor.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextTest/UITextTest_Editor.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextTest/UITextTest_Editor.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest_Editor.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest_Editor.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest_Editor.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest_Editor.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest_Editor.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest_Editor.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest_Editor.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest_Editor.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/EventDef.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/EventDef.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/EventDef.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/EventDef.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsLayerLoader.h b/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsLayerLoader.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsLayerLoader.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsLayerLoader.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.h b/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.h b/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayerLoader.h b/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayerLoader.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayerLoader.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayerLoader.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.h b/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.h b/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayerLoader.h b/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayerLoader.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayerLoader.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayerLoader.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayer.h b/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayer.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayer.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayer.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayerLoader.h b/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayerLoader.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayerLoader.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayerLoader.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.h b/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayerLoader.h b/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayerLoader.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayerLoader.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayerLoader.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayer.h b/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayer.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayer.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayer.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayerLoader.h b/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayerLoader.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayerLoader.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayerLoader.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayer.h b/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayer.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayer.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayer.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayerLoader.h b/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayerLoader.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayerLoader.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayerLoader.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayer.h b/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayer.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayer.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayer.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayerLoader.h b/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayerLoader.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayerLoader.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayerLoader.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.h b/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayerLoader.h b/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayerLoader.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayerLoader.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayerLoader.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackLayerLoader.h b/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackLayerLoader.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackLayerLoader.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackLayerLoader.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.h b/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.h rename to tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.h b/tests/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.h rename to tests/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.h b/tests/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.h rename to tests/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.h b/tests/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.h rename to tests/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.cpp b/tests/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.h b/tests/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.h rename to tests/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.cpp b/tests/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.h b/tests/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.h rename to tests/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.h b/tests/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.h rename to tests/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.h b/tests/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.h rename to tests/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.h b/tests/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.h rename to tests/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.h b/tests/cpp-tests/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.h rename to tests/cpp-tests/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/ExtensionsTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/ExtensionsTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/ExtensionsTest.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/ExtensionsTest.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/ExtensionsTest.h b/tests/cpp-tests/Classes/ExtensionsTest/ExtensionsTest.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/ExtensionsTest.h rename to tests/cpp-tests/Classes/ExtensionsTest/ExtensionsTest.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/NetworkTest/HttpClientTest.h b/tests/cpp-tests/Classes/ExtensionsTest/NetworkTest/HttpClientTest.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/NetworkTest/HttpClientTest.h rename to tests/cpp-tests/Classes/ExtensionsTest/NetworkTest/HttpClientTest.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/NetworkTest/SocketIOTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/NetworkTest/SocketIOTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/NetworkTest/SocketIOTest.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/NetworkTest/SocketIOTest.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/NetworkTest/SocketIOTest.h b/tests/cpp-tests/Classes/ExtensionsTest/NetworkTest/SocketIOTest.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/NetworkTest/SocketIOTest.h rename to tests/cpp-tests/Classes/ExtensionsTest/NetworkTest/SocketIOTest.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/NetworkTest/WebSocketTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/NetworkTest/WebSocketTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/NetworkTest/WebSocketTest.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/NetworkTest/WebSocketTest.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/NetworkTest/WebSocketTest.h b/tests/cpp-tests/Classes/ExtensionsTest/NetworkTest/WebSocketTest.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/NetworkTest/WebSocketTest.h rename to tests/cpp-tests/Classes/ExtensionsTest/NetworkTest/WebSocketTest.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.h b/tests/cpp-tests/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.h rename to tests/cpp-tests/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.h b/tests/cpp-tests/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.h rename to tests/cpp-tests/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.cpp b/tests/cpp-tests/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.h b/tests/cpp-tests/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.h rename to tests/cpp-tests/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.h diff --git a/samples/cpp-tests/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.cpp b/tests/cpp-tests/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.cpp similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.cpp rename to tests/cpp-tests/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.cpp diff --git a/samples/cpp-tests/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.h b/tests/cpp-tests/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.h similarity index 100% rename from samples/cpp-tests/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.h rename to tests/cpp-tests/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.h diff --git a/samples/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.cpp b/tests/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.cpp rename to tests/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.cpp diff --git a/samples/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.h b/tests/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.h similarity index 100% rename from samples/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.h rename to tests/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.h diff --git a/samples/cpp-tests/Classes/FontTest/FontTest.cpp b/tests/cpp-tests/Classes/FontTest/FontTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/FontTest/FontTest.cpp rename to tests/cpp-tests/Classes/FontTest/FontTest.cpp diff --git a/samples/cpp-tests/Classes/FontTest/FontTest.h b/tests/cpp-tests/Classes/FontTest/FontTest.h similarity index 100% rename from samples/cpp-tests/Classes/FontTest/FontTest.h rename to tests/cpp-tests/Classes/FontTest/FontTest.h diff --git a/samples/cpp-tests/Classes/InputTest/MouseTest.cpp b/tests/cpp-tests/Classes/InputTest/MouseTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/InputTest/MouseTest.cpp rename to tests/cpp-tests/Classes/InputTest/MouseTest.cpp diff --git a/samples/cpp-tests/Classes/InputTest/MouseTest.h b/tests/cpp-tests/Classes/InputTest/MouseTest.h similarity index 100% rename from samples/cpp-tests/Classes/InputTest/MouseTest.h rename to tests/cpp-tests/Classes/InputTest/MouseTest.h diff --git a/samples/cpp-tests/Classes/IntervalTest/IntervalTest.cpp b/tests/cpp-tests/Classes/IntervalTest/IntervalTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/IntervalTest/IntervalTest.cpp rename to tests/cpp-tests/Classes/IntervalTest/IntervalTest.cpp diff --git a/samples/cpp-tests/Classes/IntervalTest/IntervalTest.h b/tests/cpp-tests/Classes/IntervalTest/IntervalTest.h similarity index 100% rename from samples/cpp-tests/Classes/IntervalTest/IntervalTest.h rename to tests/cpp-tests/Classes/IntervalTest/IntervalTest.h diff --git a/samples/cpp-tests/Classes/KeyboardTest/KeyboardTest.cpp b/tests/cpp-tests/Classes/KeyboardTest/KeyboardTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/KeyboardTest/KeyboardTest.cpp rename to tests/cpp-tests/Classes/KeyboardTest/KeyboardTest.cpp diff --git a/samples/cpp-tests/Classes/KeyboardTest/KeyboardTest.h b/tests/cpp-tests/Classes/KeyboardTest/KeyboardTest.h similarity index 100% rename from samples/cpp-tests/Classes/KeyboardTest/KeyboardTest.h rename to tests/cpp-tests/Classes/KeyboardTest/KeyboardTest.h diff --git a/samples/cpp-tests/Classes/KeypadTest/KeypadTest.cpp b/tests/cpp-tests/Classes/KeypadTest/KeypadTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/KeypadTest/KeypadTest.cpp rename to tests/cpp-tests/Classes/KeypadTest/KeypadTest.cpp diff --git a/samples/cpp-tests/Classes/KeypadTest/KeypadTest.h b/tests/cpp-tests/Classes/KeypadTest/KeypadTest.h similarity index 100% rename from samples/cpp-tests/Classes/KeypadTest/KeypadTest.h rename to tests/cpp-tests/Classes/KeypadTest/KeypadTest.h diff --git a/samples/cpp-tests/Classes/LabelTest/LabelTest.cpp b/tests/cpp-tests/Classes/LabelTest/LabelTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/LabelTest/LabelTest.cpp rename to tests/cpp-tests/Classes/LabelTest/LabelTest.cpp diff --git a/samples/cpp-tests/Classes/LabelTest/LabelTest.h b/tests/cpp-tests/Classes/LabelTest/LabelTest.h similarity index 100% rename from samples/cpp-tests/Classes/LabelTest/LabelTest.h rename to tests/cpp-tests/Classes/LabelTest/LabelTest.h diff --git a/samples/cpp-tests/Classes/LabelTest/LabelTestNew.cpp b/tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp similarity index 100% rename from samples/cpp-tests/Classes/LabelTest/LabelTestNew.cpp rename to tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp diff --git a/samples/cpp-tests/Classes/LabelTest/LabelTestNew.h b/tests/cpp-tests/Classes/LabelTest/LabelTestNew.h similarity index 100% rename from samples/cpp-tests/Classes/LabelTest/LabelTestNew.h rename to tests/cpp-tests/Classes/LabelTest/LabelTestNew.h diff --git a/samples/cpp-tests/Classes/LayerTest/LayerTest.cpp b/tests/cpp-tests/Classes/LayerTest/LayerTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/LayerTest/LayerTest.cpp rename to tests/cpp-tests/Classes/LayerTest/LayerTest.cpp diff --git a/samples/cpp-tests/Classes/LayerTest/LayerTest.h b/tests/cpp-tests/Classes/LayerTest/LayerTest.h similarity index 100% rename from samples/cpp-tests/Classes/LayerTest/LayerTest.h rename to tests/cpp-tests/Classes/LayerTest/LayerTest.h diff --git a/samples/cpp-tests/Classes/MenuTest/MenuTest.cpp b/tests/cpp-tests/Classes/MenuTest/MenuTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/MenuTest/MenuTest.cpp rename to tests/cpp-tests/Classes/MenuTest/MenuTest.cpp diff --git a/samples/cpp-tests/Classes/MenuTest/MenuTest.h b/tests/cpp-tests/Classes/MenuTest/MenuTest.h similarity index 100% rename from samples/cpp-tests/Classes/MenuTest/MenuTest.h rename to tests/cpp-tests/Classes/MenuTest/MenuTest.h diff --git a/samples/cpp-tests/Classes/MotionStreakTest/MotionStreakTest.cpp b/tests/cpp-tests/Classes/MotionStreakTest/MotionStreakTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/MotionStreakTest/MotionStreakTest.cpp rename to tests/cpp-tests/Classes/MotionStreakTest/MotionStreakTest.cpp diff --git a/samples/cpp-tests/Classes/MotionStreakTest/MotionStreakTest.h b/tests/cpp-tests/Classes/MotionStreakTest/MotionStreakTest.h similarity index 100% rename from samples/cpp-tests/Classes/MotionStreakTest/MotionStreakTest.h rename to tests/cpp-tests/Classes/MotionStreakTest/MotionStreakTest.h diff --git a/samples/cpp-tests/Classes/MutiTouchTest/MutiTouchTest.cpp b/tests/cpp-tests/Classes/MutiTouchTest/MutiTouchTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/MutiTouchTest/MutiTouchTest.cpp rename to tests/cpp-tests/Classes/MutiTouchTest/MutiTouchTest.cpp diff --git a/samples/cpp-tests/Classes/MutiTouchTest/MutiTouchTest.h b/tests/cpp-tests/Classes/MutiTouchTest/MutiTouchTest.h similarity index 100% rename from samples/cpp-tests/Classes/MutiTouchTest/MutiTouchTest.h rename to tests/cpp-tests/Classes/MutiTouchTest/MutiTouchTest.h diff --git a/samples/cpp-tests/Classes/NewEventDispatcherTest/NewEventDispatcherTest.cpp b/tests/cpp-tests/Classes/NewEventDispatcherTest/NewEventDispatcherTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/NewEventDispatcherTest/NewEventDispatcherTest.cpp rename to tests/cpp-tests/Classes/NewEventDispatcherTest/NewEventDispatcherTest.cpp diff --git a/samples/cpp-tests/Classes/NewEventDispatcherTest/NewEventDispatcherTest.h b/tests/cpp-tests/Classes/NewEventDispatcherTest/NewEventDispatcherTest.h similarity index 100% rename from samples/cpp-tests/Classes/NewEventDispatcherTest/NewEventDispatcherTest.h rename to tests/cpp-tests/Classes/NewEventDispatcherTest/NewEventDispatcherTest.h diff --git a/samples/cpp-tests/Classes/NewRendererTest/NewRendererTest.cpp b/tests/cpp-tests/Classes/NewRendererTest/NewRendererTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/NewRendererTest/NewRendererTest.cpp rename to tests/cpp-tests/Classes/NewRendererTest/NewRendererTest.cpp diff --git a/samples/cpp-tests/Classes/NewRendererTest/NewRendererTest.h b/tests/cpp-tests/Classes/NewRendererTest/NewRendererTest.h similarity index 100% rename from samples/cpp-tests/Classes/NewRendererTest/NewRendererTest.h rename to tests/cpp-tests/Classes/NewRendererTest/NewRendererTest.h diff --git a/samples/cpp-tests/Classes/NodeTest/NodeTest.cpp b/tests/cpp-tests/Classes/NodeTest/NodeTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/NodeTest/NodeTest.cpp rename to tests/cpp-tests/Classes/NodeTest/NodeTest.cpp diff --git a/samples/cpp-tests/Classes/NodeTest/NodeTest.h b/tests/cpp-tests/Classes/NodeTest/NodeTest.h similarity index 100% rename from samples/cpp-tests/Classes/NodeTest/NodeTest.h rename to tests/cpp-tests/Classes/NodeTest/NodeTest.h diff --git a/samples/cpp-tests/Classes/ParallaxTest/ParallaxTest.cpp b/tests/cpp-tests/Classes/ParallaxTest/ParallaxTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ParallaxTest/ParallaxTest.cpp rename to tests/cpp-tests/Classes/ParallaxTest/ParallaxTest.cpp diff --git a/samples/cpp-tests/Classes/ParallaxTest/ParallaxTest.h b/tests/cpp-tests/Classes/ParallaxTest/ParallaxTest.h similarity index 100% rename from samples/cpp-tests/Classes/ParallaxTest/ParallaxTest.h rename to tests/cpp-tests/Classes/ParallaxTest/ParallaxTest.h diff --git a/samples/cpp-tests/Classes/ParticleTest/ParticleTest.cpp b/tests/cpp-tests/Classes/ParticleTest/ParticleTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ParticleTest/ParticleTest.cpp rename to tests/cpp-tests/Classes/ParticleTest/ParticleTest.cpp diff --git a/samples/cpp-tests/Classes/ParticleTest/ParticleTest.h b/tests/cpp-tests/Classes/ParticleTest/ParticleTest.h similarity index 100% rename from samples/cpp-tests/Classes/ParticleTest/ParticleTest.h rename to tests/cpp-tests/Classes/ParticleTest/ParticleTest.h diff --git a/samples/cpp-tests/Classes/PerformanceTest/PerformanceAllocTest.cpp b/tests/cpp-tests/Classes/PerformanceTest/PerformanceAllocTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/PerformanceTest/PerformanceAllocTest.cpp rename to tests/cpp-tests/Classes/PerformanceTest/PerformanceAllocTest.cpp diff --git a/samples/cpp-tests/Classes/PerformanceTest/PerformanceAllocTest.h b/tests/cpp-tests/Classes/PerformanceTest/PerformanceAllocTest.h similarity index 100% rename from samples/cpp-tests/Classes/PerformanceTest/PerformanceAllocTest.h rename to tests/cpp-tests/Classes/PerformanceTest/PerformanceAllocTest.h diff --git a/samples/cpp-tests/Classes/PerformanceTest/PerformanceContainerTest.cpp b/tests/cpp-tests/Classes/PerformanceTest/PerformanceContainerTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/PerformanceTest/PerformanceContainerTest.cpp rename to tests/cpp-tests/Classes/PerformanceTest/PerformanceContainerTest.cpp diff --git a/samples/cpp-tests/Classes/PerformanceTest/PerformanceContainerTest.h b/tests/cpp-tests/Classes/PerformanceTest/PerformanceContainerTest.h similarity index 100% rename from samples/cpp-tests/Classes/PerformanceTest/PerformanceContainerTest.h rename to tests/cpp-tests/Classes/PerformanceTest/PerformanceContainerTest.h diff --git a/samples/cpp-tests/Classes/PerformanceTest/PerformanceEventDispatcherTest.cpp b/tests/cpp-tests/Classes/PerformanceTest/PerformanceEventDispatcherTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/PerformanceTest/PerformanceEventDispatcherTest.cpp rename to tests/cpp-tests/Classes/PerformanceTest/PerformanceEventDispatcherTest.cpp diff --git a/samples/cpp-tests/Classes/PerformanceTest/PerformanceEventDispatcherTest.h b/tests/cpp-tests/Classes/PerformanceTest/PerformanceEventDispatcherTest.h similarity index 100% rename from samples/cpp-tests/Classes/PerformanceTest/PerformanceEventDispatcherTest.h rename to tests/cpp-tests/Classes/PerformanceTest/PerformanceEventDispatcherTest.h diff --git a/samples/cpp-tests/Classes/PerformanceTest/PerformanceLabelTest.cpp b/tests/cpp-tests/Classes/PerformanceTest/PerformanceLabelTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/PerformanceTest/PerformanceLabelTest.cpp rename to tests/cpp-tests/Classes/PerformanceTest/PerformanceLabelTest.cpp diff --git a/samples/cpp-tests/Classes/PerformanceTest/PerformanceLabelTest.h b/tests/cpp-tests/Classes/PerformanceTest/PerformanceLabelTest.h similarity index 100% rename from samples/cpp-tests/Classes/PerformanceTest/PerformanceLabelTest.h rename to tests/cpp-tests/Classes/PerformanceTest/PerformanceLabelTest.h diff --git a/samples/cpp-tests/Classes/PerformanceTest/PerformanceNodeChildrenTest.cpp b/tests/cpp-tests/Classes/PerformanceTest/PerformanceNodeChildrenTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/PerformanceTest/PerformanceNodeChildrenTest.cpp rename to tests/cpp-tests/Classes/PerformanceTest/PerformanceNodeChildrenTest.cpp diff --git a/samples/cpp-tests/Classes/PerformanceTest/PerformanceNodeChildrenTest.h b/tests/cpp-tests/Classes/PerformanceTest/PerformanceNodeChildrenTest.h similarity index 100% rename from samples/cpp-tests/Classes/PerformanceTest/PerformanceNodeChildrenTest.h rename to tests/cpp-tests/Classes/PerformanceTest/PerformanceNodeChildrenTest.h diff --git a/samples/cpp-tests/Classes/PerformanceTest/PerformanceParticleTest.cpp b/tests/cpp-tests/Classes/PerformanceTest/PerformanceParticleTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/PerformanceTest/PerformanceParticleTest.cpp rename to tests/cpp-tests/Classes/PerformanceTest/PerformanceParticleTest.cpp diff --git a/samples/cpp-tests/Classes/PerformanceTest/PerformanceParticleTest.h b/tests/cpp-tests/Classes/PerformanceTest/PerformanceParticleTest.h similarity index 100% rename from samples/cpp-tests/Classes/PerformanceTest/PerformanceParticleTest.h rename to tests/cpp-tests/Classes/PerformanceTest/PerformanceParticleTest.h diff --git a/samples/cpp-tests/Classes/PerformanceTest/PerformanceRendererTest.cpp b/tests/cpp-tests/Classes/PerformanceTest/PerformanceRendererTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/PerformanceTest/PerformanceRendererTest.cpp rename to tests/cpp-tests/Classes/PerformanceTest/PerformanceRendererTest.cpp diff --git a/samples/cpp-tests/Classes/PerformanceTest/PerformanceRendererTest.h b/tests/cpp-tests/Classes/PerformanceTest/PerformanceRendererTest.h similarity index 100% rename from samples/cpp-tests/Classes/PerformanceTest/PerformanceRendererTest.h rename to tests/cpp-tests/Classes/PerformanceTest/PerformanceRendererTest.h diff --git a/samples/cpp-tests/Classes/PerformanceTest/PerformanceScenarioTest.cpp b/tests/cpp-tests/Classes/PerformanceTest/PerformanceScenarioTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/PerformanceTest/PerformanceScenarioTest.cpp rename to tests/cpp-tests/Classes/PerformanceTest/PerformanceScenarioTest.cpp diff --git a/samples/cpp-tests/Classes/PerformanceTest/PerformanceScenarioTest.h b/tests/cpp-tests/Classes/PerformanceTest/PerformanceScenarioTest.h similarity index 100% rename from samples/cpp-tests/Classes/PerformanceTest/PerformanceScenarioTest.h rename to tests/cpp-tests/Classes/PerformanceTest/PerformanceScenarioTest.h diff --git a/samples/cpp-tests/Classes/PerformanceTest/PerformanceSpriteTest.cpp b/tests/cpp-tests/Classes/PerformanceTest/PerformanceSpriteTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/PerformanceTest/PerformanceSpriteTest.cpp rename to tests/cpp-tests/Classes/PerformanceTest/PerformanceSpriteTest.cpp diff --git a/samples/cpp-tests/Classes/PerformanceTest/PerformanceSpriteTest.h b/tests/cpp-tests/Classes/PerformanceTest/PerformanceSpriteTest.h similarity index 100% rename from samples/cpp-tests/Classes/PerformanceTest/PerformanceSpriteTest.h rename to tests/cpp-tests/Classes/PerformanceTest/PerformanceSpriteTest.h diff --git a/samples/cpp-tests/Classes/PerformanceTest/PerformanceTest.cpp b/tests/cpp-tests/Classes/PerformanceTest/PerformanceTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/PerformanceTest/PerformanceTest.cpp rename to tests/cpp-tests/Classes/PerformanceTest/PerformanceTest.cpp diff --git a/samples/cpp-tests/Classes/PerformanceTest/PerformanceTest.h b/tests/cpp-tests/Classes/PerformanceTest/PerformanceTest.h similarity index 100% rename from samples/cpp-tests/Classes/PerformanceTest/PerformanceTest.h rename to tests/cpp-tests/Classes/PerformanceTest/PerformanceTest.h diff --git a/samples/cpp-tests/Classes/PerformanceTest/PerformanceTextureTest.cpp b/tests/cpp-tests/Classes/PerformanceTest/PerformanceTextureTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/PerformanceTest/PerformanceTextureTest.cpp rename to tests/cpp-tests/Classes/PerformanceTest/PerformanceTextureTest.cpp diff --git a/samples/cpp-tests/Classes/PerformanceTest/PerformanceTextureTest.h b/tests/cpp-tests/Classes/PerformanceTest/PerformanceTextureTest.h similarity index 100% rename from samples/cpp-tests/Classes/PerformanceTest/PerformanceTextureTest.h rename to tests/cpp-tests/Classes/PerformanceTest/PerformanceTextureTest.h diff --git a/samples/cpp-tests/Classes/PerformanceTest/PerformanceTouchesTest.cpp b/tests/cpp-tests/Classes/PerformanceTest/PerformanceTouchesTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/PerformanceTest/PerformanceTouchesTest.cpp rename to tests/cpp-tests/Classes/PerformanceTest/PerformanceTouchesTest.cpp diff --git a/samples/cpp-tests/Classes/PerformanceTest/PerformanceTouchesTest.h b/tests/cpp-tests/Classes/PerformanceTest/PerformanceTouchesTest.h similarity index 100% rename from samples/cpp-tests/Classes/PerformanceTest/PerformanceTouchesTest.h rename to tests/cpp-tests/Classes/PerformanceTest/PerformanceTouchesTest.h diff --git a/samples/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp b/tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp rename to tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp diff --git a/samples/cpp-tests/Classes/PhysicsTest/PhysicsTest.h b/tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.h similarity index 100% rename from samples/cpp-tests/Classes/PhysicsTest/PhysicsTest.h rename to tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.h diff --git a/samples/cpp-tests/Classes/ReleasePoolTest/ReleasePoolTest.cpp b/tests/cpp-tests/Classes/ReleasePoolTest/ReleasePoolTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ReleasePoolTest/ReleasePoolTest.cpp rename to tests/cpp-tests/Classes/ReleasePoolTest/ReleasePoolTest.cpp diff --git a/samples/cpp-tests/Classes/ReleasePoolTest/ReleasePoolTest.h b/tests/cpp-tests/Classes/ReleasePoolTest/ReleasePoolTest.h similarity index 100% rename from samples/cpp-tests/Classes/ReleasePoolTest/ReleasePoolTest.h rename to tests/cpp-tests/Classes/ReleasePoolTest/ReleasePoolTest.h diff --git a/samples/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.cpp b/tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.cpp similarity index 98% rename from samples/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.cpp rename to tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.cpp index 7d0aa48a50..b817ed6701 100644 --- a/samples/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.cpp +++ b/tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.cpp @@ -145,12 +145,16 @@ void RenderTextureSave::saveImage(cocos2d::Ref *sender) _target->saveToFile(jpg, Image::Format::JPG); std::string fileName = FileUtils::getInstance()->getWritablePath() + jpg; - auto sprite = Sprite::create(fileName); - - sprite->setScale(0.3f); - addChild(sprite); - sprite->setPosition(Point(40, 40)); - sprite->setRotation(counter * 3); + auto action1 = DelayTime::create(1); + auto func = [&,fileName]() + { + auto sprite = Sprite::create(fileName); + addChild(sprite); + sprite->setScale(0.3f); + sprite->setPosition(Point(40, 40)); + sprite->setRotation(counter * 3); + }; + runAction(Sequence::create(action1, CallFunc::create(func), NULL)); CCLOG("Image saved %s and %s", png, jpg); diff --git a/samples/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h b/tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h similarity index 100% rename from samples/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h rename to tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h diff --git a/samples/cpp-tests/Classes/RotateWorldTest/RotateWorldTest.cpp b/tests/cpp-tests/Classes/RotateWorldTest/RotateWorldTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/RotateWorldTest/RotateWorldTest.cpp rename to tests/cpp-tests/Classes/RotateWorldTest/RotateWorldTest.cpp diff --git a/samples/cpp-tests/Classes/RotateWorldTest/RotateWorldTest.h b/tests/cpp-tests/Classes/RotateWorldTest/RotateWorldTest.h similarity index 100% rename from samples/cpp-tests/Classes/RotateWorldTest/RotateWorldTest.h rename to tests/cpp-tests/Classes/RotateWorldTest/RotateWorldTest.h diff --git a/samples/cpp-tests/Classes/SceneTest/SceneTest.cpp b/tests/cpp-tests/Classes/SceneTest/SceneTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/SceneTest/SceneTest.cpp rename to tests/cpp-tests/Classes/SceneTest/SceneTest.cpp diff --git a/samples/cpp-tests/Classes/SceneTest/SceneTest.h b/tests/cpp-tests/Classes/SceneTest/SceneTest.h similarity index 100% rename from samples/cpp-tests/Classes/SceneTest/SceneTest.h rename to tests/cpp-tests/Classes/SceneTest/SceneTest.h diff --git a/samples/cpp-tests/Classes/SchedulerTest/SchedulerTest.cpp b/tests/cpp-tests/Classes/SchedulerTest/SchedulerTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/SchedulerTest/SchedulerTest.cpp rename to tests/cpp-tests/Classes/SchedulerTest/SchedulerTest.cpp diff --git a/samples/cpp-tests/Classes/SchedulerTest/SchedulerTest.h b/tests/cpp-tests/Classes/SchedulerTest/SchedulerTest.h similarity index 100% rename from samples/cpp-tests/Classes/SchedulerTest/SchedulerTest.h rename to tests/cpp-tests/Classes/SchedulerTest/SchedulerTest.h diff --git a/samples/cpp-tests/Classes/ShaderTest/ShaderTest.cpp b/tests/cpp-tests/Classes/ShaderTest/ShaderTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ShaderTest/ShaderTest.cpp rename to tests/cpp-tests/Classes/ShaderTest/ShaderTest.cpp diff --git a/samples/cpp-tests/Classes/ShaderTest/ShaderTest.h b/tests/cpp-tests/Classes/ShaderTest/ShaderTest.h similarity index 100% rename from samples/cpp-tests/Classes/ShaderTest/ShaderTest.h rename to tests/cpp-tests/Classes/ShaderTest/ShaderTest.h diff --git a/samples/cpp-tests/Classes/ShaderTest/ShaderTest2.cpp b/tests/cpp-tests/Classes/ShaderTest/ShaderTest2.cpp similarity index 100% rename from samples/cpp-tests/Classes/ShaderTest/ShaderTest2.cpp rename to tests/cpp-tests/Classes/ShaderTest/ShaderTest2.cpp diff --git a/samples/cpp-tests/Classes/ShaderTest/ShaderTest2.h b/tests/cpp-tests/Classes/ShaderTest/ShaderTest2.h similarity index 100% rename from samples/cpp-tests/Classes/ShaderTest/ShaderTest2.h rename to tests/cpp-tests/Classes/ShaderTest/ShaderTest2.h diff --git a/samples/cpp-tests/Classes/SpineTest/SpineTest.cpp b/tests/cpp-tests/Classes/SpineTest/SpineTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/SpineTest/SpineTest.cpp rename to tests/cpp-tests/Classes/SpineTest/SpineTest.cpp diff --git a/samples/cpp-tests/Classes/SpineTest/SpineTest.h b/tests/cpp-tests/Classes/SpineTest/SpineTest.h similarity index 100% rename from samples/cpp-tests/Classes/SpineTest/SpineTest.h rename to tests/cpp-tests/Classes/SpineTest/SpineTest.h diff --git a/samples/cpp-tests/Classes/SpriteTest/SpriteTest.cpp.REMOVED.git-id b/tests/cpp-tests/Classes/SpriteTest/SpriteTest.cpp.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Classes/SpriteTest/SpriteTest.cpp.REMOVED.git-id rename to tests/cpp-tests/Classes/SpriteTest/SpriteTest.cpp.REMOVED.git-id diff --git a/samples/cpp-tests/Classes/SpriteTest/SpriteTest.h b/tests/cpp-tests/Classes/SpriteTest/SpriteTest.h similarity index 100% rename from samples/cpp-tests/Classes/SpriteTest/SpriteTest.h rename to tests/cpp-tests/Classes/SpriteTest/SpriteTest.h diff --git a/samples/cpp-tests/Classes/TextInputTest/TextInputTest.cpp b/tests/cpp-tests/Classes/TextInputTest/TextInputTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/TextInputTest/TextInputTest.cpp rename to tests/cpp-tests/Classes/TextInputTest/TextInputTest.cpp diff --git a/samples/cpp-tests/Classes/TextInputTest/TextInputTest.h b/tests/cpp-tests/Classes/TextInputTest/TextInputTest.h similarity index 100% rename from samples/cpp-tests/Classes/TextInputTest/TextInputTest.h rename to tests/cpp-tests/Classes/TextInputTest/TextInputTest.h diff --git a/samples/cpp-tests/Classes/Texture2dTest/Texture2dTest.cpp b/tests/cpp-tests/Classes/Texture2dTest/Texture2dTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/Texture2dTest/Texture2dTest.cpp rename to tests/cpp-tests/Classes/Texture2dTest/Texture2dTest.cpp diff --git a/samples/cpp-tests/Classes/Texture2dTest/Texture2dTest.h b/tests/cpp-tests/Classes/Texture2dTest/Texture2dTest.h similarity index 100% rename from samples/cpp-tests/Classes/Texture2dTest/Texture2dTest.h rename to tests/cpp-tests/Classes/Texture2dTest/Texture2dTest.h diff --git a/samples/cpp-tests/Classes/TextureCacheTest/TextureCacheTest.cpp b/tests/cpp-tests/Classes/TextureCacheTest/TextureCacheTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/TextureCacheTest/TextureCacheTest.cpp rename to tests/cpp-tests/Classes/TextureCacheTest/TextureCacheTest.cpp diff --git a/samples/cpp-tests/Classes/TextureCacheTest/TextureCacheTest.h b/tests/cpp-tests/Classes/TextureCacheTest/TextureCacheTest.h similarity index 100% rename from samples/cpp-tests/Classes/TextureCacheTest/TextureCacheTest.h rename to tests/cpp-tests/Classes/TextureCacheTest/TextureCacheTest.h diff --git a/samples/cpp-tests/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.cpp b/tests/cpp-tests/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.cpp rename to tests/cpp-tests/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.cpp diff --git a/samples/cpp-tests/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.h b/tests/cpp-tests/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.h similarity index 100% rename from samples/cpp-tests/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.h rename to tests/cpp-tests/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.h diff --git a/samples/cpp-tests/Classes/TileMapTest/TileMapTest.cpp b/tests/cpp-tests/Classes/TileMapTest/TileMapTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/TileMapTest/TileMapTest.cpp rename to tests/cpp-tests/Classes/TileMapTest/TileMapTest.cpp diff --git a/samples/cpp-tests/Classes/TileMapTest/TileMapTest.h b/tests/cpp-tests/Classes/TileMapTest/TileMapTest.h similarity index 100% rename from samples/cpp-tests/Classes/TileMapTest/TileMapTest.h rename to tests/cpp-tests/Classes/TileMapTest/TileMapTest.h diff --git a/samples/cpp-tests/Classes/TouchesTest/Ball.cpp b/tests/cpp-tests/Classes/TouchesTest/Ball.cpp similarity index 100% rename from samples/cpp-tests/Classes/TouchesTest/Ball.cpp rename to tests/cpp-tests/Classes/TouchesTest/Ball.cpp diff --git a/samples/cpp-tests/Classes/TouchesTest/Ball.h b/tests/cpp-tests/Classes/TouchesTest/Ball.h similarity index 100% rename from samples/cpp-tests/Classes/TouchesTest/Ball.h rename to tests/cpp-tests/Classes/TouchesTest/Ball.h diff --git a/samples/cpp-tests/Classes/TouchesTest/Paddle.cpp b/tests/cpp-tests/Classes/TouchesTest/Paddle.cpp similarity index 100% rename from samples/cpp-tests/Classes/TouchesTest/Paddle.cpp rename to tests/cpp-tests/Classes/TouchesTest/Paddle.cpp diff --git a/samples/cpp-tests/Classes/TouchesTest/Paddle.h b/tests/cpp-tests/Classes/TouchesTest/Paddle.h similarity index 100% rename from samples/cpp-tests/Classes/TouchesTest/Paddle.h rename to tests/cpp-tests/Classes/TouchesTest/Paddle.h diff --git a/samples/cpp-tests/Classes/TouchesTest/TouchesTest.cpp b/tests/cpp-tests/Classes/TouchesTest/TouchesTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/TouchesTest/TouchesTest.cpp rename to tests/cpp-tests/Classes/TouchesTest/TouchesTest.cpp diff --git a/samples/cpp-tests/Classes/TouchesTest/TouchesTest.h b/tests/cpp-tests/Classes/TouchesTest/TouchesTest.h similarity index 100% rename from samples/cpp-tests/Classes/TouchesTest/TouchesTest.h rename to tests/cpp-tests/Classes/TouchesTest/TouchesTest.h diff --git a/samples/cpp-tests/Classes/TransitionsTest/TransitionsTest.cpp b/tests/cpp-tests/Classes/TransitionsTest/TransitionsTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/TransitionsTest/TransitionsTest.cpp rename to tests/cpp-tests/Classes/TransitionsTest/TransitionsTest.cpp diff --git a/samples/cpp-tests/Classes/TransitionsTest/TransitionsTest.h b/tests/cpp-tests/Classes/TransitionsTest/TransitionsTest.h similarity index 100% rename from samples/cpp-tests/Classes/TransitionsTest/TransitionsTest.h rename to tests/cpp-tests/Classes/TransitionsTest/TransitionsTest.h diff --git a/samples/cpp-tests/Classes/UnitTest/UnitTest.cpp b/tests/cpp-tests/Classes/UnitTest/UnitTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/UnitTest/UnitTest.cpp rename to tests/cpp-tests/Classes/UnitTest/UnitTest.cpp diff --git a/samples/cpp-tests/Classes/UnitTest/UnitTest.h b/tests/cpp-tests/Classes/UnitTest/UnitTest.h similarity index 100% rename from samples/cpp-tests/Classes/UnitTest/UnitTest.h rename to tests/cpp-tests/Classes/UnitTest/UnitTest.h diff --git a/samples/cpp-tests/Classes/UserDefaultTest/UserDefaultTest.cpp b/tests/cpp-tests/Classes/UserDefaultTest/UserDefaultTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/UserDefaultTest/UserDefaultTest.cpp rename to tests/cpp-tests/Classes/UserDefaultTest/UserDefaultTest.cpp diff --git a/samples/cpp-tests/Classes/UserDefaultTest/UserDefaultTest.h b/tests/cpp-tests/Classes/UserDefaultTest/UserDefaultTest.h similarity index 100% rename from samples/cpp-tests/Classes/UserDefaultTest/UserDefaultTest.h rename to tests/cpp-tests/Classes/UserDefaultTest/UserDefaultTest.h diff --git a/samples/cpp-tests/Classes/VisibleRect.cpp b/tests/cpp-tests/Classes/VisibleRect.cpp similarity index 100% rename from samples/cpp-tests/Classes/VisibleRect.cpp rename to tests/cpp-tests/Classes/VisibleRect.cpp diff --git a/samples/cpp-tests/Classes/VisibleRect.h b/tests/cpp-tests/Classes/VisibleRect.h similarity index 100% rename from samples/cpp-tests/Classes/VisibleRect.h rename to tests/cpp-tests/Classes/VisibleRect.h diff --git a/samples/cpp-tests/Classes/ZwoptexTest/ZwoptexTest.cpp b/tests/cpp-tests/Classes/ZwoptexTest/ZwoptexTest.cpp similarity index 100% rename from samples/cpp-tests/Classes/ZwoptexTest/ZwoptexTest.cpp rename to tests/cpp-tests/Classes/ZwoptexTest/ZwoptexTest.cpp diff --git a/samples/cpp-tests/Classes/ZwoptexTest/ZwoptexTest.h b/tests/cpp-tests/Classes/ZwoptexTest/ZwoptexTest.h similarity index 100% rename from samples/cpp-tests/Classes/ZwoptexTest/ZwoptexTest.h rename to tests/cpp-tests/Classes/ZwoptexTest/ZwoptexTest.h diff --git a/samples/cpp-tests/Classes/controller.cpp b/tests/cpp-tests/Classes/controller.cpp similarity index 100% rename from samples/cpp-tests/Classes/controller.cpp rename to tests/cpp-tests/Classes/controller.cpp diff --git a/samples/cpp-tests/Classes/controller.h b/tests/cpp-tests/Classes/controller.h similarity index 100% rename from samples/cpp-tests/Classes/controller.h rename to tests/cpp-tests/Classes/controller.h diff --git a/samples/cpp-tests/Classes/testBasic.cpp b/tests/cpp-tests/Classes/testBasic.cpp similarity index 100% rename from samples/cpp-tests/Classes/testBasic.cpp rename to tests/cpp-tests/Classes/testBasic.cpp diff --git a/samples/cpp-tests/Classes/testBasic.h b/tests/cpp-tests/Classes/testBasic.h similarity index 100% rename from samples/cpp-tests/Classes/testBasic.h rename to tests/cpp-tests/Classes/testBasic.h diff --git a/samples/cpp-tests/Classes/testResource.h b/tests/cpp-tests/Classes/testResource.h similarity index 100% rename from samples/cpp-tests/Classes/testResource.h rename to tests/cpp-tests/Classes/testResource.h diff --git a/samples/cpp-tests/Classes/tests.h b/tests/cpp-tests/Classes/tests.h similarity index 100% rename from samples/cpp-tests/Classes/tests.h rename to tests/cpp-tests/Classes/tests.h diff --git a/tests/cpp-tests/Resources/.gitignore b/tests/cpp-tests/Resources/.gitignore new file mode 100644 index 0000000000..1d65afe366 --- /dev/null +++ b/tests/cpp-tests/Resources/.gitignore @@ -0,0 +1,2 @@ +#Do now ignore Marmalade icf files +!*.icf diff --git a/samples/cpp-tests/Resources/Hello.png.REMOVED.git-id b/tests/cpp-tests/Resources/Hello.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/Hello.png.REMOVED.git-id rename to tests/cpp-tests/Resources/Hello.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/Images/HelloWorld.png.REMOVED.git-id b/tests/cpp-tests/Resources/Images/HelloWorld.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/Images/HelloWorld.png.REMOVED.git-id rename to tests/cpp-tests/Resources/Images/HelloWorld.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/Images/PlanetCute-1024x1024.png.REMOVED.git-id b/tests/cpp-tests/Resources/Images/PlanetCute-1024x1024.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/Images/PlanetCute-1024x1024.png.REMOVED.git-id rename to tests/cpp-tests/Resources/Images/PlanetCute-1024x1024.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/Images/atlastest.png.REMOVED.git-id b/tests/cpp-tests/Resources/Images/atlastest.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/Images/atlastest.png.REMOVED.git-id rename to tests/cpp-tests/Resources/Images/atlastest.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/Images/background1.png.REMOVED.git-id b/tests/cpp-tests/Resources/Images/background1.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/Images/background1.png.REMOVED.git-id rename to tests/cpp-tests/Resources/Images/background1.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/Images/background2.jpg.REMOVED.git-id b/tests/cpp-tests/Resources/Images/background2.jpg.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/Images/background2.jpg.REMOVED.git-id rename to tests/cpp-tests/Resources/Images/background2.jpg.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/Images/background2.png.REMOVED.git-id b/tests/cpp-tests/Resources/Images/background2.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/Images/background2.png.REMOVED.git-id rename to tests/cpp-tests/Resources/Images/background2.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/Images/bugs/bug886.png.REMOVED.git-id b/tests/cpp-tests/Resources/Images/bugs/bug886.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/Images/bugs/bug886.png.REMOVED.git-id rename to tests/cpp-tests/Resources/Images/bugs/bug886.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/Images/grossini_dance_atlas-mono.png.REMOVED.git-id b/tests/cpp-tests/Resources/Images/grossini_dance_atlas-mono.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/Images/grossini_dance_atlas-mono.png.REMOVED.git-id rename to tests/cpp-tests/Resources/Images/grossini_dance_atlas-mono.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/Images/landscape-1024x1024.png.REMOVED.git-id b/tests/cpp-tests/Resources/Images/landscape-1024x1024.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/Images/landscape-1024x1024.png.REMOVED.git-id rename to tests/cpp-tests/Resources/Images/landscape-1024x1024.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/Images/noise.png.REMOVED.git-id b/tests/cpp-tests/Resources/Images/noise.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/Images/noise.png.REMOVED.git-id rename to tests/cpp-tests/Resources/Images/noise.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/Images/spritesheet1.png.REMOVED.git-id b/tests/cpp-tests/Resources/Images/spritesheet1.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/Images/spritesheet1.png.REMOVED.git-id rename to tests/cpp-tests/Resources/Images/spritesheet1.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/Images/stone.png.REMOVED.git-id b/tests/cpp-tests/Resources/Images/stone.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/Images/stone.png.REMOVED.git-id rename to tests/cpp-tests/Resources/Images/stone.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/Images/test_1021x1024.png.REMOVED.git-id b/tests/cpp-tests/Resources/Images/test_1021x1024.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/Images/test_1021x1024.png.REMOVED.git-id rename to tests/cpp-tests/Resources/Images/test_1021x1024.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/Images/test_1021x1024_a8.pvr.REMOVED.git-id b/tests/cpp-tests/Resources/Images/test_1021x1024_a8.pvr.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/Images/test_1021x1024_a8.pvr.REMOVED.git-id rename to tests/cpp-tests/Resources/Images/test_1021x1024_a8.pvr.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/Images/test_1021x1024_rgb888.pvr.REMOVED.git-id b/tests/cpp-tests/Resources/Images/test_1021x1024_rgb888.pvr.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/Images/test_1021x1024_rgb888.pvr.REMOVED.git-id rename to tests/cpp-tests/Resources/Images/test_1021x1024_rgb888.pvr.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/Images/test_1021x1024_rgb888.pvr.gz.REMOVED.git-id b/tests/cpp-tests/Resources/Images/test_1021x1024_rgb888.pvr.gz.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/Images/test_1021x1024_rgb888.pvr.gz.REMOVED.git-id rename to tests/cpp-tests/Resources/Images/test_1021x1024_rgb888.pvr.gz.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/Images/test_1021x1024_rgba4444.pvr.REMOVED.git-id b/tests/cpp-tests/Resources/Images/test_1021x1024_rgba4444.pvr.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/Images/test_1021x1024_rgba4444.pvr.REMOVED.git-id rename to tests/cpp-tests/Resources/Images/test_1021x1024_rgba4444.pvr.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/Images/test_1021x1024_rgba4444.pvr.gz.REMOVED.git-id b/tests/cpp-tests/Resources/Images/test_1021x1024_rgba4444.pvr.gz.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/Images/test_1021x1024_rgba4444.pvr.gz.REMOVED.git-id rename to tests/cpp-tests/Resources/Images/test_1021x1024_rgba4444.pvr.gz.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/Images/test_1021x1024_rgba8888.pvr.REMOVED.git-id b/tests/cpp-tests/Resources/Images/test_1021x1024_rgba8888.pvr.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/Images/test_1021x1024_rgba8888.pvr.REMOVED.git-id rename to tests/cpp-tests/Resources/Images/test_1021x1024_rgba8888.pvr.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/Images/test_1021x1024_rgba8888.pvr.gz.REMOVED.git-id b/tests/cpp-tests/Resources/Images/test_1021x1024_rgba8888.pvr.gz.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/Images/test_1021x1024_rgba8888.pvr.gz.REMOVED.git-id rename to tests/cpp-tests/Resources/Images/test_1021x1024_rgba8888.pvr.gz.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/Images/test_512x512_s3tc_dxt5_with_no_mipmaps.dds.REMOVED.git-id b/tests/cpp-tests/Resources/Images/test_512x512_s3tc_dxt5_with_no_mipmaps.dds.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/Images/test_512x512_s3tc_dxt5_with_no_mipmaps.dds.REMOVED.git-id rename to tests/cpp-tests/Resources/Images/test_512x512_s3tc_dxt5_with_no_mipmaps.dds.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/Misc/resources-hd/test4.txt b/tests/cpp-tests/Resources/Misc/resources-hd/test4.txt similarity index 100% rename from samples/cpp-tests/Resources/Misc/resources-hd/test4.txt rename to tests/cpp-tests/Resources/Misc/resources-hd/test4.txt diff --git a/samples/cpp-tests/Resources/Misc/resources-ipad/test2.txt b/tests/cpp-tests/Resources/Misc/resources-ipad/test2.txt similarity index 100% rename from samples/cpp-tests/Resources/Misc/resources-ipad/test2.txt rename to tests/cpp-tests/Resources/Misc/resources-ipad/test2.txt diff --git a/samples/cpp-tests/Resources/Misc/resources-ipadhd/test1.txt b/tests/cpp-tests/Resources/Misc/resources-ipadhd/test1.txt similarity index 100% rename from samples/cpp-tests/Resources/Misc/resources-ipadhd/test1.txt rename to tests/cpp-tests/Resources/Misc/resources-ipadhd/test1.txt diff --git a/samples/cpp-tests/Resources/Misc/resources-iphone/test6.txt b/tests/cpp-tests/Resources/Misc/resources-iphone/test6.txt similarity index 100% rename from samples/cpp-tests/Resources/Misc/resources-iphone/test6.txt rename to tests/cpp-tests/Resources/Misc/resources-iphone/test6.txt diff --git a/samples/cpp-tests/Resources/Misc/resources-mac/test2.txt b/tests/cpp-tests/Resources/Misc/resources-mac/test2.txt similarity index 100% rename from samples/cpp-tests/Resources/Misc/resources-mac/test2.txt rename to tests/cpp-tests/Resources/Misc/resources-mac/test2.txt diff --git a/samples/cpp-tests/Resources/Misc/resources-machd/test1.txt b/tests/cpp-tests/Resources/Misc/resources-machd/test1.txt similarity index 100% rename from samples/cpp-tests/Resources/Misc/resources-machd/test1.txt rename to tests/cpp-tests/Resources/Misc/resources-machd/test1.txt diff --git a/samples/cpp-tests/Resources/Misc/resources-wide/test5.txt b/tests/cpp-tests/Resources/Misc/resources-wide/test5.txt similarity index 100% rename from samples/cpp-tests/Resources/Misc/resources-wide/test5.txt rename to tests/cpp-tests/Resources/Misc/resources-wide/test5.txt diff --git a/samples/cpp-tests/Resources/Misc/resources-widehd/test3.txt b/tests/cpp-tests/Resources/Misc/resources-widehd/test3.txt similarity index 100% rename from samples/cpp-tests/Resources/Misc/resources-widehd/test3.txt rename to tests/cpp-tests/Resources/Misc/resources-widehd/test3.txt diff --git a/samples/cpp-tests/Resources/Misc/searchpath1/file1.txt b/tests/cpp-tests/Resources/Misc/searchpath1/file1.txt similarity index 100% rename from samples/cpp-tests/Resources/Misc/searchpath1/file1.txt rename to tests/cpp-tests/Resources/Misc/searchpath1/file1.txt diff --git a/samples/cpp-tests/Resources/Misc/searchpath2/resources-ipad/file2.txt b/tests/cpp-tests/Resources/Misc/searchpath2/resources-ipad/file2.txt similarity index 100% rename from samples/cpp-tests/Resources/Misc/searchpath2/resources-ipad/file2.txt rename to tests/cpp-tests/Resources/Misc/searchpath2/resources-ipad/file2.txt diff --git a/samples/cpp-tests/Resources/Shaders/example_ColorBars.vsh b/tests/cpp-tests/Resources/Shaders/example_ColorBars.vsh similarity index 100% rename from samples/cpp-tests/Resources/Shaders/example_ColorBars.vsh rename to tests/cpp-tests/Resources/Shaders/example_ColorBars.vsh diff --git a/samples/cpp-tests/Resources/Shaders/example_Flower.vsh b/tests/cpp-tests/Resources/Shaders/example_Flower.vsh similarity index 100% rename from samples/cpp-tests/Resources/Shaders/example_Flower.vsh rename to tests/cpp-tests/Resources/Shaders/example_Flower.vsh diff --git a/samples/cpp-tests/Resources/Shaders/example_Heart.vsh b/tests/cpp-tests/Resources/Shaders/example_Heart.vsh similarity index 100% rename from samples/cpp-tests/Resources/Shaders/example_Heart.vsh rename to tests/cpp-tests/Resources/Shaders/example_Heart.vsh diff --git a/samples/cpp-tests/Resources/Shaders/example_Julia.vsh b/tests/cpp-tests/Resources/Shaders/example_Julia.vsh similarity index 100% rename from samples/cpp-tests/Resources/Shaders/example_Julia.vsh rename to tests/cpp-tests/Resources/Shaders/example_Julia.vsh diff --git a/samples/cpp-tests/Resources/Shaders/example_Mandelbrot.vsh b/tests/cpp-tests/Resources/Shaders/example_Mandelbrot.vsh similarity index 100% rename from samples/cpp-tests/Resources/Shaders/example_Mandelbrot.vsh rename to tests/cpp-tests/Resources/Shaders/example_Mandelbrot.vsh diff --git a/samples/cpp-tests/Resources/Shaders/example_Monjori.vsh b/tests/cpp-tests/Resources/Shaders/example_Monjori.vsh similarity index 100% rename from samples/cpp-tests/Resources/Shaders/example_Monjori.vsh rename to tests/cpp-tests/Resources/Shaders/example_Monjori.vsh diff --git a/samples/cpp-tests/Resources/Shaders/example_Plasma.vsh b/tests/cpp-tests/Resources/Shaders/example_Plasma.vsh similarity index 100% rename from samples/cpp-tests/Resources/Shaders/example_Plasma.vsh rename to tests/cpp-tests/Resources/Shaders/example_Plasma.vsh diff --git a/samples/cpp-tests/Resources/Shaders/example_Twist.vsh b/tests/cpp-tests/Resources/Shaders/example_Twist.vsh similarity index 100% rename from samples/cpp-tests/Resources/Shaders/example_Twist.vsh rename to tests/cpp-tests/Resources/Shaders/example_Twist.vsh diff --git a/samples/cpp-tests/Resources/TileMaps/hexa-tiles.png.REMOVED.git-id b/tests/cpp-tests/Resources/TileMaps/hexa-tiles.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/TileMaps/hexa-tiles.png.REMOVED.git-id rename to tests/cpp-tests/Resources/TileMaps/hexa-tiles.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/TileMaps/map/slcj.png.REMOVED.git-id b/tests/cpp-tests/Resources/TileMaps/map/slcj.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/TileMaps/map/slcj.png.REMOVED.git-id rename to tests/cpp-tests/Resources/TileMaps/map/slcj.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/TileMaps/ortho-test1.png.REMOVED.git-id b/tests/cpp-tests/Resources/TileMaps/ortho-test1.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/TileMaps/ortho-test1.png.REMOVED.git-id rename to tests/cpp-tests/Resources/TileMaps/ortho-test1.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/TileMaps/ortho-test1_bw.png.REMOVED.git-id b/tests/cpp-tests/Resources/TileMaps/ortho-test1_bw.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/TileMaps/ortho-test1_bw.png.REMOVED.git-id rename to tests/cpp-tests/Resources/TileMaps/ortho-test1_bw.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/animations/grossini.plist.xml b/tests/cpp-tests/Resources/animations/grossini.plist.xml similarity index 100% rename from samples/cpp-tests/Resources/animations/grossini.plist.xml rename to tests/cpp-tests/Resources/animations/grossini.plist.xml diff --git a/samples/cpp-tests/Resources/armature/Cowboy.ExportJson.REMOVED.git-id b/tests/cpp-tests/Resources/armature/Cowboy.ExportJson.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/armature/Cowboy.ExportJson.REMOVED.git-id rename to tests/cpp-tests/Resources/armature/Cowboy.ExportJson.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/armature/Cowboy0.png.REMOVED.git-id b/tests/cpp-tests/Resources/armature/Cowboy0.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/armature/Cowboy0.png.REMOVED.git-id rename to tests/cpp-tests/Resources/armature/Cowboy0.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/armature/Dragon.xml b/tests/cpp-tests/Resources/armature/Dragon.xml similarity index 100% rename from samples/cpp-tests/Resources/armature/Dragon.xml rename to tests/cpp-tests/Resources/armature/Dragon.xml diff --git a/samples/cpp-tests/Resources/armature/HeroAnimation.ExportJson.REMOVED.git-id b/tests/cpp-tests/Resources/armature/HeroAnimation.ExportJson.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/armature/HeroAnimation.ExportJson.REMOVED.git-id rename to tests/cpp-tests/Resources/armature/HeroAnimation.ExportJson.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/armature/cyborg.xml b/tests/cpp-tests/Resources/armature/cyborg.xml similarity index 100% rename from samples/cpp-tests/Resources/armature/cyborg.xml rename to tests/cpp-tests/Resources/armature/cyborg.xml diff --git a/samples/cpp-tests/Resources/armature/knight.xml b/tests/cpp-tests/Resources/armature/knight.xml similarity index 100% rename from samples/cpp-tests/Resources/armature/knight.xml rename to tests/cpp-tests/Resources/armature/knight.xml diff --git a/samples/cpp-tests/Resources/armature/robot.xml b/tests/cpp-tests/Resources/armature/robot.xml similarity index 100% rename from samples/cpp-tests/Resources/armature/robot.xml rename to tests/cpp-tests/Resources/armature/robot.xml diff --git a/samples/cpp-tests/Resources/armature/weapon.xml b/tests/cpp-tests/Resources/armature/weapon.xml similarity index 100% rename from samples/cpp-tests/Resources/armature/weapon.xml rename to tests/cpp-tests/Resources/armature/weapon.xml diff --git a/samples/cpp-tests/Resources/background-music-aac.wav.REMOVED.git-id b/tests/cpp-tests/Resources/background-music-aac.wav.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/background-music-aac.wav.REMOVED.git-id rename to tests/cpp-tests/Resources/background-music-aac.wav.REMOVED.git-id diff --git a/tests/cpp-tests/Resources/background.mp3.REMOVED.git-id b/tests/cpp-tests/Resources/background.mp3.REMOVED.git-id new file mode 100644 index 0000000000..cfc16a8a4e --- /dev/null +++ b/tests/cpp-tests/Resources/background.mp3.REMOVED.git-id @@ -0,0 +1 @@ +aec1c0a8c8068377fddca5ddd32084d8c3c3c419 \ No newline at end of file diff --git a/samples/cpp-tests/Resources/ccb/flower.jpg.REMOVED.git-id b/tests/cpp-tests/Resources/ccb/flower.jpg.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/ccb/flower.jpg.REMOVED.git-id rename to tests/cpp-tests/Resources/ccb/flower.jpg.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/ccb/gem-0.wav.REMOVED.git-id b/tests/cpp-tests/Resources/ccb/gem-0.wav.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/ccb/gem-0.wav.REMOVED.git-id rename to tests/cpp-tests/Resources/ccb/gem-0.wav.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/ccb/gem-1.wav.REMOVED.git-id b/tests/cpp-tests/Resources/ccb/gem-1.wav.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/ccb/gem-1.wav.REMOVED.git-id rename to tests/cpp-tests/Resources/ccb/gem-1.wav.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/ccb/markerfelt24shadow.fnt.REMOVED.git-id b/tests/cpp-tests/Resources/ccb/markerfelt24shadow.fnt.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/ccb/markerfelt24shadow.fnt.REMOVED.git-id rename to tests/cpp-tests/Resources/ccb/markerfelt24shadow.fnt.REMOVED.git-id diff --git a/tests/cpp-tests/Resources/cocosgui/Hello.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosgui/Hello.png.REMOVED.git-id new file mode 100644 index 0000000000..f02d84fd8f --- /dev/null +++ b/tests/cpp-tests/Resources/cocosgui/Hello.png.REMOVED.git-id @@ -0,0 +1 @@ +5fe89fb5bd58cedf13b0363f97b20e3ea7ff255d \ No newline at end of file diff --git a/samples/cpp-tests/Resources/extensions/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/background.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/extensions/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/background.png.REMOVED.git-id diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/background.png.REMOVED.git-id new file mode 100644 index 0000000000..746e4e19e9 --- /dev/null +++ b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/background.png.REMOVED.git-id @@ -0,0 +1 @@ +500d95937f3fd81659da66d2099b6c80d988a6b5 \ No newline at end of file diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/background.png.REMOVED.git-id new file mode 100644 index 0000000000..746e4e19e9 --- /dev/null +++ b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/background.png.REMOVED.git-id @@ -0,0 +1 @@ +500d95937f3fd81659da66d2099b6c80d988a6b5 \ No newline at end of file diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/background.png.REMOVED.git-id new file mode 100644 index 0000000000..746e4e19e9 --- /dev/null +++ b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/background.png.REMOVED.git-id @@ -0,0 +1 @@ +500d95937f3fd81659da66d2099b6c80d988a6b5 \ No newline at end of file diff --git a/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.png.REMOVED.git-id rename to tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.png.REMOVED.git-id diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/background.png.REMOVED.git-id new file mode 100644 index 0000000000..746e4e19e9 --- /dev/null +++ b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/background.png.REMOVED.git-id @@ -0,0 +1 @@ +500d95937f3fd81659da66d2099b6c80d988a6b5 \ No newline at end of file diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/background.png.REMOVED.git-id new file mode 100644 index 0000000000..746e4e19e9 --- /dev/null +++ b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/background.png.REMOVED.git-id @@ -0,0 +1 @@ +500d95937f3fd81659da66d2099b6c80d988a6b5 \ No newline at end of file diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/Hello.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/Hello.png.REMOVED.git-id new file mode 100644 index 0000000000..02b4320e6c --- /dev/null +++ b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/Hello.png.REMOVED.git-id @@ -0,0 +1 @@ +94b49354965ace4e2408e5faaa310f87a3bf914a \ No newline at end of file diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/background.png.REMOVED.git-id new file mode 100644 index 0000000000..746e4e19e9 --- /dev/null +++ b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/background.png.REMOVED.git-id @@ -0,0 +1 @@ +500d95937f3fd81659da66d2099b6c80d988a6b5 \ No newline at end of file diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/background.png.REMOVED.git-id new file mode 100644 index 0000000000..746e4e19e9 --- /dev/null +++ b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/background.png.REMOVED.git-id @@ -0,0 +1 @@ +500d95937f3fd81659da66d2099b6c80d988a6b5 \ No newline at end of file diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/background.png.REMOVED.git-id new file mode 100644 index 0000000000..746e4e19e9 --- /dev/null +++ b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/background.png.REMOVED.git-id @@ -0,0 +1 @@ +500d95937f3fd81659da66d2099b6c80d988a6b5 \ No newline at end of file diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/background.png.REMOVED.git-id new file mode 100644 index 0000000000..746e4e19e9 --- /dev/null +++ b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/background.png.REMOVED.git-id @@ -0,0 +1 @@ +500d95937f3fd81659da66d2099b6c80d988a6b5 \ No newline at end of file diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/background.png.REMOVED.git-id new file mode 100644 index 0000000000..746e4e19e9 --- /dev/null +++ b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/background.png.REMOVED.git-id @@ -0,0 +1 @@ +500d95937f3fd81659da66d2099b6c80d988a6b5 \ No newline at end of file diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/background.png.REMOVED.git-id new file mode 100644 index 0000000000..746e4e19e9 --- /dev/null +++ b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/background.png.REMOVED.git-id @@ -0,0 +1 @@ +500d95937f3fd81659da66d2099b6c80d988a6b5 \ No newline at end of file diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/background.png.REMOVED.git-id new file mode 100644 index 0000000000..746e4e19e9 --- /dev/null +++ b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/background.png.REMOVED.git-id @@ -0,0 +1 @@ +500d95937f3fd81659da66d2099b6c80d988a6b5 \ No newline at end of file diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/background.png.REMOVED.git-id new file mode 100644 index 0000000000..746e4e19e9 --- /dev/null +++ b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/background.png.REMOVED.git-id @@ -0,0 +1 @@ +500d95937f3fd81659da66d2099b6c80d988a6b5 \ No newline at end of file diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/background.png.REMOVED.git-id new file mode 100644 index 0000000000..746e4e19e9 --- /dev/null +++ b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/background.png.REMOVED.git-id @@ -0,0 +1 @@ +500d95937f3fd81659da66d2099b6c80d988a6b5 \ No newline at end of file diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/background.png.REMOVED.git-id new file mode 100644 index 0000000000..746e4e19e9 --- /dev/null +++ b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/background.png.REMOVED.git-id @@ -0,0 +1 @@ +500d95937f3fd81659da66d2099b6c80d988a6b5 \ No newline at end of file diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/background.png.REMOVED.git-id new file mode 100644 index 0000000000..746e4e19e9 --- /dev/null +++ b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/background.png.REMOVED.git-id @@ -0,0 +1 @@ +500d95937f3fd81659da66d2099b6c80d988a6b5 \ No newline at end of file diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/background.png.REMOVED.git-id new file mode 100644 index 0000000000..746e4e19e9 --- /dev/null +++ b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/background.png.REMOVED.git-id @@ -0,0 +1 @@ +500d95937f3fd81659da66d2099b6c80d988a6b5 \ No newline at end of file diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/background.png.REMOVED.git-id new file mode 100644 index 0000000000..746e4e19e9 --- /dev/null +++ b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/background.png.REMOVED.git-id @@ -0,0 +1 @@ +500d95937f3fd81659da66d2099b6c80d988a6b5 \ No newline at end of file diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/background.png.REMOVED.git-id new file mode 100644 index 0000000000..746e4e19e9 --- /dev/null +++ b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/background.png.REMOVED.git-id @@ -0,0 +1 @@ +500d95937f3fd81659da66d2099b6c80d988a6b5 \ No newline at end of file diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/background.png.REMOVED.git-id new file mode 100644 index 0000000000..746e4e19e9 --- /dev/null +++ b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/background.png.REMOVED.git-id @@ -0,0 +1 @@ +500d95937f3fd81659da66d2099b6c80d988a6b5 \ No newline at end of file diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/background.png.REMOVED.git-id new file mode 100644 index 0000000000..746e4e19e9 --- /dev/null +++ b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/background.png.REMOVED.git-id @@ -0,0 +1 @@ +500d95937f3fd81659da66d2099b6c80d988a6b5 \ No newline at end of file diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/background.png.REMOVED.git-id new file mode 100644 index 0000000000..746e4e19e9 --- /dev/null +++ b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/background.png.REMOVED.git-id @@ -0,0 +1 @@ +500d95937f3fd81659da66d2099b6c80d988a6b5 \ No newline at end of file diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UITextField_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UITextField_Editor/background.png.REMOVED.git-id new file mode 100644 index 0000000000..746e4e19e9 --- /dev/null +++ b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UITextField_Editor/background.png.REMOVED.git-id @@ -0,0 +1 @@ +500d95937f3fd81659da66d2099b6c80d988a6b5 \ No newline at end of file diff --git a/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/background.png.REMOVED.git-id new file mode 100644 index 0000000000..746e4e19e9 --- /dev/null +++ b/tests/cpp-tests/Resources/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/background.png.REMOVED.git-id @@ -0,0 +1 @@ +500d95937f3fd81659da66d2099b6c80d988a6b5 \ No newline at end of file diff --git a/tests/cpp-tests/Resources/cocosgui/UITest/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosgui/UITest/background.png.REMOVED.git-id new file mode 100644 index 0000000000..746e4e19e9 --- /dev/null +++ b/tests/cpp-tests/Resources/cocosgui/UITest/background.png.REMOVED.git-id @@ -0,0 +1 @@ +500d95937f3fd81659da66d2099b6c80d988a6b5 \ No newline at end of file diff --git a/tests/cpp-tests/Resources/cocosgui/b11.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosgui/b11.png.REMOVED.git-id new file mode 100644 index 0000000000..0b4502562c --- /dev/null +++ b/tests/cpp-tests/Resources/cocosgui/b11.png.REMOVED.git-id @@ -0,0 +1 @@ +39179659c7b94b213b6ab7b24372c96378f61062 \ No newline at end of file diff --git a/samples/cpp-tests/Resources/fonts/bitmapFontTest2.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosgui/bitmapFontTest2.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/fonts/bitmapFontTest2.png.REMOVED.git-id rename to tests/cpp-tests/Resources/cocosgui/bitmapFontTest2.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/cocosgui/examples/examples.json.REMOVED.git-id b/tests/cpp-tests/Resources/cocosgui/examples/examples.json.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/cocosgui/examples/examples.json.REMOVED.git-id rename to tests/cpp-tests/Resources/cocosgui/examples/examples.json.REMOVED.git-id diff --git a/tests/cpp-tests/Resources/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id new file mode 100644 index 0000000000..6f99243a26 --- /dev/null +++ b/tests/cpp-tests/Resources/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id @@ -0,0 +1 @@ +39d29cbeb700598c3e4ad6d3ee0ac273a3385fcd \ No newline at end of file diff --git a/tests/cpp-tests/Resources/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id new file mode 100644 index 0000000000..746e4e19e9 --- /dev/null +++ b/tests/cpp-tests/Resources/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id @@ -0,0 +1 @@ +500d95937f3fd81659da66d2099b6c80d988a6b5 \ No newline at end of file diff --git a/samples/cpp-tests/Resources/commonly_used_words.txt b/tests/cpp-tests/Resources/commonly_used_words.txt similarity index 100% rename from samples/cpp-tests/Resources/commonly_used_words.txt rename to tests/cpp-tests/Resources/commonly_used_words.txt diff --git a/tests/cpp-tests/Resources/extensions/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/extensions/background.png.REMOVED.git-id new file mode 100644 index 0000000000..746e4e19e9 --- /dev/null +++ b/tests/cpp-tests/Resources/extensions/background.png.REMOVED.git-id @@ -0,0 +1 @@ +500d95937f3fd81659da66d2099b6c80d988a6b5 \ No newline at end of file diff --git a/samples/cpp-tests/Resources/fonts/Courier New.ttf.REMOVED.git-id b/tests/cpp-tests/Resources/fonts/Courier New.ttf.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/fonts/Courier New.ttf.REMOVED.git-id rename to tests/cpp-tests/Resources/fonts/Courier New.ttf.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/fonts/Thonburi.ttf.REMOVED.git-id b/tests/cpp-tests/Resources/fonts/Thonburi.ttf.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/fonts/Thonburi.ttf.REMOVED.git-id rename to tests/cpp-tests/Resources/fonts/Thonburi.ttf.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/fonts/ThonburiBold.ttf.REMOVED.git-id b/tests/cpp-tests/Resources/fonts/ThonburiBold.ttf.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/fonts/ThonburiBold.ttf.REMOVED.git-id rename to tests/cpp-tests/Resources/fonts/ThonburiBold.ttf.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/fonts/arial-26-en-ru_0.png.REMOVED.git-id b/tests/cpp-tests/Resources/fonts/arial-26-en-ru_0.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/fonts/arial-26-en-ru_0.png.REMOVED.git-id rename to tests/cpp-tests/Resources/fonts/arial-26-en-ru_0.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/fonts/arial-unicode-26.GlyphProject b/tests/cpp-tests/Resources/fonts/arial-unicode-26.GlyphProject similarity index 100% rename from samples/cpp-tests/Resources/fonts/arial-unicode-26.GlyphProject rename to tests/cpp-tests/Resources/fonts/arial-unicode-26.GlyphProject diff --git a/samples/cpp-tests/Resources/fonts/arial-unicode-26.png.REMOVED.git-id b/tests/cpp-tests/Resources/fonts/arial-unicode-26.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/fonts/arial-unicode-26.png.REMOVED.git-id rename to tests/cpp-tests/Resources/fonts/arial-unicode-26.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/fonts/arial.ttf.REMOVED.git-id b/tests/cpp-tests/Resources/fonts/arial.ttf.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/fonts/arial.ttf.REMOVED.git-id rename to tests/cpp-tests/Resources/fonts/arial.ttf.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/fonts/bitmapFontChinese.png.REMOVED.git-id b/tests/cpp-tests/Resources/fonts/bitmapFontChinese.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/fonts/bitmapFontChinese.png.REMOVED.git-id rename to tests/cpp-tests/Resources/fonts/bitmapFontChinese.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/fonts/bitmapFontTest.png.REMOVED.git-id b/tests/cpp-tests/Resources/fonts/bitmapFontTest.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/fonts/bitmapFontTest.png.REMOVED.git-id rename to tests/cpp-tests/Resources/fonts/bitmapFontTest.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/fonts/bitmapFontTest2.bmp.REMOVED.git-id b/tests/cpp-tests/Resources/fonts/bitmapFontTest2.bmp.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/fonts/bitmapFontTest2.bmp.REMOVED.git-id rename to tests/cpp-tests/Resources/fonts/bitmapFontTest2.bmp.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/cocosgui/bitmapFontTest2.png.REMOVED.git-id b/tests/cpp-tests/Resources/fonts/bitmapFontTest2.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/cocosgui/bitmapFontTest2.png.REMOVED.git-id rename to tests/cpp-tests/Resources/fonts/bitmapFontTest2.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/fonts/boundsTestFont.png.REMOVED.git-id b/tests/cpp-tests/Resources/fonts/boundsTestFont.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/fonts/boundsTestFont.png.REMOVED.git-id rename to tests/cpp-tests/Resources/fonts/boundsTestFont.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/fonts/font-issue1343-hd.png.REMOVED.git-id b/tests/cpp-tests/Resources/fonts/font-issue1343-hd.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/fonts/font-issue1343-hd.png.REMOVED.git-id rename to tests/cpp-tests/Resources/fonts/font-issue1343-hd.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/fonts/futura-48.png.REMOVED.git-id b/tests/cpp-tests/Resources/fonts/futura-48.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/fonts/futura-48.png.REMOVED.git-id rename to tests/cpp-tests/Resources/fonts/futura-48.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/fonts/helvetica-geneva-32.png.REMOVED.git-id b/tests/cpp-tests/Resources/fonts/helvetica-geneva-32.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/fonts/helvetica-geneva-32.png.REMOVED.git-id rename to tests/cpp-tests/Resources/fonts/helvetica-geneva-32.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/fonts/markerFelt.fnt.REMOVED.git-id b/tests/cpp-tests/Resources/fonts/markerFelt.fnt.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/fonts/markerFelt.fnt.REMOVED.git-id rename to tests/cpp-tests/Resources/fonts/markerFelt.fnt.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/fonts/strings.xml b/tests/cpp-tests/Resources/fonts/strings.xml similarity index 100% rename from samples/cpp-tests/Resources/fonts/strings.xml rename to tests/cpp-tests/Resources/fonts/strings.xml diff --git a/samples/cpp-tests/Resources/fonts/tahoma.ttf.REMOVED.git-id b/tests/cpp-tests/Resources/fonts/tahoma.ttf.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/fonts/tahoma.ttf.REMOVED.git-id rename to tests/cpp-tests/Resources/fonts/tahoma.ttf.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/fonts/wt021.ttf.REMOVED.git-id b/tests/cpp-tests/Resources/fonts/wt021.ttf.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/fonts/wt021.ttf.REMOVED.git-id rename to tests/cpp-tests/Resources/fonts/wt021.ttf.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/Images/background1.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/Images/background1.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/Images/background1.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/Images/background1.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/Images/background2.jpg.REMOVED.git-id b/tests/cpp-tests/Resources/hd/Images/background2.jpg.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/Images/background2.jpg.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/Images/background2.jpg.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/Images/background2.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/Images/background2.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/Images/background2.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/Images/background2.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/armature/Cowboy0.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/armature/Cowboy0.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/armature/Cowboy0.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/armature/Cowboy0.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/armature/Dragon.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/armature/Dragon.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/armature/Dragon.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/armature/Dragon.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/armature/HeroAnimation0.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/armature/HeroAnimation0.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/armature/HeroAnimation0.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/armature/HeroAnimation0.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/armature/weapon.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/armature/weapon.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/armature/weapon.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/armature/weapon.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/ccb/burst.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/ccb/burst.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/ccb/burst.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/ccb/burst.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/cocosgui/Hello.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/cocosgui/Hello.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/cocosgui/Hello.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/cocosgui/Hello.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIButton_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIButton_Editor/background.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIButton_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIButton_Editor/background.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UICheckBox_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UICheckBox_Editor/background.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UICheckBox_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UICheckBox_Editor/background.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIImageView_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIImageView_Editor/background.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIImageView_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIImageView_Editor/background.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILabelAtlas_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILabelAtlas_Editor/background.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILabelAtlas_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILabelAtlas_Editor/background.png.REMOVED.git-id diff --git a/tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.png.REMOVED.git-id new file mode 100644 index 0000000000..53ce8980e1 --- /dev/null +++ b/tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.png.REMOVED.git-id @@ -0,0 +1 @@ +9d2adf428a20b8facb57c0b3dc8dd782c74e27ea \ No newline at end of file diff --git a/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILabelBMFont_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILabelBMFont_Editor/background.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILabelBMFont_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILabelBMFont_Editor/background.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILabel_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILabel_Editor/background.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILabel_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILabel_Editor/background.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/Hello.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/Hello.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/Hello.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/Hello.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/background.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/background.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/background.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/background.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/background.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/background.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/background.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/background.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/background.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/background.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/background.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/background.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/background.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/background.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/background.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/background.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/background.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/background.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/background.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/background.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/background.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/background.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILoadingBar_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILoadingBar_Editor/background.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILoadingBar_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILoadingBar_Editor/background.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIPageView_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIPageView_Editor/background.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIPageView_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIPageView_Editor/background.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/background.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/background.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/background.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/background.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/background.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/background.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UISlider_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UISlider_Editor/background.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UISlider_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UISlider_Editor/background.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UITextField_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UITextField_Editor/background.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UITextField_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UITextField_Editor/background.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/background.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/background.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/cocosgui/UITest/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/cocosgui/UITest/background.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/cocosgui/UITest/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/cocosgui/UITest/background.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/cocosgui/b11.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/cocosgui/b11.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/cocosgui/b11.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/cocosgui/b11.png.REMOVED.git-id diff --git a/tests/cpp-tests/Resources/hd/cocosgui/bitmapFontTest2.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/cocosgui/bitmapFontTest2.png.REMOVED.git-id new file mode 100644 index 0000000000..d025022480 --- /dev/null +++ b/tests/cpp-tests/Resources/hd/cocosgui/bitmapFontTest2.png.REMOVED.git-id @@ -0,0 +1 @@ +9975e4961272d5bda6d5f3bbd61ea0fc02222199 \ No newline at end of file diff --git a/tests/cpp-tests/Resources/hd/cocosgui/examples/examples.json.REMOVED.git-id b/tests/cpp-tests/Resources/hd/cocosgui/examples/examples.json.REMOVED.git-id new file mode 100644 index 0000000000..f45f8e2ea7 --- /dev/null +++ b/tests/cpp-tests/Resources/hd/cocosgui/examples/examples.json.REMOVED.git-id @@ -0,0 +1 @@ +9794da238f4eddd121498848aeb524c6224138a2 \ No newline at end of file diff --git a/samples/cpp-tests/Resources/hd/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/extensions/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/extensions/background.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/extensions/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/extensions/background.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/fonts/font-issue1343.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/fonts/font-issue1343.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/fonts/font-issue1343.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/fonts/font-issue1343.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/fonts/markerFelt.fnt.REMOVED.git-id b/tests/cpp-tests/Resources/hd/fonts/markerFelt.fnt.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/fonts/markerFelt.fnt.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/fonts/markerFelt.fnt.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/fonts/markerFelt.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/fonts/markerFelt.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/fonts/markerFelt.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/fonts/markerFelt.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/fonts/tuffy_bold_italic-charmap.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/fonts/tuffy_bold_italic-charmap.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/fonts/tuffy_bold_italic-charmap.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/fonts/tuffy_bold_italic-charmap.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/scenetest/ArmatureComponentTest/Images/startMenuBG.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/scenetest/ArmatureComponentTest/Images/startMenuBG.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/scenetest/ArmatureComponentTest/Images/startMenuBG.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/scenetest/ArmatureComponentTest/Images/startMenuBG.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/scenetest/BackgroundComponentTest/Images/startMenuBG.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/scenetest/BackgroundComponentTest/Images/startMenuBG.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/scenetest/BackgroundComponentTest/Images/startMenuBG.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/scenetest/BackgroundComponentTest/Images/startMenuBG.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/scenetest/BackgroundComponentTest/Misc/music_logo.mp3.REMOVED.git-id b/tests/cpp-tests/Resources/hd/scenetest/BackgroundComponentTest/Misc/music_logo.mp3.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/scenetest/BackgroundComponentTest/Misc/music_logo.mp3.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/scenetest/BackgroundComponentTest/Misc/music_logo.mp3.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/scenetest/BackgroundComponentTest/Misc/music_logo.wav.REMOVED.git-id b/tests/cpp-tests/Resources/hd/scenetest/BackgroundComponentTest/Misc/music_logo.wav.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/scenetest/BackgroundComponentTest/Misc/music_logo.wav.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/scenetest/BackgroundComponentTest/Misc/music_logo.wav.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/scenetest/EffectComponentTest/CowBoy/Cowboy.ExportJson.REMOVED.git-id b/tests/cpp-tests/Resources/hd/scenetest/EffectComponentTest/CowBoy/Cowboy.ExportJson.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/scenetest/EffectComponentTest/CowBoy/Cowboy.ExportJson.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/scenetest/EffectComponentTest/CowBoy/Cowboy.ExportJson.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/scenetest/EffectComponentTest/CowBoy/Cowboy0.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/scenetest/EffectComponentTest/CowBoy/Cowboy0.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/scenetest/EffectComponentTest/CowBoy/Cowboy0.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/scenetest/EffectComponentTest/CowBoy/Cowboy0.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id b/tests/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id b/tests/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/scenetest/TriggerTest/Images/startMenuBG.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/scenetest/TriggerTest/Images/startMenuBG.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/scenetest/TriggerTest/Images/startMenuBG.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/scenetest/TriggerTest/Images/startMenuBG.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/scenetest/TriggerTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/scenetest/TriggerTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/scenetest/TriggerTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/scenetest/TriggerTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/scenetest/UIComponentTest/Images/startMenuBG.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/scenetest/UIComponentTest/Images/startMenuBG.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/scenetest/UIComponentTest/Images/startMenuBG.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/scenetest/UIComponentTest/Images/startMenuBG.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/spine/goblins.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/spine/goblins.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/spine/goblins.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/spine/goblins.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/hd/spine/spineboy.png.REMOVED.git-id b/tests/cpp-tests/Resources/hd/spine/spineboy.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/hd/spine/spineboy.png.REMOVED.git-id rename to tests/cpp-tests/Resources/hd/spine/spineboy.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/ipad/ccb/burst.png.REMOVED.git-id b/tests/cpp-tests/Resources/ipad/ccb/burst.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/ipad/ccb/burst.png.REMOVED.git-id rename to tests/cpp-tests/Resources/ipad/ccb/burst.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/ipad/extensions/background.png.REMOVED.git-id b/tests/cpp-tests/Resources/ipad/extensions/background.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/ipad/extensions/background.png.REMOVED.git-id rename to tests/cpp-tests/Resources/ipad/extensions/background.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/scenetest/ArmatureComponentTest/Images/startMenuBG.png.REMOVED.git-id b/tests/cpp-tests/Resources/scenetest/ArmatureComponentTest/Images/startMenuBG.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/scenetest/ArmatureComponentTest/Images/startMenuBG.png.REMOVED.git-id rename to tests/cpp-tests/Resources/scenetest/ArmatureComponentTest/Images/startMenuBG.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id b/tests/cpp-tests/Resources/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id rename to tests/cpp-tests/Resources/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id b/tests/cpp-tests/Resources/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id rename to tests/cpp-tests/Resources/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/scenetest/BackgroundComponentTest/Images/startMenuBG.png.REMOVED.git-id b/tests/cpp-tests/Resources/scenetest/BackgroundComponentTest/Images/startMenuBG.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/scenetest/BackgroundComponentTest/Images/startMenuBG.png.REMOVED.git-id rename to tests/cpp-tests/Resources/scenetest/BackgroundComponentTest/Images/startMenuBG.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/scenetest/BackgroundComponentTest/Misc/music_logo.mp3.REMOVED.git-id b/tests/cpp-tests/Resources/scenetest/BackgroundComponentTest/Misc/music_logo.mp3.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/scenetest/BackgroundComponentTest/Misc/music_logo.mp3.REMOVED.git-id rename to tests/cpp-tests/Resources/scenetest/BackgroundComponentTest/Misc/music_logo.mp3.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/scenetest/BackgroundComponentTest/Misc/music_logo.wav.REMOVED.git-id b/tests/cpp-tests/Resources/scenetest/BackgroundComponentTest/Misc/music_logo.wav.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/scenetest/BackgroundComponentTest/Misc/music_logo.wav.REMOVED.git-id rename to tests/cpp-tests/Resources/scenetest/BackgroundComponentTest/Misc/music_logo.wav.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/scenetest/BackgroundComponentTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id b/tests/cpp-tests/Resources/scenetest/BackgroundComponentTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/scenetest/BackgroundComponentTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id rename to tests/cpp-tests/Resources/scenetest/BackgroundComponentTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/scenetest/EffectComponentTest/CowBoy/Cowboy.ExportJson.REMOVED.git-id b/tests/cpp-tests/Resources/scenetest/EffectComponentTest/CowBoy/Cowboy.ExportJson.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/scenetest/EffectComponentTest/CowBoy/Cowboy.ExportJson.REMOVED.git-id rename to tests/cpp-tests/Resources/scenetest/EffectComponentTest/CowBoy/Cowboy.ExportJson.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/scenetest/EffectComponentTest/CowBoy/Cowboy0.png.REMOVED.git-id b/tests/cpp-tests/Resources/scenetest/EffectComponentTest/CowBoy/Cowboy0.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/scenetest/EffectComponentTest/CowBoy/Cowboy0.png.REMOVED.git-id rename to tests/cpp-tests/Resources/scenetest/EffectComponentTest/CowBoy/Cowboy0.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id b/tests/cpp-tests/Resources/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id rename to tests/cpp-tests/Resources/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id b/tests/cpp-tests/Resources/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id rename to tests/cpp-tests/Resources/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id b/tests/cpp-tests/Resources/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id rename to tests/cpp-tests/Resources/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id b/tests/cpp-tests/Resources/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id rename to tests/cpp-tests/Resources/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id b/tests/cpp-tests/Resources/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id rename to tests/cpp-tests/Resources/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id b/tests/cpp-tests/Resources/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id rename to tests/cpp-tests/Resources/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/scenetest/TriggerTest/Images/startMenuBG.png.REMOVED.git-id b/tests/cpp-tests/Resources/scenetest/TriggerTest/Images/startMenuBG.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/scenetest/TriggerTest/Images/startMenuBG.png.REMOVED.git-id rename to tests/cpp-tests/Resources/scenetest/TriggerTest/Images/startMenuBG.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id b/tests/cpp-tests/Resources/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id rename to tests/cpp-tests/Resources/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/scenetest/TriggerTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id b/tests/cpp-tests/Resources/scenetest/TriggerTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/scenetest/TriggerTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id rename to tests/cpp-tests/Resources/scenetest/TriggerTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/scenetest/UIComponentTest/Images/startMenuBG.png.REMOVED.git-id b/tests/cpp-tests/Resources/scenetest/UIComponentTest/Images/startMenuBG.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/scenetest/UIComponentTest/Images/startMenuBG.png.REMOVED.git-id rename to tests/cpp-tests/Resources/scenetest/UIComponentTest/Images/startMenuBG.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id b/tests/cpp-tests/Resources/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id rename to tests/cpp-tests/Resources/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id b/tests/cpp-tests/Resources/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id rename to tests/cpp-tests/Resources/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id diff --git a/samples/cpp-tests/Resources/spine/goblins.png.REMOVED.git-id b/tests/cpp-tests/Resources/spine/goblins.png.REMOVED.git-id similarity index 100% rename from samples/cpp-tests/Resources/spine/goblins.png.REMOVED.git-id rename to tests/cpp-tests/Resources/spine/goblins.png.REMOVED.git-id diff --git a/tests/cpp-tests/proj.android/.classpath b/tests/cpp-tests/proj.android/.classpath new file mode 100644 index 0000000000..c06dfcb8e5 --- /dev/null +++ b/tests/cpp-tests/proj.android/.classpath @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/samples/cpp-tests/proj.android/.project b/tests/cpp-tests/proj.android/.project similarity index 98% rename from samples/cpp-tests/proj.android/.project rename to tests/cpp-tests/proj.android/.project index 3993dc62b8..e6b233a3c7 100644 --- a/samples/cpp-tests/proj.android/.project +++ b/tests/cpp-tests/proj.android/.project @@ -1,6 +1,6 @@ - TestCpp + CppTests diff --git a/samples/cpp-tests/proj.android/AndroidManifest.xml b/tests/cpp-tests/proj.android/AndroidManifest.xml similarity index 90% rename from samples/cpp-tests/proj.android/AndroidManifest.xml rename to tests/cpp-tests/proj.android/AndroidManifest.xml index 2d00af9411..36b422af01 100644 --- a/samples/cpp-tests/proj.android/AndroidManifest.xml +++ b/tests/cpp-tests/proj.android/AndroidManifest.xml @@ -1,6 +1,7 @@ @@ -18,7 +19,7 @@ + android:value="cpp_tests" /> diff --git a/tests/cpp-tests/proj.android/README.md b/tests/cpp-tests/proj.android/README.md new file mode 100644 index 0000000000..a4670ebabc --- /dev/null +++ b/tests/cpp-tests/proj.android/README.md @@ -0,0 +1,87 @@ +## Prerequisites: + +* Android NDK +* Android SDK **OR** Eclipse ADT Bundle +* Android AVD target installed + +## Building project + +There are two ways of building Android projects. + +1. Eclipse +2. Command Line + +### Import Project in Eclipse + +#### Features: + +1. Complete workflow from Eclipse, including: + * Build C++. + * Clean C++. + * Build and Run whole project. + * Logcat view. + * Debug Java code. + * Javascript editor. + * Project management. +2. True C++ editing, including: + * Code completion. + * Jump to definition. + * Refactoring tools etc. + * Quick open C++ files. + + +#### Setup Eclipse Environment (only once) + + +**NOTE:** This step needs to be done only once to setup the Eclipse environment for cocos2d-x projects. Skip this section if you've done this before. + +1. Download Eclipse ADT bundle from [Google ADT homepage](http://developer.android.com/sdk/index.html) + + **OR** + + Install Eclipse with Java. Add ADT and CDT plugins. + +2. Only for Windows + 1. Install [Cygwin](http://www.cygwin.com/) with make (select make package from the list during the install). + 2. Add `Cygwin\bin` directory to system PATH variable. + 3. Add this line `none /cygdrive cygdrive binary,noacl,posix=0,user 0 0` to `Cygwin\etc\fstab` file. + +3. Set up Variables: + 1. Path Variable `COCOS2DX`: + * Eclipse->Preferences->General->Workspace->**Linked Resources** + * Click **New** button to add a Path Variable `COCOS2DX` pointing to the root cocos2d-x directory. + ![Example](https://lh5.googleusercontent.com/-oPpk9kg3e5w/UUOYlq8n7aI/AAAAAAAAsdQ/zLA4eghBH9U/s400/cocos2d-x-eclipse-vars.png) + + 2. C/C++ Environment Variable `NDK_ROOT`: + * Eclipse->Preferences->C/C++->Build->**Environment**. + * Click **Add** button and add a new variable `NDK_ROOT` pointing to the root NDK directory. + ![Example](https://lh3.googleusercontent.com/-AVcY8IAT0_g/UUOYltoRobI/AAAAAAAAsdM/22D2J9u3sig/s400/cocos2d-x-eclipse-ndk.png) + * Only for Windows: Add new variables **CYGWIN** with value `nodosfilewarning` and **SHELLOPTS** with value `igncr` + +4. Import libcocos2dx library project: + 1. File->New->Project->Android Project From Existing Code. + 2. Click **Browse** button and open `cocos2d-x/cocos2dx/platform/android/java` directory. + 3. Click **Finish** to add project. + +#### Adding and running from Eclipse + +![Example](https://lh3.googleusercontent.com/-SLBOu6e3QbE/UUOcOXYaGqI/AAAAAAAAsdo/tYBY2SylOSM/s288/cocos2d-x-eclipse-project-from-code.png) ![Import](https://lh5.googleusercontent.com/-XzC9Pn65USc/UUOcOTAwizI/AAAAAAAAsdk/4b6YM-oim9Y/s400/cocos2d-x-eclipse-import-project.png) + +1. File->New->Project->Android Project From Existing Code +2. **Browse** to your project directory. eg: `cocos2d-x/cocos2dx/samples/Cpp/CppTests/proj.android/` +3. Add the project +4. Click **Run** or **Debug** to compile C++ followed by Java and to run on connected device or emulator. + + +### Running project from Command Line + + $ cd cocos2d-x/samples/Cpp/CppTests/proj.android/ + $ export NDK_ROOT=/path/to/ndk + $ ./build_native.sh + $ ant debug install + +If the last command results in sdk.dir missing error then do: + + $ android list target + $ android update project -p . -t (id from step 6) + $ android update project -p cocos2d-x/cocos2dx/platform/android/java/ -t (id from step 6) diff --git a/samples/lua-tests/project/proj.android/ant.properties b/tests/cpp-tests/proj.android/ant.properties similarity index 100% rename from samples/lua-tests/project/proj.android/ant.properties rename to tests/cpp-tests/proj.android/ant.properties diff --git a/samples/lua-tests/project/proj.android/build.xml b/tests/cpp-tests/proj.android/build.xml similarity index 98% rename from samples/lua-tests/project/proj.android/build.xml rename to tests/cpp-tests/proj.android/build.xml index 0d99a1f0fc..a8d2eb0eee 100644 --- a/samples/lua-tests/project/proj.android/build.xml +++ b/tests/cpp-tests/proj.android/build.xml @@ -1,5 +1,5 @@ - + + android:value="lua_empty_test" /> diff --git a/tests/lua-empty-test/project/proj.android/ant.properties b/tests/lua-empty-test/project/proj.android/ant.properties new file mode 100644 index 0000000000..b0971e891e --- /dev/null +++ b/tests/lua-empty-test/project/proj.android/ant.properties @@ -0,0 +1,17 @@ +# This file is used to override default values used by the Ant build system. +# +# This file must be checked into Version Control Systems, as it is +# integral to the build system of your project. + +# This file is only used by the Ant script. + +# You can use this to override default values such as +# 'source.dir' for the location of your java source folder and +# 'out.dir' for the location of your output folder. + +# You can also use it define how the release builds are signed by declaring +# the following properties: +# 'key.store' for the location of your keystore and +# 'key.alias' for the name of the key to use. +# The password will be asked during the build when you use the 'release' target. + diff --git a/tests/lua-empty-test/project/proj.android/build.xml b/tests/lua-empty-test/project/proj.android/build.xml new file mode 100644 index 0000000000..10c2f09231 --- /dev/null +++ b/tests/lua-empty-test/project/proj.android/build.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/lua-empty-test/project/proj.android/jni/Android.mk b/tests/lua-empty-test/project/proj.android/jni/Android.mk new file mode 100644 index 0000000000..90ed50ee5c --- /dev/null +++ b/tests/lua-empty-test/project/proj.android/jni/Android.mk @@ -0,0 +1,20 @@ +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) + +LOCAL_MODULE := lua_empty_test_shared + +LOCAL_MODULE_FILENAME := liblua_empty_test + +LOCAL_SRC_FILES := main.cpp \ + ../../Classes/AppDelegate.cpp + +LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes \ + $(LOCAL_PATH)/../../../../../external/lua/tolua \ + +LOCAL_WHOLE_STATIC_LIBRARIES := cocos_lua_static + + +include $(BUILD_SHARED_LIBRARY) + +$(call import-module,scripting/lua-bindings) diff --git a/tests/lua-empty-test/project/proj.android/jni/Application.mk b/tests/lua-empty-test/project/proj.android/jni/Application.mk new file mode 100644 index 0000000000..540e49c358 --- /dev/null +++ b/tests/lua-empty-test/project/proj.android/jni/Application.mk @@ -0,0 +1,8 @@ +APP_STL := gnustl_static + +# add -Wno-literal-suffix to avoid warning: warning: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wliteral-suffix] +# in NDK_ROOT/arch-arm/usr/include/sys/cdefs_elf.h:35:28: when using ndk-r9 +APP_CPPFLAGS := -frtti -DCOCOS2D_DEBUG=1 -std=c++11 -Wno-literal-suffix -fsigned-char + +APP_CPPFLAGS += -fexceptions + diff --git a/tests/lua-empty-test/project/proj.android/jni/main.cpp b/tests/lua-empty-test/project/proj.android/jni/main.cpp new file mode 100644 index 0000000000..20e2ea1f45 --- /dev/null +++ b/tests/lua-empty-test/project/proj.android/jni/main.cpp @@ -0,0 +1,15 @@ +#include "AppDelegate.h" +#include "cocos2d.h" +#include "platform/android/jni/JniHelper.h" +#include +#include + +#define LOG_TAG "main" +#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__) + +using namespace cocos2d; + +void cocos_android_app_init (struct android_app* app) { + LOGD("cocos_android_app_init"); + AppDelegate *pAppDelegate = new AppDelegate(); +} diff --git a/tests/lua-empty-test/project/proj.android/proguard-project.txt b/tests/lua-empty-test/project/proj.android/proguard-project.txt new file mode 100644 index 0000000000..f2fe1559a2 --- /dev/null +++ b/tests/lua-empty-test/project/proj.android/proguard-project.txt @@ -0,0 +1,20 @@ +# To enable ProGuard in your project, edit project.properties +# to define the proguard.config property as described in that file. +# +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in ${sdk.dir}/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the ProGuard +# include property in project.properties. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} diff --git a/samples/lua-tests/project/proj.android/project.properties b/tests/lua-empty-test/project/proj.android/project.properties similarity index 100% rename from samples/lua-tests/project/proj.android/project.properties rename to tests/lua-empty-test/project/proj.android/project.properties diff --git a/tests/lua-empty-test/project/proj.android/res/values/strings.xml b/tests/lua-empty-test/project/proj.android/res/values/strings.xml new file mode 100644 index 0000000000..928fc5a2f4 --- /dev/null +++ b/tests/lua-empty-test/project/proj.android/res/values/strings.xml @@ -0,0 +1,4 @@ + + + LuaEmptyTest + diff --git a/tests/lua-empty-test/project/proj.android/src/org/cocos2dx/lua_empty_test/Cocos2dxActivity.java b/tests/lua-empty-test/project/proj.android/src/org/cocos2dx/lua_empty_test/Cocos2dxActivity.java new file mode 100644 index 0000000000..35035a175d --- /dev/null +++ b/tests/lua-empty-test/project/proj.android/src/org/cocos2dx/lua_empty_test/Cocos2dxActivity.java @@ -0,0 +1,32 @@ +package org.cocos2dx.lua_empty_test; + +import android.app.NativeActivity; +import android.os.Bundle; + +public class Cocos2dxActivity extends NativeActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + // TODO Auto-generated method stub + super.onCreate(savedInstanceState); + + //For supports translucency + + //1.change "attribs" in cocos\2d\platform\android\nativeactivity.cpp + /*const EGLint attribs[] = { + EGL_SURFACE_TYPE, EGL_WINDOW_BIT, + EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT, + //EGL_BLUE_SIZE, 5, -->delete + //EGL_GREEN_SIZE, 6, -->delete + //EGL_RED_SIZE, 5, -->delete + EGL_BUFFER_SIZE, 32, //-->new field + EGL_DEPTH_SIZE, 16, + EGL_STENCIL_SIZE, 8, + EGL_NONE + };*/ + + //2.Set the format of window + // getWindow().setFormat(PixelFormat.TRANSLUCENT); + + } +} diff --git a/tests/lua-empty-test/project/proj.ios/AppController.h b/tests/lua-empty-test/project/proj.ios/AppController.h new file mode 100644 index 0000000000..3d51064ca0 --- /dev/null +++ b/tests/lua-empty-test/project/proj.ios/AppController.h @@ -0,0 +1,33 @@ +/**************************************************************************** + Copyright (c) 2010 cocos2d-x.org + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +@class RootViewController; + +@interface AppController : NSObject { + UIWindow *window; + RootViewController *viewController; +} + +@end + diff --git a/tests/lua-empty-test/project/proj.ios/AppController.mm b/tests/lua-empty-test/project/proj.ios/AppController.mm new file mode 100644 index 0000000000..9f38038aed --- /dev/null +++ b/tests/lua-empty-test/project/proj.ios/AppController.mm @@ -0,0 +1,139 @@ +/**************************************************************************** + Copyright (c) 2010 cocos2d-x.org + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ +#import +#import "AppController.h" +#import "cocos2d.h" +#import "CCEAGLView.h" +#import "AppDelegate.h" + +#import "RootViewController.h" + +@implementation AppController + +#pragma mark - +#pragma mark Application lifecycle + +// cocos2d application instance +static AppDelegate s_sharedApplication; + +- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { + + // Override point for customization after application launch. + + // Add the view controller's view to the window and display. + window = [[UIWindow alloc] initWithFrame: [[UIScreen mainScreen] bounds]]; + CCEAGLView *eaglView = [CCEAGLView viewWithFrame: [window bounds] + pixelFormat: kEAGLColorFormatRGBA8 + depthFormat: GL_DEPTH_COMPONENT16 + preserveBackbuffer: NO + sharegroup: nil + multiSampling: NO + numberOfSamples: 0 ]; + + // Use RootViewController manage CCEAGLView + viewController = [[RootViewController alloc] initWithNibName:nil bundle:nil]; + viewController.wantsFullScreenLayout = YES; + viewController.view = eaglView; + + // Set RootViewController to window + if ( [[UIDevice currentDevice].systemVersion floatValue] < 6.0) + { + // warning: addSubView doesn't work on iOS6 + [window addSubview: viewController.view]; + } + else + { + // use this method on ios6 + [window setRootViewController:viewController]; + } + + [window makeKeyAndVisible]; + + [[UIApplication sharedApplication] setStatusBarHidden: YES]; + + // IMPORTANT: Setting the GLView should be done after creating the RootViewController + cocos2d::GLView *glview = cocos2d::GLView::createWithEAGLView(eaglView); + cocos2d::Director::getInstance()->setOpenGLView(glview); + + cocos2d::Application *app = cocos2d::Application::getInstance(); + app->run(); + return YES; +} + + +- (void)applicationWillResignActive:(UIApplication *)application { + /* + Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state. + Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game. + */ + cocos2d::Director::getInstance()->pause(); +} + +- (void)applicationDidBecomeActive:(UIApplication *)application { + /* + Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. + */ + cocos2d::Director::getInstance()->resume(); +} + +- (void)applicationDidEnterBackground:(UIApplication *)application { + /* + Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. + If your application supports background execution, called instead of applicationWillTerminate: when the user quits. + */ + cocos2d::Application::getInstance()->applicationDidEnterBackground(); +} + +- (void)applicationWillEnterForeground:(UIApplication *)application { + /* + Called as part of transition from the background to the inactive state: here you can undo many of the changes made on entering the background. + */ + cocos2d::Application::getInstance()->applicationWillEnterForeground(); +} + +- (void)applicationWillTerminate:(UIApplication *)application { + /* + Called when the application is about to terminate. + See also applicationDidEnterBackground:. + */ +} + + +#pragma mark - +#pragma mark Memory management + +- (void)applicationDidReceiveMemoryWarning:(UIApplication *)application { + /* + Free up as much memory as possible by purging cached data objects that can be recreated (or reloaded from disk) later. + */ +} + + +- (void)dealloc { + [super dealloc]; +} + + +@end + diff --git a/tests/lua-empty-test/project/proj.ios/Default-568h@2x.png.REMOVED.git-id b/tests/lua-empty-test/project/proj.ios/Default-568h@2x.png.REMOVED.git-id new file mode 100644 index 0000000000..8f5838f3a8 --- /dev/null +++ b/tests/lua-empty-test/project/proj.ios/Default-568h@2x.png.REMOVED.git-id @@ -0,0 +1 @@ +66c6d1cead373b45218424f6a82f370897e443e4 \ No newline at end of file diff --git a/tests/lua-empty-test/project/proj.ios/Default@2x.png.REMOVED.git-id b/tests/lua-empty-test/project/proj.ios/Default@2x.png.REMOVED.git-id new file mode 100644 index 0000000000..8843505b20 --- /dev/null +++ b/tests/lua-empty-test/project/proj.ios/Default@2x.png.REMOVED.git-id @@ -0,0 +1 @@ +84689888a14a2123d2b39f7f2f61be8c15207479 \ No newline at end of file diff --git a/tests/lua-empty-test/project/proj.ios/HelloLua_Prefix.pch b/tests/lua-empty-test/project/proj.ios/HelloLua_Prefix.pch new file mode 100644 index 0000000000..b4311a0a3d --- /dev/null +++ b/tests/lua-empty-test/project/proj.ios/HelloLua_Prefix.pch @@ -0,0 +1,8 @@ +// +// Prefix header for all source files of the 'HelloLua' target in the 'HelloLua' project +// + +#ifdef __OBJC__ + #import + #import +#endif diff --git a/tests/lua-empty-test/project/proj.ios/RootViewController.h b/tests/lua-empty-test/project/proj.ios/RootViewController.h new file mode 100644 index 0000000000..11dfc4bf88 --- /dev/null +++ b/tests/lua-empty-test/project/proj.ios/RootViewController.h @@ -0,0 +1,33 @@ +/**************************************************************************** + Copyright (c) 2010-2011 cocos2d-x.org + Copyright (c) 2010 Ricardo Quesada + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +#import + + +@interface RootViewController : UIViewController { + +} +- (BOOL)prefersStatusBarHidden; +@end diff --git a/samples/lua-tests/project/proj.ios_mac/ios/RootViewController.mm b/tests/lua-empty-test/project/proj.ios/RootViewController.mm similarity index 100% rename from samples/lua-tests/project/proj.ios_mac/ios/RootViewController.mm rename to tests/lua-empty-test/project/proj.ios/RootViewController.mm diff --git a/tests/lua-empty-test/project/proj.ios/main.m b/tests/lua-empty-test/project/proj.ios/main.m new file mode 100644 index 0000000000..27ca9796f7 --- /dev/null +++ b/tests/lua-empty-test/project/proj.ios/main.m @@ -0,0 +1,16 @@ +// +// main.m +// HelloLua +// +// Created by Walzer on 11-6-15. +// Copyright __MyCompanyName__ 2011. All rights reserved. +// + +#import + +int main(int argc, char *argv[]) { + NSAutoreleasePool *pool = [NSAutoreleasePool new]; + int retVal = UIApplicationMain(argc, argv, nil, @"AppController"); + [pool release]; + return retVal; +} diff --git a/tests/lua-empty-test/project/proj.linux/main.cpp b/tests/lua-empty-test/project/proj.linux/main.cpp new file mode 100644 index 0000000000..e420889600 --- /dev/null +++ b/tests/lua-empty-test/project/proj.linux/main.cpp @@ -0,0 +1,16 @@ +#include "../Classes/AppDelegate.h" +#include "cocos2d.h" + +#include +#include +#include +#include + +USING_NS_CC; + +int main(int argc, char **argv) +{ + // create the application instance + AppDelegate app; + return Application::getInstance()->run(); +} diff --git a/samples/lua-tests/project/proj.ios_mac/mac/TestLua_Prefix.pch b/tests/lua-empty-test/project/proj.mac/HelloLua_Prefix.pch similarity index 100% rename from samples/lua-tests/project/proj.ios_mac/mac/TestLua_Prefix.pch rename to tests/lua-empty-test/project/proj.mac/HelloLua_Prefix.pch diff --git a/tests/lua-empty-test/project/proj.mac/Icon.icns.REMOVED.git-id b/tests/lua-empty-test/project/proj.mac/Icon.icns.REMOVED.git-id new file mode 100644 index 0000000000..9874ec6979 --- /dev/null +++ b/tests/lua-empty-test/project/proj.mac/Icon.icns.REMOVED.git-id @@ -0,0 +1 @@ +3d09e8fb4f4ca1c1ae7ab0a6948db592c7c3d9a0 \ No newline at end of file diff --git a/tests/lua-empty-test/project/proj.mac/en.lproj/InfoPlist.strings b/tests/lua-empty-test/project/proj.mac/en.lproj/InfoPlist.strings new file mode 100644 index 0000000000..477b28ff8f --- /dev/null +++ b/tests/lua-empty-test/project/proj.mac/en.lproj/InfoPlist.strings @@ -0,0 +1,2 @@ +/* Localized versions of Info.plist keys */ + diff --git a/tests/lua-empty-test/project/proj.mac/en.lproj/MainMenu.xib b/tests/lua-empty-test/project/proj.mac/en.lproj/MainMenu.xib new file mode 100644 index 0000000000..9f99439250 --- /dev/null +++ b/tests/lua-empty-test/project/proj.mac/en.lproj/MainMenu.xib @@ -0,0 +1,812 @@ + + + + 1060 + 10K549 + 1938 + 1038.36 + 461.00 + + com.apple.InterfaceBuilder.CocoaPlugin + 1938 + + + YES + NSMenuItem + NSCustomObject + NSMenu + + + YES + com.apple.InterfaceBuilder.CocoaPlugin + + + PluginDependencyRecalculationVersion + + + + YES + + NSApplication + + + FirstResponder + + + NSApplication + + + AMainMenu + + YES + + + HelloCpp + + 1048576 + 2147483647 + + NSImage + NSMenuCheckmark + + + NSImage + NSMenuMixedState + + submenuAction: + + HelloCpp + + YES + + + About HelloCpp + + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Preferences… + , + 1048576 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Services + + 1048576 + 2147483647 + + + submenuAction: + + Services + + YES + + _NSServicesMenu + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Hide HelloCpp + h + 1048576 + 2147483647 + + + + + + Hide Others + h + 1572864 + 2147483647 + + + + + + Show All + + 1048576 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Quit HelloCpp + q + 1048576 + 2147483647 + + + + + _NSAppleMenu + + + + + View + + 1048576 + 2147483647 + + + submenuAction: + + View + + YES + + + Toggle Fullscreen + f + 1048576 + 2147483647 + + + + + + + + + Window + + 1048576 + 2147483647 + + + submenuAction: + + Window + + YES + + + Minimize + m + 1048576 + 2147483647 + + + + + + Zoom + + 1048576 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Bring All to Front + + 1048576 + 2147483647 + + + + + _NSWindowsMenu + + + + + Help + + 2147483647 + + + submenuAction: + + Help + + YES + + + HelloCpp Help + ? + 1048576 + 2147483647 + + + + + _NSHelpMenu + + + + _NSMainMenu + + + AppController + + + NSFontManager + + + + + YES + + + terminate: + + + + 449 + + + + orderFrontStandardAboutPanel: + + + + 142 + + + + delegate + + + + 495 + + + + performMiniaturize: + + + + 37 + + + + arrangeInFront: + + + + 39 + + + + performZoom: + + + + 240 + + + + hide: + + + + 367 + + + + hideOtherApplications: + + + + 368 + + + + unhideAllApplications: + + + + 370 + + + + showHelp: + + + + 493 + + + + toggleFullScreen: + + + + 537 + + + + + YES + + 0 + + YES + + + + + + -2 + + + File's Owner + + + -1 + + + First Responder + + + -3 + + + Application + + + 29 + + + YES + + + + + + + + + 19 + + + YES + + + + + + 56 + + + YES + + + + + + 57 + + + YES + + + + + + + + + + + + + + + + 58 + + + + + 134 + + + + + 150 + + + + + 136 + + + + + 144 + + + + + 129 + + + + + 143 + + + + + 236 + + + + + 131 + + + YES + + + + + + 149 + + + + + 145 + + + + + 130 + + + + + 24 + + + YES + + + + + + + + + 92 + + + + + 5 + + + + + 239 + + + + + 23 + + + + + 295 + + + YES + + + + + + 296 + + + YES + + + + + + 420 + + + + + 490 + + + YES + + + + + + 491 + + + YES + + + + + + 492 + + + + + 494 + + + + + 536 + + + + + + + YES + + YES + -1.IBPluginDependency + -2.IBPluginDependency + -3.IBPluginDependency + 129.IBPluginDependency + 130.IBPluginDependency + 131.IBPluginDependency + 134.IBPluginDependency + 136.IBPluginDependency + 143.IBPluginDependency + 144.IBPluginDependency + 145.IBPluginDependency + 149.IBPluginDependency + 150.IBPluginDependency + 19.IBPluginDependency + 23.IBPluginDependency + 236.IBPluginDependency + 239.IBPluginDependency + 24.IBPluginDependency + 29.IBPluginDependency + 295.IBPluginDependency + 296.IBPluginDependency + 420.IBPluginDependency + 490.IBPluginDependency + 491.IBPluginDependency + 492.IBPluginDependency + 494.IBPluginDependency + 5.IBPluginDependency + 536.IBPluginDependency + 56.IBPluginDependency + 57.IBPluginDependency + 58.IBPluginDependency + 92.IBPluginDependency + + + YES + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + YES + + + + + + YES + + + + + 541 + + + + YES + + AppController + NSObject + + YES + + YES + exitFullScreen: + toggleFullScreen: + + + YES + id + id + + + + YES + + YES + exitFullScreen: + toggleFullScreen: + + + YES + + exitFullScreen: + id + + + toggleFullScreen: + id + + + + + YES + + YES + glView + window + + + YES + EAGLView + Window + + + + YES + + YES + glView + window + + + YES + + glView + EAGLView + + + window + Window + + + + + IBProjectSource + ./Classes/AppController.h + + + + EAGLView + NSOpenGLView + + IBProjectSource + ./Classes/EAGLView.h + + + + + 0 + IBCocoaFramework + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + + + YES + 3 + + YES + + YES + NSMenuCheckmark + NSMenuMixedState + + + YES + {9, 8} + {7, 2} + + + + diff --git a/tests/lua-empty-test/project/proj.mac/main.cpp b/tests/lua-empty-test/project/proj.mac/main.cpp new file mode 100644 index 0000000000..96f027e13d --- /dev/null +++ b/tests/lua-empty-test/project/proj.mac/main.cpp @@ -0,0 +1,34 @@ +/**************************************************************************** + Copyright (c) 2010 cocos2d-x.org + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +#include "AppDelegate.h" +#include "cocos2d.h" + +USING_NS_CC; + +int main(int argc, char *argv[]) +{ + AppDelegate app; + return Application::getInstance()->run(); +} diff --git a/tests/lua-empty-test/project/proj.win32/HelloLua.vcxproj b/tests/lua-empty-test/project/proj.win32/HelloLua.vcxproj new file mode 100644 index 0000000000..6ed5cb8431 --- /dev/null +++ b/tests/lua-empty-test/project/proj.win32/HelloLua.vcxproj @@ -0,0 +1,206 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {13E55395-94A2-4CD9-BFC2-1A051F80C17D} + HelloLua.win32 + + + + Application + Unicode + v100 + v110 + v110_xp + + + Application + Unicode + v100 + v110 + v110_xp + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(Configuration).win32\ + $(Configuration).win32\ + true + $(SolutionDir)$(Configuration).win32\ + $(Configuration).win32\ + false + AllRules.ruleset + + + AllRules.ruleset + + + + + $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) + + + $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) + + + + _DEBUG;%(PreprocessorDefinitions) + false + Win32 + true + $(IntDir)HelloLua.tlb + HelloLua.h + + + HelloLua_i.c + HelloLua_p.c + + + Disabled + $(ProjectDir)..\Classes;$(EngineRoot)cocos\scripting\auto-generated\lua-bindings;$(EngineRoot)cocos\scripting\lua\bindings;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\lua\lua;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;STRICT;_DEBUG;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + 4267;4251;4244;%(DisableSpecificWarnings) + true + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories) + + + libcurl_imp.lib;lua51.lib;websockets.lib;%(AdditionalDependencies) + $(OutDir);%(AdditionalLibraryDirectories) + true + Windows + MachineX86 + + + xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua\script" "$(ProjectDir)..\..\HelloLua\Resources" /e /Y + + + if not exist "$(OutDir)" mkdir "$(OutDir)" +xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)" + + + + + + NDEBUG;%(PreprocessorDefinitions) + false + Win32 + true + $(IntDir)HelloLua.tlb + HelloLua.h + + + HelloLua_i.c + HelloLua_p.c + + + $(ProjectDir)..\Classes;$(EngineRoot)cocos\scripting\auto-generated\lua-bindings;$(EngineRoot)cocos\scripting\lua\bindings;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\lua\lua;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;STRICT;NDEBUG;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + MultiThreadedDLL + + + Level3 + + + 4267;4251;4244;%(DisableSpecificWarnings) + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories) + + + libcurl_imp.lib;lua51.lib;websockets.lib;%(AdditionalDependencies) + $(OutDir);%(AdditionalLibraryDirectories) + Windows + MachineX86 + true + + + if not exist "$(OutDir)" mkdir "$(OutDir)" +xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)" + + + + + + + + + + + + + + {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} + + + {f8edd7fa-9a51-4e80-baeb-860825d2eac6} + + + {811c0dab-7b96-4bd3-a154-b7572b58e4ab} + + + {b57cf53f-2e49-4031-9822-047cc0e6bde2} + + + {b7c2a162-dec9-4418-972e-240ab3cbfcae} + + + {7e06e92c-537a-442b-9e4a-4761c84f8a1a} + + + {df2638c0-8128-4847-867c-6eafe3dee7b5} + + + {ddc3e27f-004d-4dd4-9dd3-931a013d2159} + + + {632a8f38-d0f0-4d22-86b3-d69f5e6bf63a} + + + {21b2c324-891f-48ea-ad1a-5ae13de12e28} + + + {207bc7a9-ccf1-4f2f-a04d-45f72242ae25} + + + + + + \ No newline at end of file diff --git a/tests/lua-empty-test/project/proj.win32/HelloLua.vcxproj.filters b/tests/lua-empty-test/project/proj.win32/HelloLua.vcxproj.filters new file mode 100644 index 0000000000..5de7838f8f --- /dev/null +++ b/tests/lua-empty-test/project/proj.win32/HelloLua.vcxproj.filters @@ -0,0 +1,27 @@ + + + + + {83371666-be62-4e91-b8cc-395730853621} + + + {917fb40f-fc6d-4ee9-9a20-26debabe41aa} + + + + + Classes + + + win32 + + + + + Classes + + + win32 + + + \ No newline at end of file diff --git a/tests/lua-empty-test/project/proj.win32/HelloLua.vcxproj.user b/tests/lua-empty-test/project/proj.win32/HelloLua.vcxproj.user new file mode 100644 index 0000000000..32a6296820 --- /dev/null +++ b/tests/lua-empty-test/project/proj.win32/HelloLua.vcxproj.user @@ -0,0 +1,11 @@ + + + + $(ProjectDir)..\Resources + WindowsLocalDebugger + + + $(ProjectDir)..\Resources + WindowsLocalDebugger + + \ No newline at end of file diff --git a/tests/lua-empty-test/project/proj.win32/main.cpp b/tests/lua-empty-test/project/proj.win32/main.cpp new file mode 100644 index 0000000000..b07e50bc66 --- /dev/null +++ b/tests/lua-empty-test/project/proj.win32/main.cpp @@ -0,0 +1,37 @@ +#include "main.h" +#include "AppDelegate.h" +#include "CCEGLView.h" + +USING_NS_CC; + +// uncomment below line, open debug console +#define USE_WIN32_CONSOLE + +int APIENTRY _tWinMain(HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPTSTR lpCmdLine, + int nCmdShow) +{ + UNREFERENCED_PARAMETER(hPrevInstance); + UNREFERENCED_PARAMETER(lpCmdLine); + +#ifdef USE_WIN32_CONSOLE + AllocConsole(); + freopen("CONIN$", "r", stdin); + freopen("CONOUT$", "w", stdout); + freopen("CONOUT$", "w", stderr); +#endif + + // create the application instance + AppDelegate app; + EGLView eglView; + eglView.init("HelloLua",900,640); + + int ret = Application::getInstance()->run(); + +#ifdef USE_WIN32_CONSOLE + FreeConsole(); +#endif + + return ret; +} diff --git a/tests/lua-empty-test/project/proj.win32/main.h b/tests/lua-empty-test/project/proj.win32/main.h new file mode 100644 index 0000000000..e74708bdf2 --- /dev/null +++ b/tests/lua-empty-test/project/proj.win32/main.h @@ -0,0 +1,13 @@ +#ifndef __MAIN_H__ +#define __MAIN_H__ + +#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers + +// Windows Header Files: +#include +#include + +// C RunTime Header Files +#include "CCStdC.h" + +#endif // __MAIN_H__ diff --git a/tests/lua-empty-test/res/.gitignore b/tests/lua-empty-test/res/.gitignore new file mode 100644 index 0000000000..1d65afe366 --- /dev/null +++ b/tests/lua-empty-test/res/.gitignore @@ -0,0 +1,2 @@ +#Do now ignore Marmalade icf files +!*.icf diff --git a/tests/lua-empty-test/res/background.mp3.REMOVED.git-id b/tests/lua-empty-test/res/background.mp3.REMOVED.git-id new file mode 100644 index 0000000000..cfc16a8a4e --- /dev/null +++ b/tests/lua-empty-test/res/background.mp3.REMOVED.git-id @@ -0,0 +1 @@ +aec1c0a8c8068377fddca5ddd32084d8c3c3c419 \ No newline at end of file diff --git a/tests/lua-empty-test/res/farm.jpg.REMOVED.git-id b/tests/lua-empty-test/res/farm.jpg.REMOVED.git-id new file mode 100644 index 0000000000..4609f3cf02 --- /dev/null +++ b/tests/lua-empty-test/res/farm.jpg.REMOVED.git-id @@ -0,0 +1 @@ +d7290c34702d1c6bdb368acb060d93b42d5deff8 \ No newline at end of file diff --git a/tests/lua-empty-test/src/hello.lua b/tests/lua-empty-test/src/hello.lua new file mode 100644 index 0000000000..5bb47e5805 --- /dev/null +++ b/tests/lua-empty-test/src/hello.lua @@ -0,0 +1,209 @@ +require "Cocos2d" +-- cclog +cclog = function(...) + print(string.format(...)) +end + +-- for CCLuaEngine traceback +function __G__TRACKBACK__(msg) + cclog("----------------------------------------") + cclog("LUA ERROR: " .. tostring(msg) .. "\n") + cclog(debug.traceback()) + cclog("----------------------------------------") +end + +local function main() + -- avoid memory leak + collectgarbage("setpause", 100) + collectgarbage("setstepmul", 5000) + + --support debug + local targetPlatform = cc.Application:getInstance():getTargetPlatform() + if (cc.PLATFORM_OS_IPHONE == targetPlatform) or (cc.PLATFORM_OS_IPAD == targetPlatform) or + (cc.PLATFORM_OS_ANDROID == targetPlatform) or (cc.PLATFORM_OS_WINDOWS == targetPlatform) or + (cc.PLATFORM_OS_MAC == targetPlatform) then + local host = 'localhost' -- please change localhost to your PC's IP for on-device debugging + require('src/mobdebug').start(host) + end + require "src/hello2" + cclog("result is " .. myadd(1, 1)) + + --------------- + + local visibleSize = cc.Director:getInstance():getVisibleSize() + local origin = cc.Director:getInstance():getVisibleOrigin() + + -- add the moving dog + local function creatDog() + local frameWidth = 105 + local frameHeight = 95 + + -- create dog animate + local textureDog = cc.TextureCache:getInstance():addImage("res/dog.png") + local rect = cc.rect(0, 0, frameWidth, frameHeight) + local frame0 = cc.SpriteFrame:createWithTexture(textureDog, rect) + rect = cc.rect(frameWidth, 0, frameWidth, frameHeight) + local frame1 = cc.SpriteFrame:createWithTexture(textureDog, rect) + + local spriteDog = cc.Sprite:createWithSpriteFrame(frame0) + spriteDog.isPaused = false + spriteDog:setPosition(origin.x, origin.y + visibleSize.height / 4 * 3) +--[[ + local animFrames = CCArray:create() + + animFrames:addObject(frame0) + animFrames:addObject(frame1) +]]-- + + local animation = cc.Animation:createWithSpriteFrames({frame0,frame1}, 0.5) + local animate = cc.Animate:create(animation); + spriteDog:runAction(cc.RepeatForever:create(animate)) + + -- moving dog at every frame + local function tick() + if spriteDog.isPaused then return end + local x, y = spriteDog:getPosition() + if x > origin.x + visibleSize.width then + x = origin.x + else + x = x + 1 + end + + spriteDog:setPositionX(x) + end + + cc.Director:getInstance():getScheduler():scheduleScriptFunc(tick, 0, false) + + return spriteDog + end + + -- create farm + local function createLayerFarm() + local layerFarm = cc.Layer:create() + + -- add in farm background + local bg = cc.Sprite:create("res/farm.jpg") + bg:setPosition(origin.x + visibleSize.width / 2 + 80, origin.y + visibleSize.height / 2) + layerFarm:addChild(bg) + + -- add land sprite + for i = 0, 3 do + for j = 0, 1 do + local spriteLand = cc.Sprite:create("res/land.png") + spriteLand:setPosition(200 + j * 180 - i % 2 * 90, 10 + i * 95 / 2) + layerFarm:addChild(spriteLand) + end + end + + -- add crop + local frameCrop = cc.SpriteFrame:create("res/crop.png", cc.rect(0, 0, 105, 95)) + for i = 0, 3 do + for j = 0, 1 do + local spriteCrop = cc.Sprite:createWithSpriteFrame(frameCrop); + spriteCrop:setPosition(10 + 200 + j * 180 - i % 2 * 90, 30 + 10 + i * 95 / 2) + layerFarm:addChild(spriteCrop) + end + end + + -- add moving dog + local spriteDog = creatDog() + layerFarm:addChild(spriteDog) + + -- handing touch events + local touchBeginPoint = nil + local function onTouchBegan(touch, event) + local location = touch:getLocation() + cclog("onTouchBegan: %0.2f, %0.2f", location.x, location.y) + touchBeginPoint = {x = location.x, y = location.y} + spriteDog.isPaused = true + -- CCTOUCHBEGAN event must return true + return true + end + + local function onTouchMoved(touch, event) + local location = touch:getLocation() + cclog("onTouchMoved: %0.2f, %0.2f", location.x, location.y) + if touchBeginPoint then + local cx, cy = layerFarm:getPosition() + layerFarm:setPosition(cx + location.x - touchBeginPoint.x, + cy + location.y - touchBeginPoint.y) + touchBeginPoint = {x = location.x, y = location.y} + end + end + + local function onTouchEnded(touch, event) + local location = touch:getLocation() + cclog("onTouchEnded: %0.2f, %0.2f", location.x, location.y) + touchBeginPoint = nil + spriteDog.isPaused = false + end + + local listener = cc.EventListenerTouchOneByOne:create() + listener:registerScriptHandler(onTouchBegan,cc.Handler.EVENT_TOUCH_BEGAN ) + listener:registerScriptHandler(onTouchMoved,cc.Handler.EVENT_TOUCH_MOVED ) + listener:registerScriptHandler(onTouchEnded,cc.Handler.EVENT_TOUCH_ENDED ) + local eventDispatcher = layerFarm:getEventDispatcher() + eventDispatcher:addEventListenerWithSceneGraphPriority(listener, layerFarm) + + return layerFarm + end + + + -- create menu + local function createLayerMenu() + local layerMenu = cc.Layer:create() + + local menuPopup, menuTools, effectID + + local function menuCallbackClosePopup() + -- stop test sound effect + cc.SimpleAudioEngine:getInstance():stopEffect(effectID) + menuPopup:setVisible(false) + end + + local function menuCallbackOpenPopup() + -- loop test sound effect + local effectPath = cc.FileUtils:getInstance():fullPathForFilename("res/effect1.wav") + effectID = cc.SimpleAudioEngine:getInstance():playEffect(effectPath) + menuPopup:setVisible(true) + end + + -- add a popup menu + local menuPopupItem = cc.MenuItemImage:create("res/menu2.png", "res/menu2.png") + menuPopupItem:setPosition(0, 0) + menuPopupItem:registerScriptTapHandler(menuCallbackClosePopup) + menuPopup = cc.Menu:create(menuPopupItem) + menuPopup:setPosition(origin.x + visibleSize.width / 2, origin.y + visibleSize.height / 2) + menuPopup:setVisible(false) + layerMenu:addChild(menuPopup) + + -- add the left-bottom "tools" menu to invoke menuPopup + local menuToolsItem = cc.MenuItemImage:create("res/menu1.png", "res/menu1.png") + menuToolsItem:setPosition(0, 0) + menuToolsItem:registerScriptTapHandler(menuCallbackOpenPopup) + menuTools = cc.Menu:create(menuToolsItem) + local itemWidth = menuToolsItem:getContentSize().width + local itemHeight = menuToolsItem:getContentSize().height + menuTools:setPosition(origin.x + itemWidth/2, origin.y + itemHeight/2) + layerMenu:addChild(menuTools) + + return layerMenu + end + + -- play background music, preload effect + + -- uncomment below for the BlackBerry version + -- local bgMusicPath = CCFileUtils:getInstance():fullPathForFilename("res/background.ogg") + local bgMusicPath = cc.FileUtils:getInstance():fullPathForFilename("res/background.mp3") + cc.SimpleAudioEngine:getInstance():playMusic(bgMusicPath, true) + local effectPath = cc.FileUtils:getInstance():fullPathForFilename("res/effect1.wav") + cc.SimpleAudioEngine:getInstance():preloadEffect(effectPath) + + -- run + local sceneGame = cc.Scene:create() + sceneGame:addChild(createLayerFarm()) + sceneGame:addChild(createLayerMenu()) + cc.Director:getInstance():runWithScene(sceneGame) +end + +xpcall(main, __G__TRACKBACK__) diff --git a/tests/lua-empty-test/src/hello2.lua b/tests/lua-empty-test/src/hello2.lua new file mode 100644 index 0000000000..27158aa788 --- /dev/null +++ b/tests/lua-empty-test/src/hello2.lua @@ -0,0 +1,3 @@ +function myadd(x, y) + return x + y +end \ No newline at end of file diff --git a/tests/lua-empty-test/src/mobdebug.lua b/tests/lua-empty-test/src/mobdebug.lua new file mode 100644 index 0000000000..31ef8af06b --- /dev/null +++ b/tests/lua-empty-test/src/mobdebug.lua @@ -0,0 +1,1465 @@ +-- +-- MobDebug 0.542 +-- Copyright 2011-13 Paul Kulchenko +-- Based on RemDebug 1.0 Copyright Kepler Project 2005 +-- + +local mobdebug = { + _NAME = "mobdebug", + _VERSION = 0.542, + _COPYRIGHT = "Paul Kulchenko", + _DESCRIPTION = "Mobile Remote Debugger for the Lua programming language", + port = os and os.getenv and os.getenv("MOBDEBUG_PORT") or 8172, + checkcount = 200, + yieldtimeout = 0.02, +} + +local coroutine = coroutine +local error = error +local getfenv = getfenv +local setfenv = setfenv +local loadstring = loadstring or load -- "load" replaced "loadstring" in Lua 5.2 +local io = io +local os = os +local pairs = pairs +local require = require +local setmetatable = setmetatable +local string = string +local tonumber = tonumber +local unpack = table.unpack or unpack +local rawget = rawget + +-- if strict.lua is used, then need to avoid referencing some global +-- variables, as they can be undefined; +-- use rawget to to avoid complaints from strict.lua at run-time. +-- it's safe to do the initialization here as all these variables +-- should get defined values (of any) before the debugging starts. +-- there is also global 'wx' variable, which is checked as part of +-- the debug loop as 'wx' can be loaded at any time during debugging. +local genv = _G or _ENV +local jit = rawget(genv, "jit") +local MOAICoroutine = rawget(genv, "MOAICoroutine") + +if not setfenv then -- Lua 5.2 + -- based on http://lua-users.org/lists/lua-l/2010-06/msg00314.html + -- this assumes f is a function + local function findenv(f) + local level = 1 + repeat + local name, value = debug.getupvalue(f, level) + if name == '_ENV' then return level, value end + level = level + 1 + until name == nil + return nil end + getfenv = function (f) return(select(2, findenv(f)) or _G) end + setfenv = function (f, t) + local level = findenv(f) + if level then debug.setupvalue(f, level, t) end + return f end +end + +-- check for OS and convert file names to lower case on windows +-- (its file system is case insensitive, but case preserving), as setting a +-- breakpoint on x:\Foo.lua will not work if the file was loaded as X:\foo.lua. +-- OSX and Windows behave the same way (case insensitive, but case preserving) +local iscasepreserving = os and os.getenv and (os.getenv('WINDIR') + or (os.getenv('OS') or ''):match('[Ww]indows') + or os.getenv('DYLD_LIBRARY_PATH')) + or not io.open("/proc") + +-- turn jit off based on Mike Pall's comment in this discussion: +-- http://www.freelists.org/post/luajit/Debug-hooks-and-JIT,2 +-- "You need to turn it off at the start if you plan to receive +-- reliable hook calls at any later point in time." +if jit and jit.off then jit.off() end + +local socket = require "socket" +local debug = require "debug" +local coro_debugger +local coro_debugee +local coroutines = {}; setmetatable(coroutines, {__mode = "k"}) -- "weak" keys +local events = { BREAK = 1, WATCH = 2, RESTART = 3, STACK = 4 } +local breakpoints = {} +local watches = {} +local lastsource +local lastfile +local watchescnt = 0 +local abort -- default value is nil; this is used in start/loop distinction +local seen_hook = false +local checkcount = 0 +local step_into = false +local step_over = false +local step_level = 0 +local stack_level = 0 +local server +local buf +local outputs = {} +local iobase = {print = print} +local basedir = "" +local deferror = "execution aborted at default debugee" +local debugee = function () + local a = 1 + for _ = 1, 10 do a = a + 1 end + error(deferror) +end +local function q(s) return s:gsub('([%(%)%.%%%+%-%*%?%[%^%$%]])','%%%1') end + +local serpent = (function() ---- include Serpent module for serialization +local n, v = "serpent", 0.25 -- (C) 2012-13 Paul Kulchenko; MIT License +local c, d = "Paul Kulchenko", "Lua serializer and pretty printer" +local snum = {[tostring(1/0)]='1/0 --[[math.huge]]',[tostring(-1/0)]='-1/0 --[[-math.huge]]',[tostring(0/0)]='0/0'} +local badtype = {thread = true, userdata = true, cdata = true} +local keyword, globals, G = {}, {}, (_G or _ENV) +for _,k in ipairs({'and', 'break', 'do', 'else', 'elseif', 'end', 'false', + 'for', 'function', 'goto', 'if', 'in', 'local', 'nil', 'not', 'or', 'repeat', + 'return', 'then', 'true', 'until', 'while'}) do keyword[k] = true end +for k,v in pairs(G) do globals[v] = k end -- build func to name mapping +for _,g in ipairs({'coroutine', 'debug', 'io', 'math', 'string', 'table', 'os'}) do + for k,v in pairs(G[g]) do globals[v] = g..'.'..k end end + +local function s(t, opts) + local name, indent, fatal, maxnum = opts.name, opts.indent, opts.fatal, opts.maxnum + local sparse, custom, huge = opts.sparse, opts.custom, not opts.nohuge + local space, maxl = (opts.compact and '' or ' '), (opts.maxlevel or math.huge) + local iname, comm = '_'..(name or ''), opts.comment and (tonumber(opts.comment) or math.huge) + local seen, sref, syms, symn = {}, {'local '..iname..'={}'}, {}, 0 + local function gensym(val) return '_'..(tostring(tostring(val)):gsub("[^%w]",""):gsub("(%d%w+)", + -- tostring(val) is needed because __tostring may return a non-string value + function(s) if not syms[s] then symn = symn+1; syms[s] = symn end return syms[s] end)) end + local function safestr(s) return type(s) == "number" and (huge and snum[tostring(s)] or s) + or type(s) ~= "string" and tostring(s) -- escape NEWLINE/010 and EOF/026 + or ("%q"):format(s):gsub("\010","n"):gsub("\026","\\026") end + local function comment(s,l) return comm and (l or 0) < comm and ' --[['..tostring(s)..']]' or '' end + local function globerr(s,l) return globals[s] and globals[s]..comment(s,l) or not fatal + and safestr(select(2, pcall(tostring, s))) or error("Can't serialize "..tostring(s)) end + local function safename(path, name) -- generates foo.bar, foo[3], or foo['b a r'] + local n = name == nil and '' or name + local plain = type(n) == "string" and n:match("^[%l%u_][%w_]*$") and not keyword[n] + local safe = plain and n or '['..safestr(n)..']' + return (path or '')..(plain and path and '.' or '')..safe, safe end + local alphanumsort = type(opts.sortkeys) == 'function' and opts.sortkeys or function(k, o, n) -- k=keys, o=originaltable, n=padding + local maxn, to = tonumber(n) or 12, {number = 'a', string = 'b'} + local function padnum(d) return ("%0"..maxn.."d"):format(d) end + table.sort(k, function(a,b) + -- sort numeric keys first: k[key] is non-nil for numeric keys + return (k[a] and 0 or to[type(a)] or 'z')..(tostring(a):gsub("%d+",padnum)) + < (k[b] and 0 or to[type(b)] or 'z')..(tostring(b):gsub("%d+",padnum)) end) end + local function val2str(t, name, indent, insref, path, plainindex, level) + local ttype, level, mt = type(t), (level or 0), getmetatable(t) + local spath, sname = safename(path, name) + local tag = plainindex and + ((type(name) == "number") and '' or name..space..'='..space) or + (name ~= nil and sname..space..'='..space or '') + if seen[t] then -- already seen this element + sref[#sref+1] = spath..space..'='..space..seen[t] + return tag..'nil'..comment('ref', level) end + if type(mt) == 'table' and (mt.__serialize or mt.__tostring) then -- knows how to serialize itself + seen[t] = insref or spath + if mt.__serialize then t = mt.__serialize(t) else t = tostring(t) end + ttype = type(t) end -- new value falls through to be serialized + if ttype == "table" then + if level >= maxl then return tag..'{}'..comment('max', level) end + seen[t] = insref or spath + if next(t) == nil then return tag..'{}'..comment(t, level) end -- table empty + local maxn, o, out = math.min(#t, maxnum or #t), {}, {} + for key = 1, maxn do o[key] = key end + if not maxnum or #o < maxnum then + local n = #o -- n = n + 1; o[n] is much faster than o[#o+1] on large tables + for key in pairs(t) do if o[key] ~= key then n = n + 1; o[n] = key end end end + if maxnum and #o > maxnum then o[maxnum+1] = nil end + if opts.sortkeys and #o > maxn then alphanumsort(o, t, opts.sortkeys) end + local sparse = sparse and #o > maxn -- disable sparsness if only numeric keys (shorter output) + for n, key in ipairs(o) do + local value, ktype, plainindex = t[key], type(key), n <= maxn and not sparse + if opts.valignore and opts.valignore[value] -- skip ignored values; do nothing + or opts.keyallow and not opts.keyallow[key] + or opts.valtypeignore and opts.valtypeignore[type(value)] -- skipping ignored value types + or sparse and value == nil then -- skipping nils; do nothing + elseif ktype == 'table' or ktype == 'function' or badtype[ktype] then + if not seen[key] and not globals[key] then + sref[#sref+1] = 'placeholder' + local sname = safename(iname, gensym(key)) -- iname is table for local variables + sref[#sref] = val2str(key,sname,indent,sname,iname,true) end + sref[#sref+1] = 'placeholder' + local path = seen[t]..'['..(seen[key] or globals[key] or gensym(key))..']' + sref[#sref] = path..space..'='..space..(seen[value] or val2str(value,nil,indent,path)) + else + out[#out+1] = val2str(value,key,indent,insref,seen[t],plainindex,level+1) + end + end + local prefix = string.rep(indent or '', level) + local head = indent and '{\n'..prefix..indent or '{' + local body = table.concat(out, ','..(indent and '\n'..prefix..indent or space)) + local tail = indent and "\n"..prefix..'}' or '}' + return (custom and custom(tag,head,body,tail) or tag..head..body..tail)..comment(t, level) + elseif badtype[ttype] then + seen[t] = insref or spath + return tag..globerr(t, level) + elseif ttype == 'function' then + seen[t] = insref or spath + local ok, res = pcall(string.dump, t) + local func = ok and ((opts.nocode and "function() --[[..skipped..]] end" or + "loadstring("..safestr(res)..",'@serialized')")..comment(t, level)) + return tag..(func or globerr(t, level)) + else return tag..safestr(t) end -- handle all other types + end + local sepr = indent and "\n" or ";"..space + local body = val2str(t, name, indent) -- this call also populates sref + local tail = #sref>1 and table.concat(sref, sepr)..sepr or '' + local warn = opts.comment and #sref>1 and space.."--[[incomplete output with shared/self-references skipped]]" or '' + return not name and body..warn or "do local "..body..sepr..tail.."return "..name..sepr.."end" +end + +local function merge(a, b) if b then for k,v in pairs(b) do a[k] = v end end; return a; end +return { _NAME = n, _COPYRIGHT = c, _DESCRIPTION = d, _VERSION = v, serialize = s, + dump = function(a, opts) return s(a, merge({name = '_', compact = true, sparse = true}, opts)) end, + line = function(a, opts) return s(a, merge({sortkeys = true, comment = true}, opts)) end, + block = function(a, opts) return s(a, merge({indent = ' ', sortkeys = true, comment = true}, opts)) end } +end)() ---- end of Serpent module + +local function removebasedir(path, basedir) + if iscasepreserving then + -- check if the lowercased path matches the basedir + -- if so, return substring of the original path (to not lowercase it) + return path:lower():find('^'..q(basedir:lower())) + and path:sub(#basedir+1) or path + else + return string.gsub(path, '^'..q(basedir), '') + end +end + +local function stack(start) + local function vars(f) + local func = debug.getinfo(f, "f").func + local i = 1 + local locals = {} + while true do + local name, value = debug.getlocal(f, i) + if not name then break end + if string.sub(name, 1, 1) ~= '(' then locals[name] = {value, tostring(value)} end + i = i + 1 + end + i = 1 + local ups = {} + while func and true do -- check for func as it may be nil for tail calls + local name, value = debug.getupvalue(func, i) + if not name then break end + ups[name] = {value, tostring(value)} + i = i + 1 + end + return locals, ups + end + + local stack = {} + for i = (start or 0), 100 do + local source = debug.getinfo(i, "Snl") + if not source then break end + + local src = source.source + if src:find("@") == 1 then + src = src:sub(2):gsub("\\", "/") + if src:find("%./") == 1 then src = src:sub(3) end + end + + table.insert(stack, { -- remove basedir from source + {source.name, removebasedir(src, basedir), source.linedefined, + source.currentline, source.what, source.namewhat, source.short_src}, + vars(i+1)}) + if source.what == 'main' then break end + end + return stack +end + +local function set_breakpoint(file, line) + if file == '-' and lastfile then file = lastfile + elseif iscasepreserving then file = string.lower(file) end + if not breakpoints[line] then breakpoints[line] = {} end + breakpoints[line][file] = true +end + +local function remove_breakpoint(file, line) + if file == '-' and lastfile then file = lastfile + elseif iscasepreserving then file = string.lower(file) end + if breakpoints[line] then breakpoints[line][file] = nil end +end + +local function has_breakpoint(file, line) + return breakpoints[line] + and breakpoints[line][iscasepreserving and string.lower(file) or file] +end + +local function restore_vars(vars) + if type(vars) ~= 'table' then return end + + -- locals need to be processed in the reverse order, starting from + -- the inner block out, to make sure that the localized variables + -- are correctly updated with only the closest variable with + -- the same name being changed + -- first loop find how many local variables there is, while + -- the second loop processes them from i to 1 + local i = 1 + while true do + local name = debug.getlocal(3, i) + if not name then break end + i = i + 1 + end + i = i - 1 + local written_vars = {} + while i > 0 do + local name = debug.getlocal(3, i) + if not written_vars[name] then + if string.sub(name, 1, 1) ~= '(' then + debug.setlocal(3, i, rawget(vars, name)) + end + written_vars[name] = true + end + i = i - 1 + end + + i = 1 + local func = debug.getinfo(3, "f").func + while true do + local name = debug.getupvalue(func, i) + if not name then break end + if not written_vars[name] then + if string.sub(name, 1, 1) ~= '(' then + debug.setupvalue(func, i, rawget(vars, name)) + end + written_vars[name] = true + end + i = i + 1 + end +end + +local function capture_vars(level) + local vars = {} + local func = debug.getinfo(level or 3, "f").func + local i = 1 + while true do + local name, value = debug.getupvalue(func, i) + if not name then break end + if string.sub(name, 1, 1) ~= '(' then vars[name] = value end + i = i + 1 + end + i = 1 + while true do + local name, value = debug.getlocal(level or 3, i) + if not name then break end + if string.sub(name, 1, 1) ~= '(' then vars[name] = value end + i = i + 1 + end + -- returned 'vars' table plays a dual role: (1) it captures local values + -- and upvalues to be restored later (in case they are modified in "eval"), + -- and (2) it provides an environment for evaluated chunks. + -- getfenv(func) is needed to provide proper environment for functions, + -- including access to globals, but this causes vars[name] to fail in + -- restore_vars on local variables or upvalues with `nil` values when + -- 'strict' is in effect. To avoid this `rawget` is used in restore_vars. + setmetatable(vars, { __index = getfenv(func), __newindex = getfenv(func) }) + return vars +end + +local function stack_depth(start_depth) + for i = start_depth, 0, -1 do + if debug.getinfo(i, "l") then return i+1 end + end + return start_depth +end + +local function is_safe(stack_level) + -- the stack grows up: 0 is getinfo, 1 is is_safe, 2 is debug_hook, 3 is user function + if stack_level == 3 then return true end + for i = 3, stack_level do + -- return if it is not safe to abort + local info = debug.getinfo(i, "S") + if not info then return true end + if info.what == "C" then return false end + end + return true +end + +local function in_debugger() + local this = debug.getinfo(1, "S").source + -- only need to check few frames as mobdebug frames should be close + for i = 3, 7 do + local info = debug.getinfo(i, "S") + if not info then return false end + if info.source == this then return true end + end + return false +end + +local function is_pending(peer) + -- if there is something already in the buffer, skip check + if not buf and checkcount >= mobdebug.checkcount then + peer:settimeout(0) -- non-blocking + buf = peer:receive(1) + peer:settimeout() -- back to blocking + checkcount = 0 + end + return buf +end + +local function debug_hook(event, line) + -- (1) LuaJIT needs special treatment. Because debug_hook is set for + -- *all* coroutines, and not just the one being debugged as in regular Lua + -- (http://lua-users.org/lists/lua-l/2011-06/msg00513.html), + -- need to avoid debugging mobdebug's own code as LuaJIT doesn't + -- always correctly generate call/return hook events (there are more + -- calls than returns, which breaks stack depth calculation and + -- 'step' and 'step over' commands stop working; possibly because + -- 'tail return' events are not generated by LuaJIT). + -- the next line checks if the debugger is run under LuaJIT and if + -- one of debugger methods is present in the stack, it simply returns. + if jit then + -- when luajit is compiled with LUAJIT_ENABLE_LUA52COMPAT, + -- coroutine.running() returns non-nil for the main thread. + local coro, main = coroutine.running() + if not coro or main then coro = 'main' end + local disabled = coroutines[coro] == false + or coroutines[coro] == nil and coro ~= (coro_debugee or 'main') + if coro_debugee and disabled or not coro_debugee and (disabled or in_debugger()) + then return end + end + + -- (2) check if abort has been requested and it's safe to abort + if abort and is_safe(stack_level) then error(abort) end + + -- (3) also check if this debug hook has not been visited for any reason. + -- this check is needed to avoid stepping in too early + -- (for example, when coroutine.resume() is executed inside start()). + if not seen_hook and in_debugger() then return end + + if event == "call" then + stack_level = stack_level + 1 + elseif event == "return" or event == "tail return" then + stack_level = stack_level - 1 + elseif event == "line" then + -- may need to fall through because of the following: + -- (1) step_into + -- (2) step_over and stack_level <= step_level (need stack_level) + -- (3) breakpoint; check for line first as it's known; then for file + -- (4) socket call (only do every Xth check) + -- (5) at least one watch is registered + if not ( + step_into or step_over or breakpoints[line] or watchescnt > 0 + or is_pending(server) + ) then checkcount = checkcount + 1; return end + + checkcount = mobdebug.checkcount -- force check on the next command + + -- this is needed to check if the stack got shorter or longer. + -- unfortunately counting call/return calls is not reliable. + -- the discrepancy may happen when "pcall(load, '')" call is made + -- or when "error()" is called in a function. + -- in either case there are more "call" than "return" events reported. + -- this validation is done for every "line" event, but should be "cheap" + -- as it checks for the stack to get shorter (or longer by one call). + -- start from one level higher just in case we need to grow the stack. + -- this may happen after coroutine.resume call to a function that doesn't + -- have any other instructions to execute. it triggers three returns: + -- "return, tail return, return", which needs to be accounted for. + stack_level = stack_depth(stack_level+1) + + local caller = debug.getinfo(2, "S") + + -- grab the filename and fix it if needed + local file = lastfile + if (lastsource ~= caller.source) then + file, lastsource = caller.source, caller.source + -- technically, users can supply names that may not use '@', + -- for example when they call loadstring('...', 'filename.lua'). + -- Unfortunately, there is no reliable/quick way to figure out + -- what is the filename and what is the source code. + -- The following will work if the supplied filename uses Unix path. + if file:find("^@") then + file = file:gsub("^@", ""):gsub("\\", "/") + -- need this conversion to be applied to relative and absolute + -- file names as you may write "require 'Foo'" to + -- load "foo.lua" (on a case insensitive file system) and breakpoints + -- set on foo.lua will not work if not converted to the same case. + if iscasepreserving then file = string.lower(file) end + if file:find("%./") == 1 then file = file:sub(3) + else file = file:gsub('^'..q(basedir), '') end + -- some file systems allow newlines in file names; remove these. + file = file:gsub("\n", ' ') + else + -- this is either a file name coming from loadstring("chunk", "file"), + -- or the actual source code that needs to be serialized (as it may + -- include newlines); assume it's a file name if it's all on one line. + file = file:find("[\r\n]") and serpent.line(file) or file + end + + -- set to true if we got here; this only needs to be done once per + -- session, so do it here to at least avoid setting it for every line. + seen_hook = true + lastfile = file + end + + local vars, status, res + if (watchescnt > 0) then + vars = capture_vars() + for index, value in pairs(watches) do + setfenv(value, vars) + local ok, fired = pcall(value) + if ok and fired then + status, res = coroutine.resume(coro_debugger, events.WATCH, vars, file, line, index) + break -- any one watch is enough; don't check multiple times + end + end + end + + -- need to get into the "regular" debug handler, but only if there was + -- no watch that was fired. If there was a watch, handle its result. + local getin = (status == nil) and + (step_into + or (step_over and stack_level <= step_level) + or has_breakpoint(file, line) + or is_pending(server)) + + if getin then + vars = vars or capture_vars() + step_into = false + step_over = false + status, res = coroutine.resume(coro_debugger, events.BREAK, vars, file, line) + end + + -- handle 'stack' command that provides stack() information to the debugger + if status and res == 'stack' then + while status and res == 'stack' do + -- resume with the stack trace and variables + if vars then restore_vars(vars) end -- restore vars so they are reflected in stack values + -- this may fail if __tostring method fails at run-time + local ok, snapshot = pcall(stack, 4) + status, res = coroutine.resume(coro_debugger, ok and events.STACK or events.BREAK, snapshot, file, line) + end + end + + -- need to recheck once more as resume after 'stack' command may + -- return something else (for example, 'exit'), which needs to be handled + if status and res and res ~= 'stack' then + if abort == nil and res == "exit" then os.exit(1); return end + abort = res + -- only abort if safe; if not, there is another (earlier) check inside + -- debug_hook, which will abort execution at the first safe opportunity + if is_safe(stack_level) then error(abort) end + elseif not status and res then + error(res, 2) -- report any other (internal) errors back to the application + end + + if vars then restore_vars(vars) end + end +end + +local function stringify_results(status, ...) + if not status then return status, ... end -- on error report as it + + local t = {...} + for i,v in pairs(t) do -- stringify each of the returned values + local ok, res = pcall(serpent.line, v, {nocode = true, comment = 1}) + t[i] = ok and res or ("%q"):format(res):gsub("\010","n"):gsub("\026","\\026") + end + -- stringify table with all returned values + -- this is done to allow each returned value to be used (serialized or not) + -- intependently and to preserve "original" comments + return pcall(serpent.dump, t, {sparse = false}) +end + +local function debugger_loop(sev, svars, sfile, sline) + local command + local app, osname + local eval_env = svars or {} + local function emptyWatch () return false end + local loaded = {} + for k in pairs(package.loaded) do loaded[k] = true end + + while true do + local line, err + local wx = rawget(genv, "wx") -- use rawread to make strict.lua happy + if (wx or mobdebug.yield) and server.settimeout then server:settimeout(mobdebug.yieldtimeout) end + while true do + line, err = server:receive() + if not line and err == "timeout" then + -- yield for wx GUI applications if possible to avoid "busyness" + app = app or (wx and wx.wxGetApp and wx.wxGetApp()) + if app then + local win = app:GetTopWindow() + local inloop = app:IsMainLoopRunning() + osname = osname or wx.wxPlatformInfo.Get():GetOperatingSystemFamilyName() + if win and not inloop then + -- process messages in a regular way + -- and exit as soon as the event loop is idle + if osname == 'Unix' then wx.wxTimer(app):Start(10, true) end + local exitLoop = function() + win:Disconnect(wx.wxID_ANY, wx.wxID_ANY, wx.wxEVT_IDLE) + win:Disconnect(wx.wxID_ANY, wx.wxID_ANY, wx.wxEVT_TIMER) + app:ExitMainLoop() + end + win:Connect(wx.wxEVT_IDLE, exitLoop) + win:Connect(wx.wxEVT_TIMER, exitLoop) + app:MainLoop() + end + elseif mobdebug.yield then mobdebug.yield() + end + elseif not line and err == "closed" then + error("Debugger connection unexpectedly closed", 0) + else + -- if there is something in the pending buffer, prepend it to the line + if buf then line = buf .. line; buf = nil end + break + end + end + if server.settimeout then server:settimeout() end -- back to blocking + command = string.sub(line, string.find(line, "^[A-Z]+")) + if command == "SETB" then + local _, _, _, file, line = string.find(line, "^([A-Z]+)%s+(.-)%s+(%d+)%s*$") + if file and line then + set_breakpoint(file, tonumber(line)) + server:send("200 OK\n") + else + server:send("400 Bad Request\n") + end + elseif command == "DELB" then + local _, _, _, file, line = string.find(line, "^([A-Z]+)%s+(.-)%s+(%d+)%s*$") + if file and line then + remove_breakpoint(file, tonumber(line)) + server:send("200 OK\n") + else + server:send("400 Bad Request\n") + end + elseif command == "EXEC" then + local _, _, chunk = string.find(line, "^[A-Z]+%s+(.+)$") + if chunk then + local func, res = loadstring(chunk) + local status + if func then + setfenv(func, eval_env) + status, res = stringify_results(pcall(func)) + end + if status then + server:send("200 OK " .. #res .. "\n") + server:send(res) + else + server:send("401 Error in Expression " .. #res .. "\n") + server:send(res) + end + else + server:send("400 Bad Request\n") + end + elseif command == "LOAD" then + local _, _, size, name = string.find(line, "^[A-Z]+%s+(%d+)%s+(%S.-)%s*$") + size = tonumber(size) + + if abort == nil then -- no LOAD/RELOAD allowed inside start() + if size > 0 then server:receive(size) end + if sfile and sline then + server:send("201 Started " .. sfile .. " " .. sline .. "\n") + else + server:send("200 OK 0\n") + end + else + -- reset environment to allow required modules to load again + -- remove those packages that weren't loaded when debugger started + for k in pairs(package.loaded) do + if not loaded[k] then package.loaded[k] = nil end + end + + if size == 0 and name == '-' then -- RELOAD the current script being debugged + server:send("200 OK 0\n") + coroutine.yield("load") + else + -- receiving 0 bytes blocks (at least in luasocket 2.0.2), so skip reading + local chunk = size == 0 and "" or server:receive(size) + if chunk then -- LOAD a new script for debugging + local func, res = loadstring(chunk, "@"..name) + if func then + server:send("200 OK 0\n") + debugee = func + coroutine.yield("load") + else + server:send("401 Error in Expression " .. #res .. "\n") + server:send(res) + end + else + server:send("400 Bad Request\n") + end + end + end + elseif command == "SETW" then + local _, _, exp = string.find(line, "^[A-Z]+%s+(.+)%s*$") + if exp then + local func, res = loadstring("return(" .. exp .. ")") + if func then + watchescnt = watchescnt + 1 + local newidx = #watches + 1 + watches[newidx] = func + server:send("200 OK " .. newidx .. "\n") + else + server:send("401 Error in Expression " .. #res .. "\n") + server:send(res) + end + else + server:send("400 Bad Request\n") + end + elseif command == "DELW" then + local _, _, index = string.find(line, "^[A-Z]+%s+(%d+)%s*$") + index = tonumber(index) + if index > 0 and index <= #watches then + watchescnt = watchescnt - (watches[index] ~= emptyWatch and 1 or 0) + watches[index] = emptyWatch + server:send("200 OK\n") + else + server:send("400 Bad Request\n") + end + elseif command == "RUN" then + server:send("200 OK\n") + + local ev, vars, file, line, idx_watch = coroutine.yield() + eval_env = vars + if ev == events.BREAK then + server:send("202 Paused " .. file .. " " .. line .. "\n") + elseif ev == events.WATCH then + server:send("203 Paused " .. file .. " " .. line .. " " .. idx_watch .. "\n") + elseif ev == events.RESTART then + -- nothing to do + else + server:send("401 Error in Execution " .. #file .. "\n") + server:send(file) + end + elseif command == "STEP" then + server:send("200 OK\n") + step_into = true + + local ev, vars, file, line, idx_watch = coroutine.yield() + eval_env = vars + if ev == events.BREAK then + server:send("202 Paused " .. file .. " " .. line .. "\n") + elseif ev == events.WATCH then + server:send("203 Paused " .. file .. " " .. line .. " " .. idx_watch .. "\n") + elseif ev == events.RESTART then + -- nothing to do + else + server:send("401 Error in Execution " .. #file .. "\n") + server:send(file) + end + elseif command == "OVER" or command == "OUT" then + server:send("200 OK\n") + step_over = true + + -- OVER and OUT are very similar except for + -- the stack level value at which to stop + if command == "OUT" then step_level = stack_level - 1 + else step_level = stack_level end + + local ev, vars, file, line, idx_watch = coroutine.yield() + eval_env = vars + if ev == events.BREAK then + server:send("202 Paused " .. file .. " " .. line .. "\n") + elseif ev == events.WATCH then + server:send("203 Paused " .. file .. " " .. line .. " " .. idx_watch .. "\n") + elseif ev == events.RESTART then + -- nothing to do + else + server:send("401 Error in Execution " .. #file .. "\n") + server:send(file) + end + elseif command == "BASEDIR" then + local _, _, dir = string.find(line, "^[A-Z]+%s+(.+)%s*$") + if dir then + basedir = iscasepreserving and string.lower(dir) or dir + -- reset cached source as it may change with basedir + lastsource = nil + server:send("200 OK\n") + else + server:send("400 Bad Request\n") + end + elseif command == "SUSPEND" then + -- do nothing; it already fulfilled its role + elseif command == "STACK" then + -- first check if we can execute the stack command + -- as it requires yielding back to debug_hook it cannot be executed + -- if we have not seen the hook yet as happens after start(). + -- in this case we simply return an empty result + local vars, ev = {} + if seen_hook then + ev, vars = coroutine.yield("stack") + end + if ev and ev ~= events.STACK then + server:send("401 Error in Execution " .. #vars .. "\n") + server:send(vars) + else + local ok, res = pcall(serpent.dump, vars, {nocode = true, sparse = false}) + if ok then + server:send("200 OK " .. res .. "\n") + else + server:send("401 Error in Execution " .. #res .. "\n") + server:send(res) + end + end + elseif command == "OUTPUT" then + local _, _, stream, mode = string.find(line, "^[A-Z]+%s+(%w+)%s+([dcr])%s*$") + if stream and mode and stream == "stdout" then + -- assign "print" in the global environment + genv.print = mode == 'd' and iobase.print or coroutine.wrap(function(...) + -- wrapping into coroutine.wrap protects this function from + -- being stepped through in the debugger + local tbl = {...} + while true do + if mode == 'c' then iobase.print(unpack(tbl)) end + for n = 1, #tbl do + tbl[n] = select(2, pcall(serpent.line, tbl[n], {nocode = true, comment = false})) end + local file = table.concat(tbl, "\t").."\n" + server:send("204 Output " .. stream .. " " .. #file .. "\n" .. file) + tbl = {coroutine.yield()} + end + end) + server:send("200 OK\n") + else + server:send("400 Bad Request\n") + end + elseif command == "EXIT" then + server:send("200 OK\n") + coroutine.yield("exit") + else + server:send("400 Bad Request\n") + end + end +end + +local function connect(controller_host, controller_port) + return (socket.connect4 or socket.connect)(controller_host, controller_port) +end + +local function isrunning() + return coro_debugger and coroutine.status(coro_debugger) == 'suspended' +end + +local lasthost, lastport + +-- Starts a debug session by connecting to a controller +local function start(controller_host, controller_port) + -- only one debugging session can be run (as there is only one debug hook) + if isrunning() then return end + + lasthost = controller_host or lasthost + lastport = controller_port or lastport + + controller_host = lasthost or "localhost" + controller_port = lastport or mobdebug.port + + local err + server, err = (socket.connect4 or socket.connect)(controller_host, controller_port) + if server then + -- correct stack depth which already has some calls on it + -- so it doesn't go into negative when those calls return + -- as this breaks subsequence checks in stack_depth(). + -- start from 16th frame, which is sufficiently large for this check. + stack_level = stack_depth(16) + + -- provide our own traceback function to report the error remotely + do + local dtraceback = debug.traceback + debug.traceback = function (...) + if select('#', ...) >= 1 then + local err, lvl = ... + if err and type(err) ~= 'thread' then + local trace = dtraceback(err, (lvl or 2)+1) + if genv.print == iobase.print then -- no remote redirect + return trace + else + genv.print(trace) -- report the error remotely + return -- don't report locally to avoid double reporting + end + end + end + -- direct call to debug.traceback: return the original. + -- debug.traceback(nil, level) doesn't work in Lua 5.1 + -- (http://lua-users.org/lists/lua-l/2011-06/msg00574.html), so + -- simply remove first frame from the stack trace + return (dtraceback(...):gsub("(stack traceback:\n)[^\n]*\n", "%1")) + end + end + coro_debugger = coroutine.create(debugger_loop) + debug.sethook(debug_hook, "lcr") + seen_hook = nil -- reset in case the last start() call was refused + step_into = true -- start with step command + return true + else + print(("Could not connect to %s:%s: %s") + :format(controller_host, controller_port, err or "unknown error")) + end +end + +local function controller(controller_host, controller_port, scratchpad) + -- only one debugging session can be run (as there is only one debug hook) + if isrunning() then return end + + lasthost = controller_host or lasthost + lastport = controller_port or lastport + + controller_host = lasthost or "localhost" + controller_port = lastport or mobdebug.port + + local exitonerror = not scratchpad + local err + server, err = (socket.connect4 or socket.connect)(controller_host, controller_port) + if server then + local function report(trace, err) + local msg = err .. "\n" .. trace + server:send("401 Error in Execution " .. #msg .. "\n") + server:send(msg) + return err + end + + seen_hook = true -- allow to accept all commands + coro_debugger = coroutine.create(debugger_loop) + + while true do + step_into = true -- start with step command + abort = false -- reset abort flag from the previous loop + if scratchpad then checkcount = mobdebug.checkcount end -- force suspend right away + + coro_debugee = coroutine.create(debugee) + debug.sethook(coro_debugee, debug_hook, "lcr") + local status, err = coroutine.resume(coro_debugee) + + -- was there an error or is the script done? + -- 'abort' state is allowed here; ignore it + if abort then + if tostring(abort) == 'exit' then break end + else + if status then -- normal execution is done + break + elseif err and not tostring(err):find(deferror) then + -- report the error back + -- err is not necessarily a string, so convert to string to report + report(debug.traceback(coro_debugee), tostring(err)) + if exitonerror then break end + -- resume once more to clear the response the debugger wants to send + -- need to use capture_vars(2) as three would be the level of + -- the caller for controller(), but because of the tail call, + -- the caller may not exist; + -- This is not entirely safe as the user may see the local + -- variable from console, but they will be reset anyway. + -- This functionality is used when scratchpad is paused to + -- gain access to remote console to modify global variables. + local status, err = coroutine.resume(coro_debugger, events.RESTART, capture_vars(2)) + if not status or status and err == "exit" then break end + end + end + end + else + print(("Could not connect to %s:%s: %s") + :format(controller_host, controller_port, err or "unknown error")) + return false + end + return true +end + +local function scratchpad(controller_host, controller_port) + return controller(controller_host, controller_port, true) +end + +local function loop(controller_host, controller_port) + return controller(controller_host, controller_port, false) +end + +local function on() + if not (isrunning() and server) then return end + + -- main is set to true under Lua5.2 for the "main" chunk. + -- Lua5.1 returns co as `nil` in that case. + local co, main = coroutine.running() + if main then co = nil end + if co then + coroutines[co] = true + debug.sethook(co, debug_hook, "lcr") + else + if jit then coroutines.main = true end + debug.sethook(debug_hook, "lcr") + end +end + +local function off() + if not (isrunning() and server) then return end + + -- main is set to true under Lua5.2 for the "main" chunk. + -- Lua5.1 returns co as `nil` in that case. + local co, main = coroutine.running() + if main then co = nil end + + -- don't remove coroutine hook under LuaJIT as there is only one (global) hook + if co then + coroutines[co] = false + if not jit then debug.sethook(co) end + else + if jit then coroutines.main = false end + if not jit then debug.sethook() end + end + + -- check if there is any thread that is still being debugged under LuaJIT; + -- if not, turn the debugging off + if jit then + local remove = true + for co, debugged in pairs(coroutines) do + if debugged then remove = false; break end + end + if remove then debug.sethook() end + end +end + +-- Handles server debugging commands +local function handle(params, client, options) + local _, _, command = string.find(params, "^([a-z]+)") + local file, line, watch_idx + if command == "run" or command == "step" or command == "out" + or command == "over" or command == "exit" then + client:send(string.upper(command) .. "\n") + client:receive() -- this should consume the first '200 OK' response + while true do + local done = true + local breakpoint = client:receive() + if not breakpoint then + print("Program finished") + os.exit() + return -- use return here for those cases where os.exit() is not wanted + end + local _, _, status = string.find(breakpoint, "^(%d+)") + if status == "200" then + -- don't need to do anything + elseif status == "202" then + _, _, file, line = string.find(breakpoint, "^202 Paused%s+(.-)%s+(%d+)%s*$") + if file and line then + print("Paused at file " .. file .. " line " .. line) + end + elseif status == "203" then + _, _, file, line, watch_idx = string.find(breakpoint, "^203 Paused%s+(.-)%s+(%d+)%s+(%d+)%s*$") + if file and line and watch_idx then + print("Paused at file " .. file .. " line " .. line .. " (watch expression " .. watch_idx .. ": [" .. watches[watch_idx] .. "])") + end + elseif status == "204" then + local _, _, stream, size = string.find(breakpoint, "^204 Output (%w+) (%d+)$") + if stream and size then + local msg = client:receive(tonumber(size)) + print(msg) + if outputs[stream] then outputs[stream](msg) end + -- this was just the output, so go back reading the response + done = false + end + elseif status == "401" then + local _, _, size = string.find(breakpoint, "^401 Error in Execution (%d+)$") + if size then + local msg = client:receive(tonumber(size)) + print("Error in remote application: " .. msg) + os.exit(1) + return nil, nil, msg -- use return here for those cases where os.exit() is not wanted + end + else + print("Unknown error") + os.exit(1) + -- use return here for those cases where os.exit() is not wanted + return nil, nil, "Debugger error: unexpected response '" .. breakpoint .. "'" + end + if done then break end + end + elseif command == "setb" then + _, _, _, file, line = string.find(params, "^([a-z]+)%s+(.-)%s+(%d+)%s*$") + if file and line then + -- if this is a file name, and not a file source + if not file:find('^".*"$') then + file = string.gsub(file, "\\", "/") -- convert slash + file = removebasedir(file, basedir) + end + client:send("SETB " .. file .. " " .. line .. "\n") + if client:receive() == "200 OK" then + set_breakpoint(file, line) + else + print("Error: breakpoint not inserted") + end + else + print("Invalid command") + end + elseif command == "setw" then + local _, _, exp = string.find(params, "^[a-z]+%s+(.+)$") + if exp then + client:send("SETW " .. exp .. "\n") + local answer = client:receive() + local _, _, watch_idx = string.find(answer, "^200 OK (%d+)%s*$") + if watch_idx then + watches[watch_idx] = exp + print("Inserted watch exp no. " .. watch_idx) + else + local _, _, size = string.find(answer, "^401 Error in Expression (%d+)$") + if size then + local err = client:receive(tonumber(size)):gsub(".-:%d+:%s*","") + print("Error: watch expression not set: " .. err) + else + print("Error: watch expression not set") + end + end + else + print("Invalid command") + end + elseif command == "delb" then + _, _, _, file, line = string.find(params, "^([a-z]+)%s+(.-)%s+(%d+)%s*$") + if file and line then + -- if this is a file name, and not a file source + if not file:find('^".*"$') then + file = string.gsub(file, "\\", "/") -- convert slash + file = removebasedir(file, basedir) + end + client:send("DELB " .. file .. " " .. line .. "\n") + if client:receive() == "200 OK" then + remove_breakpoint(file, line) + else + print("Error: breakpoint not removed") + end + else + print("Invalid command") + end + elseif command == "delallb" then + for line, breaks in pairs(breakpoints) do + for file, _ in pairs(breaks) do + client:send("DELB " .. file .. " " .. line .. "\n") + if client:receive() == "200 OK" then + remove_breakpoint(file, line) + else + print("Error: breakpoint at file " .. file .. " line " .. line .. " not removed") + end + end + end + elseif command == "delw" then + local _, _, index = string.find(params, "^[a-z]+%s+(%d+)%s*$") + if index then + client:send("DELW " .. index .. "\n") + if client:receive() == "200 OK" then + watches[index] = nil + else + print("Error: watch expression not removed") + end + else + print("Invalid command") + end + elseif command == "delallw" then + for index, exp in pairs(watches) do + client:send("DELW " .. index .. "\n") + if client:receive() == "200 OK" then + watches[index] = nil + else + print("Error: watch expression at index " .. index .. " [" .. exp .. "] not removed") + end + end + elseif command == "eval" or command == "exec" + or command == "load" or command == "loadstring" + or command == "reload" then + local _, _, exp = string.find(params, "^[a-z]+%s+(.+)$") + if exp or (command == "reload") then + if command == "eval" or command == "exec" then + exp = (exp:gsub("%-%-%[(=*)%[.-%]%1%]", "") -- remove comments + :gsub("%-%-.-\n", " ") -- remove line comments + :gsub("\n", " ")) -- convert new lines + if command == "eval" then exp = "return " .. exp end + client:send("EXEC " .. exp .. "\n") + elseif command == "reload" then + client:send("LOAD 0 -\n") + elseif command == "loadstring" then + local _, _, _, file, lines = string.find(exp, "^([\"'])(.-)%1%s+(.+)") + if not file then + _, _, file, lines = string.find(exp, "^(%S+)%s+(.+)") + end + client:send("LOAD " .. #lines .. " " .. file .. "\n") + client:send(lines) + else + local file = io.open(exp, "r") + if not file and pcall(require, "winapi") then + -- if file is not open and winapi is there, try with a short path; + -- this may be needed for unicode paths on windows + winapi.set_encoding(winapi.CP_UTF8) + file = io.open(winapi.short_path(exp), "r") + end + if not file then error("Cannot open file " .. exp) end + -- read the file and remove the shebang line as it causes a compilation error + local lines = file:read("*all"):gsub("^#!.-\n", "\n") + file:close() + + local file = string.gsub(exp, "\\", "/") -- convert slash + file = removebasedir(file, basedir) + client:send("LOAD " .. #lines .. " " .. file .. "\n") + if #lines > 0 then client:send(lines) end + end + while true do + local params, err = client:receive() + if not params then + return nil, nil, "Debugger connection " .. (err or "error") + end + local done = true + local _, _, status, len = string.find(params, "^(%d+).-%s+(%d+)%s*$") + if status == "200" then + len = tonumber(len) + if len > 0 then + local status, res + local str = client:receive(len) + -- handle serialized table with results + local func, err = loadstring(str) + if func then + status, res = pcall(func) + if not status then err = res + elseif type(res) ~= "table" then + err = "received "..type(res).." instead of expected 'table'" + end + end + if err then + print("Error in processing results: " .. err) + return nil, nil, "Error in processing results: " .. err + end + print(unpack(res)) + return res[1], res + end + elseif status == "201" then + _, _, file, line = string.find(params, "^201 Started%s+(.-)%s+(%d+)%s*$") + elseif status == "202" or params == "200 OK" then + -- do nothing; this only happens when RE/LOAD command gets the response + -- that was for the original command that was aborted + elseif status == "204" then + local _, _, stream, size = string.find(params, "^204 Output (%w+) (%d+)$") + if stream and size then + local msg = client:receive(tonumber(size)) + print(msg) + if outputs[stream] then outputs[stream](msg) end + -- this was just the output, so go back reading the response + done = false + end + elseif status == "401" then + len = tonumber(len) + local res = client:receive(len) + print("Error in expression: " .. res) + return nil, nil, res + else + print("Unknown error") + return nil, nil, "Debugger error: unexpected response after EXEC/LOAD '" .. params .. "'" + end + if done then break end + end + else + print("Invalid command") + end + elseif command == "listb" then + for l, v in pairs(breakpoints) do + for f in pairs(v) do + print(f .. ": " .. l) + end + end + elseif command == "listw" then + for i, v in pairs(watches) do + print("Watch exp. " .. i .. ": " .. v) + end + elseif command == "suspend" then + client:send("SUSPEND\n") + elseif command == "stack" then + client:send("STACK\n") + local resp = client:receive() + local _, _, status, res = string.find(resp, "^(%d+)%s+%w+%s+(.+)%s*$") + if status == "200" then + local func, err = loadstring(res) + if func == nil then + print("Error in stack information: " .. err) + return nil, nil, err + end + local ok, stack = pcall(func) + if not ok then + print("Error in stack information: " .. stack) + return nil, nil, stack + end + for _,frame in ipairs(stack) do + print(serpent.line(frame[1], {comment = false})) + end + return stack + elseif status == "401" then + local _, _, len = string.find(resp, "%s+(%d+)%s*$") + len = tonumber(len) + local res = len > 0 and client:receive(len) or "Invalid stack information." + print("Error in expression: " .. res) + return nil, nil, res + else + print("Unknown error") + return nil, nil, "Debugger error: unexpected response after STACK" + end + elseif command == "output" then + local _, _, stream, mode = string.find(params, "^[a-z]+%s+(%w+)%s+([dcr])%s*$") + if stream and mode then + client:send("OUTPUT "..stream.." "..mode.."\n") + local resp = client:receive() + local _, _, status = string.find(resp, "^(%d+)%s+%w+%s*$") + if status == "200" then + print("Stream "..stream.." redirected") + outputs[stream] = type(options) == 'table' and options.handler or nil + else + print("Unknown error") + return nil, nil, "Debugger error: can't redirect "..stream + end + else + print("Invalid command") + end + elseif command == "basedir" then + local _, _, dir = string.find(params, "^[a-z]+%s+(.+)$") + if dir then + dir = string.gsub(dir, "\\", "/") -- convert slash + if not string.find(dir, "/$") then dir = dir .. "/" end + + local remdir = dir:match("\t(.+)") + if remdir then dir = dir:gsub("/?\t.+", "/") end + basedir = dir + + client:send("BASEDIR "..(remdir or dir).."\n") + local resp = client:receive() + local _, _, status = string.find(resp, "^(%d+)%s+%w+%s*$") + if status == "200" then + print("New base directory is " .. basedir) + else + print("Unknown error") + return nil, nil, "Debugger error: unexpected response after BASEDIR" + end + else + print(basedir) + end + elseif command == "help" then + print("setb -- sets a breakpoint") + print("delb -- removes a breakpoint") + print("delallb -- removes all breakpoints") + print("setw -- adds a new watch expression") + print("delw -- removes the watch expression at index") + print("delallw -- removes all watch expressions") + print("run -- runs until next breakpoint") + print("step -- runs until next line, stepping into function calls") + print("over -- runs until next line, stepping over function calls") + print("out -- runs until line after returning from current function") + print("listb -- lists breakpoints") + print("listw -- lists watch expressions") + print("eval -- evaluates expression on the current context and returns its value") + print("exec -- executes statement on the current context") + print("load -- loads a local file for debugging") + print("reload -- restarts the current debugging session") + print("stack -- reports stack trace") + print("output stdout -- capture and redirect io stream (default|copy|redirect)") + print("basedir [] -- sets the base path of the remote application, or shows the current one") + print("exit -- exits debugger") + else + local _, _, spaces = string.find(params, "^(%s*)$") + if not spaces then + print("Invalid command") + return nil, nil, "Invalid command" + end + end + return file, line +end + +-- Starts debugging server +local function listen(host, port) + host = host or "*" + port = port or mobdebug.port + + local socket = require "socket" + + print("Lua Remote Debugger") + print("Run the program you wish to debug") + + local server = socket.bind(host, port) + local client = server:accept() + + client:send("STEP\n") + client:receive() + + local breakpoint = client:receive() + local _, _, file, line = string.find(breakpoint, "^202 Paused%s+(.-)%s+(%d+)%s*$") + if file and line then + print("Paused at file " .. file ) + print("Type 'help' for commands") + else + local _, _, size = string.find(breakpoint, "^401 Error in Execution (%d+)%s*$") + if size then + print("Error in remote application: ") + print(client:receive(size)) + end + end + + while true do + io.write("> ") + local line = io.read("*line") + handle(line, client) + end +end + +local cocreate +local function coro() + if cocreate then return end -- only set once + cocreate = cocreate or coroutine.create + coroutine.create = function(f, ...) + return cocreate(function(...) + require("mobdebug").on() + return f(...) + end, ...) + end +end + +local moconew +local function moai() + if moconew then return end -- only set once + moconew = moconew or (MOAICoroutine and MOAICoroutine.new) + if not moconew then return end + MOAICoroutine.new = function(...) + local thread = moconew(...) + -- need to support both thread.run and getmetatable(thread).run, which + -- was used in earlier MOAI versions + local mt = thread.run and thread or getmetatable(thread) + local patched = mt.run + mt.run = function(self, f, ...) + return patched(self, function(...) + require("mobdebug").on() + return f(...) + end, ...) + end + return thread + end +end + +-- this is a function that removes all hooks and closes the socket to +-- report back to the controller that the debugging is done. +-- the script that called `done` can still continue. +local function done() + if not (isrunning() and server) then return end + + if not jit then + for co, debugged in pairs(coroutines) do + if debugged then debug.sethook(co) end + end + end + + debug.sethook() + server:close() + + coro_debugger = nil -- to make sure isrunning() returns `false` + seen_hook = nil -- to make sure that the next start() call works + abort = nil -- to make sure that callback calls use proper "abort" value +end + +-- make public functions available +mobdebug.listen = listen +mobdebug.loop = loop +mobdebug.scratchpad = scratchpad +mobdebug.handle = handle +mobdebug.connect = connect +mobdebug.start = start +mobdebug.on = on +mobdebug.off = off +mobdebug.moai = moai +mobdebug.coro = coro +mobdebug.done = done +mobdebug.line = serpent.line +mobdebug.dump = serpent.dump +mobdebug.yield = nil -- callback + +-- this is needed to make "require 'modebug'" to work when mobdebug +-- module is loaded manually +package.loaded.mobdebug = mobdebug + +return mobdebug diff --git a/samples/lua-tests/project/CMakeLists.txt b/tests/lua-tests/project/CMakeLists.txt similarity index 89% rename from samples/lua-tests/project/CMakeLists.txt rename to tests/lua-tests/project/CMakeLists.txt index da49200a12..5b3cc085c6 100644 --- a/samples/lua-tests/project/CMakeLists.txt +++ b/tests/lua-tests/project/CMakeLists.txt @@ -1,4 +1,4 @@ -set(APP_NAME testlua) +set(APP_NAME lua-tests) set(SAMPLE_SRC proj.linux/main.cpp @@ -36,9 +36,9 @@ set_target_properties(${APP_NAME} PROPERTIES pre_build(${APP_NAME} COMMAND ${CMAKE_COMMAND} -E remove_directory ${APP_BIN_DIR}/Resources + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/../res ${APP_BIN_DIR}/Resources/res COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/../src ${APP_BIN_DIR}/Resources/src - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/../res ${APP_BIN_DIR}/Resources COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua-bindings/script ${APP_BIN_DIR}/Resources - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/samples/cpp-tests/Resources ${APP_BIN_DIR}/Resources + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/tests/cpp-tests/Resources ${APP_BIN_DIR}/Resources/res ) diff --git a/samples/lua-tests/project/Classes/AppDelegate.cpp b/tests/lua-tests/project/Classes/AppDelegate.cpp similarity index 94% rename from samples/lua-tests/project/Classes/AppDelegate.cpp rename to tests/lua-tests/project/Classes/AppDelegate.cpp index a096268e98..565de6fb6a 100644 --- a/samples/lua-tests/project/Classes/AppDelegate.cpp +++ b/tests/lua-tests/project/Classes/AppDelegate.cpp @@ -22,7 +22,7 @@ bool AppDelegate::applicationDidFinishLaunching() auto director = Director::getInstance(); auto glview = director->getOpenGLView(); if(!glview) { - glview = GLView::createWithRect("Test Lua", Rect(0,0,900,640)); + glview = GLView::createWithRect("Lua Tests", Rect(0,0,900,640)); director->setOpenGLView(glview); } @@ -58,11 +58,15 @@ bool AppDelegate::applicationDidFinishLaunching() register_assetsmanager_test_sample(stack->getLuaState()); #endif +#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC) std::string resPrefix(""); +#else + std::string resPrefix("res/"); +#endif std::vector searchPaths = pFileUtils->getSearchPaths(); searchPaths.insert(searchPaths.begin(), resPrefix); - searchPaths.insert(searchPaths.begin(), resPrefix + "Images"); + searchPaths.insert(searchPaths.begin(), resPrefix + "cocosbuilderRes"); if (screenSize.height > 320) { @@ -81,6 +85,7 @@ bool AppDelegate::applicationDidFinishLaunching() } else { + searchPaths.insert(searchPaths.begin(), resPrefix + "Images"); searchPaths.insert(searchPaths.begin(), resPrefix + "scenetest/ArmatureComponentTest"); searchPaths.insert(searchPaths.begin(), resPrefix + "scenetest/AttributeComponentTest"); searchPaths.insert(searchPaths.begin(), resPrefix + "scenetest/BackgroundComponentTest"); diff --git a/tests/lua-tests/project/Classes/AppDelegate.h b/tests/lua-tests/project/Classes/AppDelegate.h new file mode 100644 index 0000000000..5cf478d052 --- /dev/null +++ b/tests/lua-tests/project/Classes/AppDelegate.h @@ -0,0 +1,38 @@ +#ifndef __APP_DELEGATE_H__ +#define __APP_DELEGATE_H__ + +#include "cocos2d.h" + +/** +@brief The cocos2d Application. + +The reason for implement as private inheritance is to hide some interface call by Director. +*/ +class AppDelegate : private cocos2d::Application +{ +public: + AppDelegate(); + virtual ~AppDelegate(); + + /** + @brief Implement Director and Scene init code here. + @return true Initialize success, app continue. + @return false Initialize failed, app terminate. + */ + virtual bool applicationDidFinishLaunching(); + + /** + @brief The function be called when the application enter background + @param the pointer of the application + */ + virtual void applicationDidEnterBackground(); + + /** + @brief The function be called when the application enter foreground + @param the pointer of the application + */ + virtual void applicationWillEnterForeground(); +}; + +#endif // __APP_DELEGATE_H__ + diff --git a/samples/lua-tests/project/Classes/lua_assetsmanager_test_sample.cpp b/tests/lua-tests/project/Classes/lua_assetsmanager_test_sample.cpp similarity index 100% rename from samples/lua-tests/project/Classes/lua_assetsmanager_test_sample.cpp rename to tests/lua-tests/project/Classes/lua_assetsmanager_test_sample.cpp diff --git a/samples/lua-tests/project/Classes/lua_assetsmanager_test_sample.h b/tests/lua-tests/project/Classes/lua_assetsmanager_test_sample.h similarity index 100% rename from samples/lua-tests/project/Classes/lua_assetsmanager_test_sample.h rename to tests/lua-tests/project/Classes/lua_assetsmanager_test_sample.h diff --git a/tests/lua-tests/project/proj.android/.classpath b/tests/lua-tests/project/proj.android/.classpath new file mode 100644 index 0000000000..0b08408342 --- /dev/null +++ b/tests/lua-tests/project/proj.android/.classpath @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/samples/lua-tests/project/proj.android/.project b/tests/lua-tests/project/proj.android/.project similarity index 98% rename from samples/lua-tests/project/proj.android/.project rename to tests/lua-tests/project/proj.android/.project index fac9edb71e..f9c398d167 100644 --- a/samples/lua-tests/project/proj.android/.project +++ b/tests/lua-tests/project/proj.android/.project @@ -1,6 +1,6 @@ - TestLua + LuaTests diff --git a/tests/lua-tests/project/proj.android/AndroidManifest.xml b/tests/lua-tests/project/proj.android/AndroidManifest.xml new file mode 100644 index 0000000000..7a04f7e9fe --- /dev/null +++ b/tests/lua-tests/project/proj.android/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/lua-tests/project/proj.android/ant.properties b/tests/lua-tests/project/proj.android/ant.properties new file mode 100644 index 0000000000..b0971e891e --- /dev/null +++ b/tests/lua-tests/project/proj.android/ant.properties @@ -0,0 +1,17 @@ +# This file is used to override default values used by the Ant build system. +# +# This file must be checked into Version Control Systems, as it is +# integral to the build system of your project. + +# This file is only used by the Ant script. + +# You can use this to override default values such as +# 'source.dir' for the location of your java source folder and +# 'out.dir' for the location of your output folder. + +# You can also use it define how the release builds are signed by declaring +# the following properties: +# 'key.store' for the location of your keystore and +# 'key.alias' for the name of the key to use. +# The password will be asked during the build when you use the 'release' target. + diff --git a/tests/lua-tests/project/proj.android/build.xml b/tests/lua-tests/project/proj.android/build.xml new file mode 100644 index 0000000000..bede39f114 --- /dev/null +++ b/tests/lua-tests/project/proj.android/build.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/lua-tests/project/proj.android/jni/Android.mk b/tests/lua-tests/project/proj.android/jni/Android.mk similarity index 79% rename from samples/lua-tests/project/proj.android/jni/Android.mk rename to tests/lua-tests/project/proj.android/jni/Android.mk index f98f613ab6..37abd43abb 100644 --- a/samples/lua-tests/project/proj.android/jni/Android.mk +++ b/tests/lua-tests/project/proj.android/jni/Android.mk @@ -2,11 +2,11 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE := testlua_shared +LOCAL_MODULE := lua_tests_shared -LOCAL_MODULE_FILENAME := libtestlua +LOCAL_MODULE_FILENAME := liblua_tests -LOCAL_SRC_FILES += testlua/main.cpp \ +LOCAL_SRC_FILES += main.cpp \ ../../Classes/AppDelegate.cpp \ ../../Classes/lua_assetsmanager_test_sample.cpp diff --git a/samples/lua-tests/project/proj.android/jni/Application.mk b/tests/lua-tests/project/proj.android/jni/Application.mk similarity index 100% rename from samples/lua-tests/project/proj.android/jni/Application.mk rename to tests/lua-tests/project/proj.android/jni/Application.mk diff --git a/tests/lua-tests/project/proj.android/jni/main.cpp b/tests/lua-tests/project/proj.android/jni/main.cpp new file mode 100644 index 0000000000..a8b36b317d --- /dev/null +++ b/tests/lua-tests/project/proj.android/jni/main.cpp @@ -0,0 +1,16 @@ +#include "AppDelegate.h" +#include "cocos2d.h" +#include "CCEventType.h" +#include "platform/android/jni/JniHelper.h" +#include +#include + +#define LOG_TAG "main" +#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__) + +using namespace cocos2d; + +void cocos_android_app_init (struct android_app* app) { + LOGD("cocos_android_app_init"); + AppDelegate *pAppDelegate = new AppDelegate(); +} diff --git a/tests/lua-tests/project/proj.android/proguard-project.txt b/tests/lua-tests/project/proj.android/proguard-project.txt new file mode 100644 index 0000000000..f2fe1559a2 --- /dev/null +++ b/tests/lua-tests/project/proj.android/proguard-project.txt @@ -0,0 +1,20 @@ +# To enable ProGuard in your project, edit project.properties +# to define the proguard.config property as described in that file. +# +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in ${sdk.dir}/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the ProGuard +# include property in project.properties. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} diff --git a/tests/lua-tests/project/proj.android/project.properties b/tests/lua-tests/project/proj.android/project.properties new file mode 100644 index 0000000000..0a6dc6664d --- /dev/null +++ b/tests/lua-tests/project/proj.android/project.properties @@ -0,0 +1,13 @@ +# This file is automatically generated by Android Tools. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must be checked in Version Control Systems. +# +# To customize properties used by the Ant build system use, +# "ant.properties", and override values to adapt the script to your +# project structure. + +# Project target. +target=android-10 + +android.library.reference.1=../../../../cocos/2d/platform/android/java diff --git a/tests/lua-tests/project/proj.android/res/values/strings.xml b/tests/lua-tests/project/proj.android/res/values/strings.xml new file mode 100644 index 0000000000..c240c45dc7 --- /dev/null +++ b/tests/lua-tests/project/proj.android/res/values/strings.xml @@ -0,0 +1,4 @@ + + + LuaTests + diff --git a/samples/lua-tests/project/proj.android/src/com/cocos2dx/sample/LuaJavaBridgeTest/LuaJavaBridgeTest.java b/tests/lua-tests/project/proj.android/src/com/cocos2dx/sample/LuaJavaBridgeTest/LuaJavaBridgeTest.java similarity index 100% rename from samples/lua-tests/project/proj.android/src/com/cocos2dx/sample/LuaJavaBridgeTest/LuaJavaBridgeTest.java rename to tests/lua-tests/project/proj.android/src/com/cocos2dx/sample/LuaJavaBridgeTest/LuaJavaBridgeTest.java diff --git a/samples/lua-tests/project/proj.android/src/org/cocos2dx/testlua/Cocos2dxActivity.java b/tests/lua-tests/project/proj.android/src/org/cocos2dx/testlua/Cocos2dxActivity.java similarity index 96% rename from samples/lua-tests/project/proj.android/src/org/cocos2dx/testlua/Cocos2dxActivity.java rename to tests/lua-tests/project/proj.android/src/org/cocos2dx/testlua/Cocos2dxActivity.java index c5eac04f8c..25903d070d 100644 --- a/samples/lua-tests/project/proj.android/src/org/cocos2dx/testlua/Cocos2dxActivity.java +++ b/tests/lua-tests/project/proj.android/src/org/cocos2dx/testlua/Cocos2dxActivity.java @@ -1,4 +1,4 @@ -package org.cocos2dx.testlua; +package org.cocos2dx.lua_tests; import android.app.NativeActivity; import android.os.Bundle; diff --git a/tests/lua-tests/project/proj.ios_mac/ios/AppController.h b/tests/lua-tests/project/proj.ios_mac/ios/AppController.h new file mode 100644 index 0000000000..3d51064ca0 --- /dev/null +++ b/tests/lua-tests/project/proj.ios_mac/ios/AppController.h @@ -0,0 +1,33 @@ +/**************************************************************************** + Copyright (c) 2010 cocos2d-x.org + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +@class RootViewController; + +@interface AppController : NSObject { + UIWindow *window; + RootViewController *viewController; +} + +@end + diff --git a/samples/lua-tests/project/proj.ios_mac/ios/AppController.mm b/tests/lua-tests/project/proj.ios_mac/ios/AppController.mm similarity index 100% rename from samples/lua-tests/project/proj.ios_mac/ios/AppController.mm rename to tests/lua-tests/project/proj.ios_mac/ios/AppController.mm diff --git a/tests/lua-tests/project/proj.ios_mac/ios/Default-568h@2x.png.REMOVED.git-id b/tests/lua-tests/project/proj.ios_mac/ios/Default-568h@2x.png.REMOVED.git-id new file mode 100644 index 0000000000..8f5838f3a8 --- /dev/null +++ b/tests/lua-tests/project/proj.ios_mac/ios/Default-568h@2x.png.REMOVED.git-id @@ -0,0 +1 @@ +66c6d1cead373b45218424f6a82f370897e443e4 \ No newline at end of file diff --git a/tests/lua-tests/project/proj.ios_mac/ios/Default@2x.png.REMOVED.git-id b/tests/lua-tests/project/proj.ios_mac/ios/Default@2x.png.REMOVED.git-id new file mode 100644 index 0000000000..8843505b20 --- /dev/null +++ b/tests/lua-tests/project/proj.ios_mac/ios/Default@2x.png.REMOVED.git-id @@ -0,0 +1 @@ +84689888a14a2123d2b39f7f2f61be8c15207479 \ No newline at end of file diff --git a/samples/lua-tests/project/proj.ios_mac/ios/LuaObjectCBridgeTest.h b/tests/lua-tests/project/proj.ios_mac/ios/LuaObjectCBridgeTest.h similarity index 100% rename from samples/lua-tests/project/proj.ios_mac/ios/LuaObjectCBridgeTest.h rename to tests/lua-tests/project/proj.ios_mac/ios/LuaObjectCBridgeTest.h diff --git a/samples/lua-tests/project/proj.ios_mac/ios/LuaObjectCBridgeTest.mm b/tests/lua-tests/project/proj.ios_mac/ios/LuaObjectCBridgeTest.mm similarity index 100% rename from samples/lua-tests/project/proj.ios_mac/ios/LuaObjectCBridgeTest.mm rename to tests/lua-tests/project/proj.ios_mac/ios/LuaObjectCBridgeTest.mm diff --git a/tests/lua-tests/project/proj.ios_mac/ios/RootViewController.h b/tests/lua-tests/project/proj.ios_mac/ios/RootViewController.h new file mode 100644 index 0000000000..11dfc4bf88 --- /dev/null +++ b/tests/lua-tests/project/proj.ios_mac/ios/RootViewController.h @@ -0,0 +1,33 @@ +/**************************************************************************** + Copyright (c) 2010-2011 cocos2d-x.org + Copyright (c) 2010 Ricardo Quesada + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +#import + + +@interface RootViewController : UIViewController { + +} +- (BOOL)prefersStatusBarHidden; +@end diff --git a/tests/lua-tests/project/proj.ios_mac/ios/RootViewController.mm b/tests/lua-tests/project/proj.ios_mac/ios/RootViewController.mm new file mode 100644 index 0000000000..a00da00584 --- /dev/null +++ b/tests/lua-tests/project/proj.ios_mac/ios/RootViewController.mm @@ -0,0 +1,96 @@ +/**************************************************************************** + Copyright (c) 2010-2011 cocos2d-x.org + Copyright (c) 2010 Ricardo Quesada + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +#import "RootViewController.h" + + +@implementation RootViewController + +/* + // The designated initializer. Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad. +- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { + if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) { + // Custom initialization + } + return self; +} +*/ + +/* +// Implement loadView to create a view hierarchy programmatically, without using a nib. +- (void)loadView { +} +*/ + +/* +// Implement viewDidLoad to do additional setup after loading the view, typically from a nib. +- (void)viewDidLoad { + [super viewDidLoad]; +} + +*/ +// Override to allow orientations other than the default portrait orientation. +// This method is deprecated on ios6 +- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { + return UIInterfaceOrientationIsLandscape( interfaceOrientation ); +} + +// For ios6, use supportedInterfaceOrientations & shouldAutorotate instead +- (NSUInteger) supportedInterfaceOrientations{ +#ifdef __IPHONE_6_0 + return UIInterfaceOrientationMaskAllButUpsideDown; +#endif +} + +- (BOOL) shouldAutorotate { + return YES; +} + +//fix not hide status on ios7 +- (BOOL)prefersStatusBarHidden +{ + return YES; +} + +- (void)didReceiveMemoryWarning { + // Releases the view if it doesn't have a superview. + [super didReceiveMemoryWarning]; + + // Release any cached data, images, etc that aren't in use. +} + +- (void)viewDidUnload { + [super viewDidUnload]; + // Release any retained subviews of the main view. + // e.g. self.myOutlet = nil; +} + + +- (void)dealloc { + [super dealloc]; +} + + +@end diff --git a/samples/lua-tests/project/proj.ios_mac/ios/main.m b/tests/lua-tests/project/proj.ios_mac/ios/main.m similarity index 100% rename from samples/lua-tests/project/proj.ios_mac/ios/main.m rename to tests/lua-tests/project/proj.ios_mac/ios/main.m diff --git a/tests/lua-tests/project/proj.ios_mac/mac/Icon.icns.REMOVED.git-id b/tests/lua-tests/project/proj.ios_mac/mac/Icon.icns.REMOVED.git-id new file mode 100644 index 0000000000..9874ec6979 --- /dev/null +++ b/tests/lua-tests/project/proj.ios_mac/mac/Icon.icns.REMOVED.git-id @@ -0,0 +1 @@ +3d09e8fb4f4ca1c1ae7ab0a6948db592c7c3d9a0 \ No newline at end of file diff --git a/samples/lua-tests/project/proj.ios_mac/mac/LuaObjectCBridgeTest.h b/tests/lua-tests/project/proj.ios_mac/mac/LuaObjectCBridgeTest.h similarity index 100% rename from samples/lua-tests/project/proj.ios_mac/mac/LuaObjectCBridgeTest.h rename to tests/lua-tests/project/proj.ios_mac/mac/LuaObjectCBridgeTest.h diff --git a/samples/lua-tests/project/proj.ios_mac/mac/LuaObjectCBridgeTest.mm b/tests/lua-tests/project/proj.ios_mac/mac/LuaObjectCBridgeTest.mm similarity index 100% rename from samples/lua-tests/project/proj.ios_mac/mac/LuaObjectCBridgeTest.mm rename to tests/lua-tests/project/proj.ios_mac/mac/LuaObjectCBridgeTest.mm diff --git a/tests/lua-tests/project/proj.ios_mac/mac/en.lproj/InfoPlist.strings b/tests/lua-tests/project/proj.ios_mac/mac/en.lproj/InfoPlist.strings new file mode 100644 index 0000000000..477b28ff8f --- /dev/null +++ b/tests/lua-tests/project/proj.ios_mac/mac/en.lproj/InfoPlist.strings @@ -0,0 +1,2 @@ +/* Localized versions of Info.plist keys */ + diff --git a/tests/lua-tests/project/proj.ios_mac/mac/en.lproj/MainMenu.xib b/tests/lua-tests/project/proj.ios_mac/mac/en.lproj/MainMenu.xib new file mode 100644 index 0000000000..9f99439250 --- /dev/null +++ b/tests/lua-tests/project/proj.ios_mac/mac/en.lproj/MainMenu.xib @@ -0,0 +1,812 @@ + + + + 1060 + 10K549 + 1938 + 1038.36 + 461.00 + + com.apple.InterfaceBuilder.CocoaPlugin + 1938 + + + YES + NSMenuItem + NSCustomObject + NSMenu + + + YES + com.apple.InterfaceBuilder.CocoaPlugin + + + PluginDependencyRecalculationVersion + + + + YES + + NSApplication + + + FirstResponder + + + NSApplication + + + AMainMenu + + YES + + + HelloCpp + + 1048576 + 2147483647 + + NSImage + NSMenuCheckmark + + + NSImage + NSMenuMixedState + + submenuAction: + + HelloCpp + + YES + + + About HelloCpp + + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Preferences… + , + 1048576 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Services + + 1048576 + 2147483647 + + + submenuAction: + + Services + + YES + + _NSServicesMenu + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Hide HelloCpp + h + 1048576 + 2147483647 + + + + + + Hide Others + h + 1572864 + 2147483647 + + + + + + Show All + + 1048576 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Quit HelloCpp + q + 1048576 + 2147483647 + + + + + _NSAppleMenu + + + + + View + + 1048576 + 2147483647 + + + submenuAction: + + View + + YES + + + Toggle Fullscreen + f + 1048576 + 2147483647 + + + + + + + + + Window + + 1048576 + 2147483647 + + + submenuAction: + + Window + + YES + + + Minimize + m + 1048576 + 2147483647 + + + + + + Zoom + + 1048576 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Bring All to Front + + 1048576 + 2147483647 + + + + + _NSWindowsMenu + + + + + Help + + 2147483647 + + + submenuAction: + + Help + + YES + + + HelloCpp Help + ? + 1048576 + 2147483647 + + + + + _NSHelpMenu + + + + _NSMainMenu + + + AppController + + + NSFontManager + + + + + YES + + + terminate: + + + + 449 + + + + orderFrontStandardAboutPanel: + + + + 142 + + + + delegate + + + + 495 + + + + performMiniaturize: + + + + 37 + + + + arrangeInFront: + + + + 39 + + + + performZoom: + + + + 240 + + + + hide: + + + + 367 + + + + hideOtherApplications: + + + + 368 + + + + unhideAllApplications: + + + + 370 + + + + showHelp: + + + + 493 + + + + toggleFullScreen: + + + + 537 + + + + + YES + + 0 + + YES + + + + + + -2 + + + File's Owner + + + -1 + + + First Responder + + + -3 + + + Application + + + 29 + + + YES + + + + + + + + + 19 + + + YES + + + + + + 56 + + + YES + + + + + + 57 + + + YES + + + + + + + + + + + + + + + + 58 + + + + + 134 + + + + + 150 + + + + + 136 + + + + + 144 + + + + + 129 + + + + + 143 + + + + + 236 + + + + + 131 + + + YES + + + + + + 149 + + + + + 145 + + + + + 130 + + + + + 24 + + + YES + + + + + + + + + 92 + + + + + 5 + + + + + 239 + + + + + 23 + + + + + 295 + + + YES + + + + + + 296 + + + YES + + + + + + 420 + + + + + 490 + + + YES + + + + + + 491 + + + YES + + + + + + 492 + + + + + 494 + + + + + 536 + + + + + + + YES + + YES + -1.IBPluginDependency + -2.IBPluginDependency + -3.IBPluginDependency + 129.IBPluginDependency + 130.IBPluginDependency + 131.IBPluginDependency + 134.IBPluginDependency + 136.IBPluginDependency + 143.IBPluginDependency + 144.IBPluginDependency + 145.IBPluginDependency + 149.IBPluginDependency + 150.IBPluginDependency + 19.IBPluginDependency + 23.IBPluginDependency + 236.IBPluginDependency + 239.IBPluginDependency + 24.IBPluginDependency + 29.IBPluginDependency + 295.IBPluginDependency + 296.IBPluginDependency + 420.IBPluginDependency + 490.IBPluginDependency + 491.IBPluginDependency + 492.IBPluginDependency + 494.IBPluginDependency + 5.IBPluginDependency + 536.IBPluginDependency + 56.IBPluginDependency + 57.IBPluginDependency + 58.IBPluginDependency + 92.IBPluginDependency + + + YES + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + YES + + + + + + YES + + + + + 541 + + + + YES + + AppController + NSObject + + YES + + YES + exitFullScreen: + toggleFullScreen: + + + YES + id + id + + + + YES + + YES + exitFullScreen: + toggleFullScreen: + + + YES + + exitFullScreen: + id + + + toggleFullScreen: + id + + + + + YES + + YES + glView + window + + + YES + EAGLView + Window + + + + YES + + YES + glView + window + + + YES + + glView + EAGLView + + + window + Window + + + + + IBProjectSource + ./Classes/AppController.h + + + + EAGLView + NSOpenGLView + + IBProjectSource + ./Classes/EAGLView.h + + + + + 0 + IBCocoaFramework + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + + + YES + 3 + + YES + + YES + NSMenuCheckmark + NSMenuMixedState + + + YES + {9, 8} + {7, 2} + + + + diff --git a/samples/lua-tests/project/proj.ios_mac/mac/main.cpp b/tests/lua-tests/project/proj.ios_mac/mac/main.cpp similarity index 100% rename from samples/lua-tests/project/proj.ios_mac/mac/main.cpp rename to tests/lua-tests/project/proj.ios_mac/mac/main.cpp diff --git a/tests/lua-tests/project/proj.linux/main.cpp b/tests/lua-tests/project/proj.linux/main.cpp new file mode 100644 index 0000000000..e420889600 --- /dev/null +++ b/tests/lua-tests/project/proj.linux/main.cpp @@ -0,0 +1,16 @@ +#include "../Classes/AppDelegate.h" +#include "cocos2d.h" + +#include +#include +#include +#include + +USING_NS_CC; + +int main(int argc, char **argv) +{ + // create the application instance + AppDelegate app; + return Application::getInstance()->run(); +} diff --git a/samples/lua-tests/project/proj.win32/TestLua.rc b/tests/lua-tests/project/proj.win32/TestLua.rc similarity index 100% rename from samples/lua-tests/project/proj.win32/TestLua.rc rename to tests/lua-tests/project/proj.win32/TestLua.rc diff --git a/samples/lua-tests/project/proj.win32/TestLua.win32.vcxproj b/tests/lua-tests/project/proj.win32/TestLua.win32.vcxproj similarity index 100% rename from samples/lua-tests/project/proj.win32/TestLua.win32.vcxproj rename to tests/lua-tests/project/proj.win32/TestLua.win32.vcxproj diff --git a/samples/lua-tests/project/proj.win32/TestLua.win32.vcxproj.filters b/tests/lua-tests/project/proj.win32/TestLua.win32.vcxproj.filters similarity index 100% rename from samples/lua-tests/project/proj.win32/TestLua.win32.vcxproj.filters rename to tests/lua-tests/project/proj.win32/TestLua.win32.vcxproj.filters diff --git a/samples/lua-tests/project/proj.win32/TestLua.win32.vcxproj.user b/tests/lua-tests/project/proj.win32/TestLua.win32.vcxproj.user similarity index 100% rename from samples/lua-tests/project/proj.win32/TestLua.win32.vcxproj.user rename to tests/lua-tests/project/proj.win32/TestLua.win32.vcxproj.user diff --git a/samples/lua-tests/project/proj.win32/main.cpp b/tests/lua-tests/project/proj.win32/main.cpp similarity index 100% rename from samples/lua-tests/project/proj.win32/main.cpp rename to tests/lua-tests/project/proj.win32/main.cpp diff --git a/tests/lua-tests/project/proj.win32/main.h b/tests/lua-tests/project/proj.win32/main.h new file mode 100644 index 0000000000..d756fd1e57 --- /dev/null +++ b/tests/lua-tests/project/proj.win32/main.h @@ -0,0 +1,10 @@ +#ifndef __MAIN_H__ +#define __MAIN_H__ + +#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers + +// Windows Header Files: +#include +#include + +#endif // __WINMAIN_H__ diff --git a/tests/lua-tests/project/proj.win32/res/TestLua.ico b/tests/lua-tests/project/proj.win32/res/TestLua.ico new file mode 100644 index 0000000000..feaf932a74 Binary files /dev/null and b/tests/lua-tests/project/proj.win32/res/TestLua.ico differ diff --git a/samples/lua-tests/project/proj.win32/resource.h b/tests/lua-tests/project/proj.win32/resource.h similarity index 100% rename from samples/lua-tests/project/proj.win32/resource.h rename to tests/lua-tests/project/proj.win32/resource.h diff --git a/samples/lua-tests/res/cocosbuilderRes/ccb/flower.jpg.REMOVED.git-id b/tests/lua-tests/res/cocosbuilderRes/ccb/flower.jpg.REMOVED.git-id similarity index 100% rename from samples/lua-tests/res/cocosbuilderRes/ccb/flower.jpg.REMOVED.git-id rename to tests/lua-tests/res/cocosbuilderRes/ccb/flower.jpg.REMOVED.git-id diff --git a/samples/lua-tests/res/cocosbuilderRes/ccb/gem-0.wav.REMOVED.git-id b/tests/lua-tests/res/cocosbuilderRes/ccb/gem-0.wav.REMOVED.git-id similarity index 100% rename from samples/lua-tests/res/cocosbuilderRes/ccb/gem-0.wav.REMOVED.git-id rename to tests/lua-tests/res/cocosbuilderRes/ccb/gem-0.wav.REMOVED.git-id diff --git a/samples/lua-tests/res/cocosbuilderRes/ccb/gem-1.wav.REMOVED.git-id b/tests/lua-tests/res/cocosbuilderRes/ccb/gem-1.wav.REMOVED.git-id similarity index 100% rename from samples/lua-tests/res/cocosbuilderRes/ccb/gem-1.wav.REMOVED.git-id rename to tests/lua-tests/res/cocosbuilderRes/ccb/gem-1.wav.REMOVED.git-id diff --git a/samples/lua-tests/res/cocosbuilderRes/ccb/markerfelt24shadow.fnt.REMOVED.git-id b/tests/lua-tests/res/cocosbuilderRes/ccb/markerfelt24shadow.fnt.REMOVED.git-id similarity index 100% rename from samples/lua-tests/res/cocosbuilderRes/ccb/markerfelt24shadow.fnt.REMOVED.git-id rename to tests/lua-tests/res/cocosbuilderRes/ccb/markerfelt24shadow.fnt.REMOVED.git-id diff --git a/samples/lua-tests/src/AccelerometerTest/AccelerometerTest.lua b/tests/lua-tests/src/AccelerometerTest/AccelerometerTest.lua similarity index 100% rename from samples/lua-tests/src/AccelerometerTest/AccelerometerTest.lua rename to tests/lua-tests/src/AccelerometerTest/AccelerometerTest.lua diff --git a/samples/lua-tests/src/ActionManagerTest/ActionManagerTest.lua b/tests/lua-tests/src/ActionManagerTest/ActionManagerTest.lua similarity index 100% rename from samples/lua-tests/src/ActionManagerTest/ActionManagerTest.lua rename to tests/lua-tests/src/ActionManagerTest/ActionManagerTest.lua diff --git a/samples/lua-tests/src/ActionsEaseTest/ActionsEaseTest.lua b/tests/lua-tests/src/ActionsEaseTest/ActionsEaseTest.lua similarity index 100% rename from samples/lua-tests/src/ActionsEaseTest/ActionsEaseTest.lua rename to tests/lua-tests/src/ActionsEaseTest/ActionsEaseTest.lua diff --git a/samples/lua-tests/src/ActionsProgressTest/ActionsProgressTest.lua b/tests/lua-tests/src/ActionsProgressTest/ActionsProgressTest.lua similarity index 100% rename from samples/lua-tests/src/ActionsProgressTest/ActionsProgressTest.lua rename to tests/lua-tests/src/ActionsProgressTest/ActionsProgressTest.lua diff --git a/samples/lua-tests/src/ActionsTest/ActionsTest.lua b/tests/lua-tests/src/ActionsTest/ActionsTest.lua similarity index 100% rename from samples/lua-tests/src/ActionsTest/ActionsTest.lua rename to tests/lua-tests/src/ActionsTest/ActionsTest.lua diff --git a/samples/lua-tests/src/AssetsManagerTest/AssetsManagerModule.lua b/tests/lua-tests/src/AssetsManagerTest/AssetsManagerModule.lua similarity index 100% rename from samples/lua-tests/src/AssetsManagerTest/AssetsManagerModule.lua rename to tests/lua-tests/src/AssetsManagerTest/AssetsManagerModule.lua diff --git a/samples/lua-tests/src/AssetsManagerTest/AssetsManagerTest.lua b/tests/lua-tests/src/AssetsManagerTest/AssetsManagerTest.lua similarity index 100% rename from samples/lua-tests/src/AssetsManagerTest/AssetsManagerTest.lua rename to tests/lua-tests/src/AssetsManagerTest/AssetsManagerTest.lua diff --git a/samples/lua-tests/src/BugsTest/BugsTest.lua b/tests/lua-tests/src/BugsTest/BugsTest.lua similarity index 100% rename from samples/lua-tests/src/BugsTest/BugsTest.lua rename to tests/lua-tests/src/BugsTest/BugsTest.lua diff --git a/samples/lua-tests/src/ClickAndMoveTest/ClickAndMoveTest.lua b/tests/lua-tests/src/ClickAndMoveTest/ClickAndMoveTest.lua similarity index 100% rename from samples/lua-tests/src/ClickAndMoveTest/ClickAndMoveTest.lua rename to tests/lua-tests/src/ClickAndMoveTest/ClickAndMoveTest.lua diff --git a/samples/lua-tests/src/CocoStudioTest/CocoStudioArmatureTest/CocoStudioArmatureTest.lua b/tests/lua-tests/src/CocoStudioTest/CocoStudioArmatureTest/CocoStudioArmatureTest.lua similarity index 100% rename from samples/lua-tests/src/CocoStudioTest/CocoStudioArmatureTest/CocoStudioArmatureTest.lua rename to tests/lua-tests/src/CocoStudioTest/CocoStudioArmatureTest/CocoStudioArmatureTest.lua diff --git a/samples/lua-tests/src/CocoStudioTest/CocoStudioGUITest/CocoStudioGUITest.lua.REMOVED.git-id b/tests/lua-tests/src/CocoStudioTest/CocoStudioGUITest/CocoStudioGUITest.lua.REMOVED.git-id similarity index 100% rename from samples/lua-tests/src/CocoStudioTest/CocoStudioGUITest/CocoStudioGUITest.lua.REMOVED.git-id rename to tests/lua-tests/src/CocoStudioTest/CocoStudioGUITest/CocoStudioGUITest.lua.REMOVED.git-id diff --git a/samples/lua-tests/src/CocoStudioTest/CocoStudioSceneTest/CocoStudioSceneTest.lua b/tests/lua-tests/src/CocoStudioTest/CocoStudioSceneTest/CocoStudioSceneTest.lua similarity index 100% rename from samples/lua-tests/src/CocoStudioTest/CocoStudioSceneTest/CocoStudioSceneTest.lua rename to tests/lua-tests/src/CocoStudioTest/CocoStudioSceneTest/CocoStudioSceneTest.lua diff --git a/samples/lua-tests/src/CocoStudioTest/CocoStudioSceneTest/TriggerCode/acts.lua b/tests/lua-tests/src/CocoStudioTest/CocoStudioSceneTest/TriggerCode/acts.lua similarity index 100% rename from samples/lua-tests/src/CocoStudioTest/CocoStudioSceneTest/TriggerCode/acts.lua rename to tests/lua-tests/src/CocoStudioTest/CocoStudioSceneTest/TriggerCode/acts.lua diff --git a/samples/lua-tests/src/CocoStudioTest/CocoStudioSceneTest/TriggerCode/cons.lua b/tests/lua-tests/src/CocoStudioTest/CocoStudioSceneTest/TriggerCode/cons.lua similarity index 100% rename from samples/lua-tests/src/CocoStudioTest/CocoStudioSceneTest/TriggerCode/cons.lua rename to tests/lua-tests/src/CocoStudioTest/CocoStudioSceneTest/TriggerCode/cons.lua diff --git a/samples/lua-tests/src/CocoStudioTest/CocoStudioSceneTest/TriggerCode/eventDef.lua b/tests/lua-tests/src/CocoStudioTest/CocoStudioSceneTest/TriggerCode/eventDef.lua similarity index 100% rename from samples/lua-tests/src/CocoStudioTest/CocoStudioSceneTest/TriggerCode/eventDef.lua rename to tests/lua-tests/src/CocoStudioTest/CocoStudioSceneTest/TriggerCode/eventDef.lua diff --git a/samples/lua-tests/src/CocoStudioTest/CocoStudioTest.lua b/tests/lua-tests/src/CocoStudioTest/CocoStudioTest.lua similarity index 100% rename from samples/lua-tests/src/CocoStudioTest/CocoStudioTest.lua rename to tests/lua-tests/src/CocoStudioTest/CocoStudioTest.lua diff --git a/samples/lua-tests/src/CocosDenshionTest/CocosDenshionTest.lua b/tests/lua-tests/src/CocosDenshionTest/CocosDenshionTest.lua similarity index 100% rename from samples/lua-tests/src/CocosDenshionTest/CocosDenshionTest.lua rename to tests/lua-tests/src/CocosDenshionTest/CocosDenshionTest.lua diff --git a/samples/lua-tests/src/CurrentLanguageTest/CurrentLanguageTest.lua b/tests/lua-tests/src/CurrentLanguageTest/CurrentLanguageTest.lua similarity index 100% rename from samples/lua-tests/src/CurrentLanguageTest/CurrentLanguageTest.lua rename to tests/lua-tests/src/CurrentLanguageTest/CurrentLanguageTest.lua diff --git a/samples/lua-tests/src/DrawPrimitivesTest/DrawPrimitivesTest.lua b/tests/lua-tests/src/DrawPrimitivesTest/DrawPrimitivesTest.lua similarity index 100% rename from samples/lua-tests/src/DrawPrimitivesTest/DrawPrimitivesTest.lua rename to tests/lua-tests/src/DrawPrimitivesTest/DrawPrimitivesTest.lua diff --git a/samples/lua-tests/src/EffectsAdvancedTest/EffectsAdvancedTest.lua b/tests/lua-tests/src/EffectsAdvancedTest/EffectsAdvancedTest.lua similarity index 100% rename from samples/lua-tests/src/EffectsAdvancedTest/EffectsAdvancedTest.lua rename to tests/lua-tests/src/EffectsAdvancedTest/EffectsAdvancedTest.lua diff --git a/samples/lua-tests/src/EffectsTest/EffectsName.lua b/tests/lua-tests/src/EffectsTest/EffectsName.lua similarity index 100% rename from samples/lua-tests/src/EffectsTest/EffectsName.lua rename to tests/lua-tests/src/EffectsTest/EffectsName.lua diff --git a/samples/lua-tests/src/EffectsTest/EffectsTest.lua b/tests/lua-tests/src/EffectsTest/EffectsTest.lua similarity index 100% rename from samples/lua-tests/src/EffectsTest/EffectsTest.lua rename to tests/lua-tests/src/EffectsTest/EffectsTest.lua diff --git a/samples/lua-tests/src/ExtensionTest/CocosBuilderTest.lua b/tests/lua-tests/src/ExtensionTest/CocosBuilderTest.lua similarity index 100% rename from samples/lua-tests/src/ExtensionTest/CocosBuilderTest.lua rename to tests/lua-tests/src/ExtensionTest/CocosBuilderTest.lua diff --git a/samples/lua-tests/src/ExtensionTest/ExtensionTest.lua b/tests/lua-tests/src/ExtensionTest/ExtensionTest.lua similarity index 100% rename from samples/lua-tests/src/ExtensionTest/ExtensionTest.lua rename to tests/lua-tests/src/ExtensionTest/ExtensionTest.lua diff --git a/samples/lua-tests/src/ExtensionTest/WebProxyTest.lua b/tests/lua-tests/src/ExtensionTest/WebProxyTest.lua similarity index 100% rename from samples/lua-tests/src/ExtensionTest/WebProxyTest.lua rename to tests/lua-tests/src/ExtensionTest/WebProxyTest.lua diff --git a/samples/lua-tests/src/FontTest/FontTest.lua b/tests/lua-tests/src/FontTest/FontTest.lua similarity index 100% rename from samples/lua-tests/src/FontTest/FontTest.lua rename to tests/lua-tests/src/FontTest/FontTest.lua diff --git a/samples/lua-tests/src/IntervalTest/IntervalTest.lua b/tests/lua-tests/src/IntervalTest/IntervalTest.lua similarity index 100% rename from samples/lua-tests/src/IntervalTest/IntervalTest.lua rename to tests/lua-tests/src/IntervalTest/IntervalTest.lua diff --git a/samples/lua-tests/src/KeypadTest/KeypadTest.lua b/tests/lua-tests/src/KeypadTest/KeypadTest.lua similarity index 100% rename from samples/lua-tests/src/KeypadTest/KeypadTest.lua rename to tests/lua-tests/src/KeypadTest/KeypadTest.lua diff --git a/samples/lua-tests/src/LabelTest/LabelTest.lua b/tests/lua-tests/src/LabelTest/LabelTest.lua similarity index 100% rename from samples/lua-tests/src/LabelTest/LabelTest.lua rename to tests/lua-tests/src/LabelTest/LabelTest.lua diff --git a/samples/lua-tests/src/LabelTestNew/LabelTestNew.lua b/tests/lua-tests/src/LabelTestNew/LabelTestNew.lua similarity index 100% rename from samples/lua-tests/src/LabelTestNew/LabelTestNew.lua rename to tests/lua-tests/src/LabelTestNew/LabelTestNew.lua diff --git a/samples/lua-tests/src/LayerTest/LayerTest.lua b/tests/lua-tests/src/LayerTest/LayerTest.lua similarity index 100% rename from samples/lua-tests/src/LayerTest/LayerTest.lua rename to tests/lua-tests/src/LayerTest/LayerTest.lua diff --git a/samples/lua-tests/src/LuaBridgeTest/LuaBridgeTest.lua b/tests/lua-tests/src/LuaBridgeTest/LuaBridgeTest.lua similarity index 100% rename from samples/lua-tests/src/LuaBridgeTest/LuaBridgeTest.lua rename to tests/lua-tests/src/LuaBridgeTest/LuaBridgeTest.lua diff --git a/samples/lua-tests/src/MenuTest/MenuTest.lua b/tests/lua-tests/src/MenuTest/MenuTest.lua similarity index 100% rename from samples/lua-tests/src/MenuTest/MenuTest.lua rename to tests/lua-tests/src/MenuTest/MenuTest.lua diff --git a/samples/lua-tests/src/MotionStreakTest/MotionStreakTest.lua b/tests/lua-tests/src/MotionStreakTest/MotionStreakTest.lua similarity index 100% rename from samples/lua-tests/src/MotionStreakTest/MotionStreakTest.lua rename to tests/lua-tests/src/MotionStreakTest/MotionStreakTest.lua diff --git a/samples/lua-tests/src/NewEventDispatcherTest/NewEventDispatcherTest.lua b/tests/lua-tests/src/NewEventDispatcherTest/NewEventDispatcherTest.lua similarity index 100% rename from samples/lua-tests/src/NewEventDispatcherTest/NewEventDispatcherTest.lua rename to tests/lua-tests/src/NewEventDispatcherTest/NewEventDispatcherTest.lua diff --git a/samples/lua-tests/src/NodeTest/NodeTest.lua b/tests/lua-tests/src/NodeTest/NodeTest.lua similarity index 100% rename from samples/lua-tests/src/NodeTest/NodeTest.lua rename to tests/lua-tests/src/NodeTest/NodeTest.lua diff --git a/samples/lua-tests/src/OpenGLTest/OpenGLTest.lua b/tests/lua-tests/src/OpenGLTest/OpenGLTest.lua similarity index 100% rename from samples/lua-tests/src/OpenGLTest/OpenGLTest.lua rename to tests/lua-tests/src/OpenGLTest/OpenGLTest.lua diff --git a/samples/lua-tests/src/ParallaxTest/ParallaxTest.lua b/tests/lua-tests/src/ParallaxTest/ParallaxTest.lua similarity index 100% rename from samples/lua-tests/src/ParallaxTest/ParallaxTest.lua rename to tests/lua-tests/src/ParallaxTest/ParallaxTest.lua diff --git a/samples/lua-tests/src/ParticleTest/ParticleTest.lua b/tests/lua-tests/src/ParticleTest/ParticleTest.lua similarity index 100% rename from samples/lua-tests/src/ParticleTest/ParticleTest.lua rename to tests/lua-tests/src/ParticleTest/ParticleTest.lua diff --git a/samples/lua-tests/src/PerformanceTest/PerformanceSpriteTest.lua b/tests/lua-tests/src/PerformanceTest/PerformanceSpriteTest.lua similarity index 100% rename from samples/lua-tests/src/PerformanceTest/PerformanceSpriteTest.lua rename to tests/lua-tests/src/PerformanceTest/PerformanceSpriteTest.lua diff --git a/samples/lua-tests/src/PerformanceTest/PerformanceTest.lua b/tests/lua-tests/src/PerformanceTest/PerformanceTest.lua similarity index 100% rename from samples/lua-tests/src/PerformanceTest/PerformanceTest.lua rename to tests/lua-tests/src/PerformanceTest/PerformanceTest.lua diff --git a/samples/lua-tests/src/PhysicsTest/PhysicsTest.lua b/tests/lua-tests/src/PhysicsTest/PhysicsTest.lua similarity index 100% rename from samples/lua-tests/src/PhysicsTest/PhysicsTest.lua rename to tests/lua-tests/src/PhysicsTest/PhysicsTest.lua diff --git a/samples/lua-tests/src/RenderTextureTest/RenderTextureTest.lua b/tests/lua-tests/src/RenderTextureTest/RenderTextureTest.lua similarity index 100% rename from samples/lua-tests/src/RenderTextureTest/RenderTextureTest.lua rename to tests/lua-tests/src/RenderTextureTest/RenderTextureTest.lua diff --git a/samples/lua-tests/src/RotateWorldTest/RotateWorldTest.lua b/tests/lua-tests/src/RotateWorldTest/RotateWorldTest.lua similarity index 100% rename from samples/lua-tests/src/RotateWorldTest/RotateWorldTest.lua rename to tests/lua-tests/src/RotateWorldTest/RotateWorldTest.lua diff --git a/samples/lua-tests/src/SceneTest/SceneTest.lua b/tests/lua-tests/src/SceneTest/SceneTest.lua similarity index 100% rename from samples/lua-tests/src/SceneTest/SceneTest.lua rename to tests/lua-tests/src/SceneTest/SceneTest.lua diff --git a/samples/lua-tests/src/SpineTest/SpineTest.lua b/tests/lua-tests/src/SpineTest/SpineTest.lua similarity index 100% rename from samples/lua-tests/src/SpineTest/SpineTest.lua rename to tests/lua-tests/src/SpineTest/SpineTest.lua diff --git a/samples/lua-tests/src/SpriteTest/SpriteTest.lua b/tests/lua-tests/src/SpriteTest/SpriteTest.lua similarity index 100% rename from samples/lua-tests/src/SpriteTest/SpriteTest.lua rename to tests/lua-tests/src/SpriteTest/SpriteTest.lua diff --git a/samples/lua-tests/src/Texture2dTest/Texture2dTest.lua b/tests/lua-tests/src/Texture2dTest/Texture2dTest.lua similarity index 100% rename from samples/lua-tests/src/Texture2dTest/Texture2dTest.lua rename to tests/lua-tests/src/Texture2dTest/Texture2dTest.lua diff --git a/samples/lua-tests/src/TileMapTest/TileMapTest.lua b/tests/lua-tests/src/TileMapTest/TileMapTest.lua similarity index 100% rename from samples/lua-tests/src/TileMapTest/TileMapTest.lua rename to tests/lua-tests/src/TileMapTest/TileMapTest.lua diff --git a/samples/lua-tests/src/TouchesTest/Ball.lua b/tests/lua-tests/src/TouchesTest/Ball.lua similarity index 100% rename from samples/lua-tests/src/TouchesTest/Ball.lua rename to tests/lua-tests/src/TouchesTest/Ball.lua diff --git a/samples/lua-tests/src/TouchesTest/Paddle.lua b/tests/lua-tests/src/TouchesTest/Paddle.lua similarity index 100% rename from samples/lua-tests/src/TouchesTest/Paddle.lua rename to tests/lua-tests/src/TouchesTest/Paddle.lua diff --git a/samples/lua-tests/src/TouchesTest/TouchesTest.lua b/tests/lua-tests/src/TouchesTest/TouchesTest.lua similarity index 100% rename from samples/lua-tests/src/TouchesTest/TouchesTest.lua rename to tests/lua-tests/src/TouchesTest/TouchesTest.lua diff --git a/samples/lua-tests/src/TransitionsTest/TransitionsName.lua b/tests/lua-tests/src/TransitionsTest/TransitionsName.lua similarity index 100% rename from samples/lua-tests/src/TransitionsTest/TransitionsName.lua rename to tests/lua-tests/src/TransitionsTest/TransitionsName.lua diff --git a/samples/lua-tests/src/TransitionsTest/TransitionsTest.lua b/tests/lua-tests/src/TransitionsTest/TransitionsTest.lua similarity index 100% rename from samples/lua-tests/src/TransitionsTest/TransitionsTest.lua rename to tests/lua-tests/src/TransitionsTest/TransitionsTest.lua diff --git a/samples/lua-tests/src/UserDefaultTest/UserDefaultTest.lua b/tests/lua-tests/src/UserDefaultTest/UserDefaultTest.lua similarity index 100% rename from samples/lua-tests/src/UserDefaultTest/UserDefaultTest.lua rename to tests/lua-tests/src/UserDefaultTest/UserDefaultTest.lua diff --git a/samples/lua-tests/src/VisibleRect.lua b/tests/lua-tests/src/VisibleRect.lua similarity index 100% rename from samples/lua-tests/src/VisibleRect.lua rename to tests/lua-tests/src/VisibleRect.lua diff --git a/samples/lua-tests/src/XMLHttpRequestTest/XMLHttpRequestTest.lua b/tests/lua-tests/src/XMLHttpRequestTest/XMLHttpRequestTest.lua similarity index 100% rename from samples/lua-tests/src/XMLHttpRequestTest/XMLHttpRequestTest.lua rename to tests/lua-tests/src/XMLHttpRequestTest/XMLHttpRequestTest.lua diff --git a/samples/lua-tests/src/ZwoptexTest/ZwoptexTest.lua b/tests/lua-tests/src/ZwoptexTest/ZwoptexTest.lua similarity index 100% rename from samples/lua-tests/src/ZwoptexTest/ZwoptexTest.lua rename to tests/lua-tests/src/ZwoptexTest/ZwoptexTest.lua diff --git a/samples/lua-tests/src/controller.lua b/tests/lua-tests/src/controller.lua similarity index 100% rename from samples/lua-tests/src/controller.lua rename to tests/lua-tests/src/controller.lua diff --git a/samples/lua-tests/src/helper.lua b/tests/lua-tests/src/helper.lua similarity index 100% rename from samples/lua-tests/src/helper.lua rename to tests/lua-tests/src/helper.lua diff --git a/samples/lua-tests/src/mainMenu.lua b/tests/lua-tests/src/mainMenu.lua similarity index 100% rename from samples/lua-tests/src/mainMenu.lua rename to tests/lua-tests/src/mainMenu.lua diff --git a/samples/lua-tests/src/testResource.lua b/tests/lua-tests/src/testResource.lua similarity index 100% rename from samples/lua-tests/src/testResource.lua rename to tests/lua-tests/src/testResource.lua diff --git a/tools/jenkins-scripts/autotest.py b/tools/jenkins-scripts/autotest.py index b170b8e8dd..5ade2a4e34 100755 --- a/tools/jenkins-scripts/autotest.py +++ b/tools/jenkins-scripts/autotest.py @@ -39,21 +39,21 @@ def autotest(type): #----------------autotest build and run----------------# def MAC_BUILD(): def cleanProj(): - infoClean = os.system('xcodebuild -project ./build/cocos2d_samples.xcodeproj -target Test\ cpp\ Mac clean') + infoClean = os.system('xcodebuild -project ./build/cocos2d_tests.xcodeproj -target cpp-tests\ Mac clean') print 'infoClean: ', infoClean if infoClean != 0: return False time.sleep(sleep_time) return True def buildProj(): - infoBuild = os.system('xcodebuild -project ./build/cocos2d_samples.xcodeproj -target Test\ cpp\ Mac') + infoBuild = os.system('xcodebuild -project ./build/cocos2d_tests.xcodeproj -target cpp-tests\ Mac') print 'infoBuild: ', infoBuild if infoBuild != 0: return False time.sleep(sleep_time) return True def openProj(): - cmd = 'open ./build/build/Debug/Test\ cpp\ Mac.app' + cmd = 'open ./build/build/Debug/cpp-tests\ Mac.app' print 'cmd: ', cmd infoOpen = os.system(cmd) print 'infoOpen: ', infoOpen diff --git a/tools/jenkins-scripts/ios-build.sh b/tools/jenkins-scripts/ios-build.sh index 3945fb3914..a328c30120 100755 --- a/tools/jenkins-scripts/ios-build.sh +++ b/tools/jenkins-scripts/ios-build.sh @@ -1,5 +1,5 @@ #put xctool.sh into your PATH DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" COCOS2DX_ROOT="$DIR"/../.. -xcodebuild -project "$COCOS2DX_ROOT"/build/cocos2d_samples.xcodeproj -scheme "build all samples iOS" -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)" clean -xcodebuild -project "$COCOS2DX_ROOT"/build/cocos2d_samples.xcodeproj -scheme "build all samples iOS" -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)" build +xcodebuild -project "$COCOS2DX_ROOT"/build/cocos2d_tests.xcodeproj -scheme "build all tests iOS" -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)" clean +xcodebuild -project "$COCOS2DX_ROOT"/build/cocos2d_tests.xcodeproj -scheme "build all tests iOS" -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)" build diff --git a/tools/jenkins-scripts/pull-request-builder.py b/tools/jenkins-scripts/pull-request-builder.py index aa65338dfd..d4557dac20 100755 --- a/tools/jenkins-scripts/pull-request-builder.py +++ b/tools/jenkins-scripts/pull-request-builder.py @@ -78,8 +78,8 @@ def main(): os.system("git checkout develop") os.system("git branch -D pull" + str(pr_num)) #clean workspace - print "git clean -xdf" - os.system("git clean -xdf") + print "Before checkout: git clean -xdf -f" + os.system("git clean -xdf -f") #fetch pull request to local repo git_fetch_pr = "git fetch origin pull/" + str(pr_num) + "/merge" os.system(git_fetch_pr) @@ -88,6 +88,10 @@ def main(): git_checkout = "git checkout -b " + "pull" + str(pr_num) + " FETCH_HEAD" os.system(git_checkout) + # After checkout a new branch, clean workspace again + print "After checkout: git clean -xdf -f" + os.system("git clean -xdf -f") + #update submodule git_update_submodule = "git submodule update --init --force" os.system(git_update_submodule) @@ -96,23 +100,23 @@ def main(): os.system("python tools/jenkins-scripts/gen_jsb.py") #make temp dir - print "current dir is" + os.environ['WORKSPACE'] + print "current dir is: " + os.environ['WORKSPACE'] os.system("cd " + os.environ['WORKSPACE']); os.mkdir("android_build_objs") #add symbol link - # PROJECTS=["test-cpp", - # "test-javascript","test-lua"] - # print platform.system() - # if(platform.system() == 'Darwin'): - # for item in PROJECTS: - # cmd = "ln -s " + os.environ['WORKSPACE']+"/android_build_objs/ " + os.environ['WORKSPACE']+"/tests/"+item+"/proj.android/obj" - # os.system(cmd) - # elif(platform.system() == 'Windows'): - # for item in PROJECTS: - # p = item.replace("/", os.sep) - # cmd = "mklink /J "+os.environ['WORKSPACE']+os.sep+"tests"+os.sep +p+os.sep+"proj.android"+os.sep+"obj " + os.environ['WORKSPACE']+os.sep+"android_build_objs" - # print cmd - # os.system(cmd) + PROJECTS=["cpp-empty-test", "cpp-tests"] + + print platform.system() + if(platform.system() == 'Darwin'): + for item in PROJECTS: + cmd = "ln -s " + os.environ['WORKSPACE']+"/android_build_objs/ " + os.environ['WORKSPACE']+"/tests/"+item+"/proj.android/obj" + os.system(cmd) + elif(platform.system() == 'Windows'): + for item in PROJECTS: + p = item.replace("/", os.sep) + cmd = "mklink /J "+os.environ['WORKSPACE']+os.sep+"tests"+os.sep +p+os.sep+"proj.android"+os.sep+"obj " + os.environ['WORKSPACE']+os.sep+"android_build_objs" + print cmd + os.system(cmd) #build #TODO: add android-linux build @@ -120,7 +124,8 @@ def main(): node_name = os.environ['NODE_NAME'] if(branch == 'develop'): if(node_name == 'android_mac') or (node_name == 'android_win7'): - ret = os.system("python build/android-build.py -n -j10 testcpp") + print "Start build android..." + ret = os.system("python build/android-build.py -n -j10 cpp") elif(node_name == 'win32_win7'): ret = subprocess.call('"%VS110COMNTOOLS%..\IDE\devenv.com" "build\cocos2d-win32.vc2012.sln" /Build "Debug|Win32"', shell=True) elif(node_name == 'ios_mac'): diff --git a/tools/travis-scripts/run-script.sh b/tools/travis-scripts/run-script.sh index a8d124e752..28c2f1888e 100755 --- a/tools/travis-scripts/run-script.sh +++ b/tools/travis-scripts/run-script.sh @@ -68,17 +68,17 @@ elif [ "$PLATFORM"x = "android"x ]; then cd $COCOS2DX_ROOT # Create a directory for temporary objects - # mkdir android_build_objs + mkdir android_build_objs - # PROJECTS=("test-cpp" "test-javascript" "test-lua") - # for i in ${PROJECTS[*]}; do - # ln -s $COCOS2DX_ROOT/android_build_objs $COCOS2DX_ROOT/tests/$i/proj.android/obj - # done + PROJECTS=("cpp-empty-test" "cpp-tests" "lua-empty-test/project" "lua-tests/project") + for i in ${PROJECTS[*]}; do + ln -s $COCOS2DX_ROOT/android_build_objs $COCOS2DX_ROOT/tests/$i/proj.android/obj + done # Build all samples echo "Building all samples ..." cd $COCOS2DX_ROOT/build - ./android-build.py -n "NDK_BUG=0 -j10" testcpp + ./android-build.py -n "NDK_BUG=0 -j10" all elif [ "$PLATFORM"x = "nacl"x ]; then export NACL_SDK_ROOT=$HOME/bin/nacl_sdk/pepper_canary