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

runtime template support Xcode6

This commit is contained in:
honghui 2014-09-30 15:49:58 +08:00
parent 39fa97f5d4
commit 7dbac13993
3 changed files with 68 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
templates/cocos2dx_files.json
View File

@ -1000,6 +1000,43 @@
"cocos/renderer/ccShader_Position_uColor.vert",
"cocos/renderer/ccShaders.cpp",
"cocos/renderer/ccShaders.h",
"cocos/scripting/auto-generated/README.md",
"cocos/scripting/auto-generated/js-bindings/jsb_cocos2dx_auto.cpp",
"cocos/scripting/auto-generated/js-bindings/jsb_cocos2dx_auto.hpp",
"cocos/scripting/auto-generated/js-bindings/jsb_cocos2dx_auto_api.js",
"cocos/scripting/auto-generated/js-bindings/jsb_cocos2dx_builder_auto.cpp",
"cocos/scripting/auto-generated/js-bindings/jsb_cocos2dx_builder_auto.hpp",
"cocos/scripting/auto-generated/js-bindings/jsb_cocos2dx_builder_auto_api.js",
"cocos/scripting/auto-generated/js-bindings/jsb_cocos2dx_extension_auto.cpp",
"cocos/scripting/auto-generated/js-bindings/jsb_cocos2dx_extension_auto.hpp",
"cocos/scripting/auto-generated/js-bindings/jsb_cocos2dx_extension_auto_api.js",
"cocos/scripting/auto-generated/js-bindings/jsb_cocos2dx_gui_auto.cpp",
"cocos/scripting/auto-generated/js-bindings/jsb_cocos2dx_gui_auto.hpp",
"cocos/scripting/auto-generated/js-bindings/jsb_cocos2dx_gui_auto_api.js",
"cocos/scripting/auto-generated/js-bindings/jsb_cocos2dx_spine_auto.cpp",
"cocos/scripting/auto-generated/js-bindings/jsb_cocos2dx_spine_auto.hpp",
"cocos/scripting/auto-generated/js-bindings/jsb_cocos2dx_spine_auto_api.js",
"cocos/scripting/auto-generated/js-bindings/jsb_cocos2dx_studio_auto.cpp",
"cocos/scripting/auto-generated/js-bindings/jsb_cocos2dx_studio_auto.hpp",
"cocos/scripting/auto-generated/js-bindings/jsb_cocos2dx_studio_auto_api.js",
"cocos/scripting/auto-generated/lua-bindings/lua_cocos2dx_auto.cpp",
"cocos/scripting/auto-generated/lua-bindings/lua_cocos2dx_auto.hpp",
"cocos/scripting/auto-generated/lua-bindings/lua_cocos2dx_auto_api.js",
"cocos/scripting/auto-generated/lua-bindings/lua_cocos2dx_extension_auto.cpp",
"cocos/scripting/auto-generated/lua-bindings/lua_cocos2dx_extension_auto.hpp",
"cocos/scripting/auto-generated/lua-bindings/lua_cocos2dx_extension_auto_api.js",
"cocos/scripting/auto-generated/lua-bindings/lua_cocos2dx_gui_auto.cpp",
"cocos/scripting/auto-generated/lua-bindings/lua_cocos2dx_gui_auto.hpp",
"cocos/scripting/auto-generated/lua-bindings/lua_cocos2dx_gui_auto_api.js",
"cocos/scripting/auto-generated/lua-bindings/lua_cocos2dx_physics_auto.cpp",
"cocos/scripting/auto-generated/lua-bindings/lua_cocos2dx_physics_auto.hpp",
"cocos/scripting/auto-generated/lua-bindings/lua_cocos2dx_physics_auto_api.js",
"cocos/scripting/auto-generated/lua-bindings/lua_cocos2dx_spine_auto.cpp",
"cocos/scripting/auto-generated/lua-bindings/lua_cocos2dx_spine_auto.hpp",
"cocos/scripting/auto-generated/lua-bindings/lua_cocos2dx_spine_auto_api.js",
"cocos/scripting/auto-generated/lua-bindings/lua_cocos2dx_studio_auto.cpp",
"cocos/scripting/auto-generated/lua-bindings/lua_cocos2dx_studio_auto.hpp",
"cocos/scripting/auto-generated/lua-bindings/lua_cocos2dx_studio_auto_api.js",
"cocos/storage/local-storage/Android.mk",
"cocos/storage/local-storage/LocalStorage-android.cpp",
"cocos/storage/local-storage/LocalStorage.cpp",
@ -1321,6 +1358,7 @@
"external/curl/prebuilt/android/armeabi/libcurl.a",
"external/curl/prebuilt/android/x86/libcurl.a",
"external/curl/prebuilt/ios/libcurl.a",
"external/curl/prebuilt/ios/libcurl_arm64.a",
"external/curl/prebuilt/win32/libcurl.dll",
"external/curl/prebuilt/win32/libcurl_imp.lib",
"external/curl/prebuilt/wp8/arm/libcurl.dll",
@ -1920,6 +1958,7 @@
"external/freetype2/prebuilt/android/armeabi/libfreetype.a",
"external/freetype2/prebuilt/android/x86/libfreetype.a",
"external/freetype2/prebuilt/ios/libfreetype.a",
"external/freetype2/prebuilt/ios/libfreetype_arm64.a",
"external/freetype2/prebuilt/linux/32-bit/libfreetype.a",
"external/freetype2/prebuilt/linux/64-bit/libfreetype.a",
"external/freetype2/prebuilt/mac/libfreetype.a",
@ -1975,6 +2014,7 @@
"external/jpeg/prebuilt/android/armeabi/libjpeg.a",
"external/jpeg/prebuilt/android/x86/libjpeg.a",
"external/jpeg/prebuilt/ios/libjpeg.a",
"external/jpeg/prebuilt/ios/libjpeg_arm64.a",
"external/jpeg/prebuilt/linux/32-bit/libjpeg.a",
"external/jpeg/prebuilt/linux/64-bit/libjpeg.a",
"external/jpeg/prebuilt/mac/libjpeg.a",
@ -2045,6 +2085,7 @@
"external/png/prebuilt/android/armeabi/libpng.a",
"external/png/prebuilt/android/x86/libpng.a",
"external/png/prebuilt/ios/libpng.a",
"external/png/prebuilt/ios/libpng_arm64.a",
"external/png/prebuilt/mac/libpng.a",
"external/png/prebuilt/win32/libpng.lib",
"external/png/prebuilt/winrt/ARM/libpng.lib",
@ -2098,6 +2139,7 @@
"external/tiff/prebuilt/android/armeabi/libtiff.a",
"external/tiff/prebuilt/android/x86/libtiff.a",
"external/tiff/prebuilt/ios/libtiff.a",
"external/tiff/prebuilt/ios/libtiff_arm64.a",
"external/tiff/prebuilt/linux/32-bit/libtiff.a",
"external/tiff/prebuilt/linux/64-bit/libtiff.a",
"external/tiff/prebuilt/mac/libtiff.a",
@ -2137,6 +2179,7 @@
"external/webp/prebuilt/android/armeabi/libwebp.a",
"external/webp/prebuilt/android/x86/libwebp.a",
"external/webp/prebuilt/ios/libwebp.a",
"external/webp/prebuilt/ios/libwebp_arm64.a",
"external/webp/prebuilt/linux/32-bit/libwebp.a",
"external/webp/prebuilt/linux/64-bit/libwebp.a",
"external/webp/prebuilt/mac/libwebp.a",
@ -2166,6 +2209,7 @@
"external/websockets/prebuilt/android/armeabi/libwebsockets.a",
"external/websockets/prebuilt/android/x86/libwebsockets.a",
"external/websockets/prebuilt/ios/libwebsockets.a",
"external/websockets/prebuilt/ios/libwebsockets_arm64.a",
"external/websockets/prebuilt/linux/32-bit/libwebsockets.a",
"external/websockets/prebuilt/linux/64-bit/libwebsockets.a",
"external/websockets/prebuilt/mac/libwebsockets.a",
@ -2196,17 +2240,24 @@
"external/winrt-specific/angle/include/GLES2/gl2platform.h",
"external/winrt-specific/angle/include/GLSLANG/ShaderLang.h",
"external/winrt-specific/angle/include/KHR/khrplatform.h",
"external/winrt-specific/angle/include/angleutils.h",
"external/winrt-specific/angle/include/esUtil.h",
"external/winrt-specific/angle/include/winrtangle.h",
"external/winrt-specific/angle/include/winrtangleutils.h",
"external/winrt-specific/angle/include/winrtplatform.h",
"external/winrt-specific/angle/prebuilt/ARM/esUtil.lib",
"external/winrt-specific/angle/prebuilt/ARM/libEGL.dll",
"external/winrt-specific/angle/prebuilt/ARM/libEGL.exp",
"external/winrt-specific/angle/prebuilt/ARM/libEGL.lib",
"external/winrt-specific/angle/prebuilt/ARM/libGLESv2.dll",
"external/winrt-specific/angle/prebuilt/ARM/libGLESv2.exp",
"external/winrt-specific/angle/prebuilt/ARM/libGLESv2.lib",
"external/winrt-specific/angle/prebuilt/Win32/esUtil.lib",
"external/winrt-specific/angle/prebuilt/Win32/libEGL.dll",
"external/winrt-specific/angle/prebuilt/Win32/libEGL.exp",
"external/winrt-specific/angle/prebuilt/Win32/libEGL.lib",
"external/winrt-specific/angle/prebuilt/Win32/libGLESv2.dll",
"external/winrt-specific/angle/prebuilt/Win32/libGLESv2.exp",
"external/winrt-specific/angle/prebuilt/Win32/libGLESv2.lib",
"external/winrt-specific/zlib/include/README.txt",
"external/winrt-specific/zlib/include/zconf.h",
@ -2215,15 +2266,27 @@
"external/winrt-specific/zlib/include/zlib.vcxproj.filters",
"external/winrt-specific/zlib/prebuilt/ARM/zlib.lib",
"external/winrt-specific/zlib/prebuilt/Win32/zlib.lib",
"external/wp8-specific/angle/include/EGL/egl.h",
"external/wp8-specific/angle/include/EGL/eglext.h",
"external/wp8-specific/angle/include/EGL/eglplatform.h",
"external/wp8-specific/angle/include/GLES2/gl2.h",
"external/wp8-specific/angle/include/GLES2/gl2ext.h",
"external/wp8-specific/angle/include/GLES2/gl2platform.h",
"external/wp8-specific/angle/include/GLSLANG/ShaderLang.h",
"external/wp8-specific/angle/include/KHR/khrplatform.h",
"external/wp8-specific/angle/prebuilt/ARM/esUtil_phone.lib",
"external/wp8-specific/angle/prebuilt/ARM/libEGL_phone.dll",
"external/wp8-specific/angle/prebuilt/ARM/libEGL_phone.exp",
"external/wp8-specific/angle/prebuilt/ARM/libEGL_phone.lib",
"external/wp8-specific/angle/prebuilt/ARM/libGLESv2_phone.dll",
"external/wp8-specific/angle/prebuilt/ARM/libGLESv2_phone.exp",
"external/wp8-specific/angle/prebuilt/ARM/libGLESv2_phone.lib",
"external/wp8-specific/angle/prebuilt/Win32/esUtil_phone.lib",
"external/wp8-specific/angle/prebuilt/Win32/libEGL_phone.dll",
"external/wp8-specific/angle/prebuilt/Win32/libEGL_phone.exp",
"external/wp8-specific/angle/prebuilt/Win32/libEGL_phone.lib",
"external/wp8-specific/angle/prebuilt/Win32/libGLESv2_phone.dll",
"external/wp8-specific/angle/prebuilt/Win32/libGLESv2_phone.exp",
"external/wp8-specific/angle/prebuilt/Win32/libGLESv2_phone.lib",
"external/wp8-specific/zlib/include/README.txt",
"external/wp8-specific/zlib/include/zconf.h",

6
templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp
View File

@ -44,11 +44,11 @@ bool AppDelegate::applicationDidFinishLaunching()
Size viewSize = ConfigParser::getInstance()->getInitViewSize();
string title = ConfigParser::getInstance()->getInitViewName();
#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 || CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
extern void createSimulator(const char* viewName, float width, float height,bool isLandscape = true, float frameZoomFactor = 1.0f);
extern void createSimulator(const char* viewName, float width, float height, bool isLandscape = true, float frameZoomFactor = 1.0f);
bool isLanscape = ConfigParser::getInstance()->isLanscape();
createSimulator(title.c_str(),viewSize.width,viewSize.height,isLanscape);
createSimulator(title.c_str(),viewSize.width,viewSize.height, isLanscape);
#else
glview = cocos2d::GLViewImpl::createWithRect(title.c_str(), Rect(0,0,viewSize.width,viewSize.height));
glview = cocos2d::GLViewImpl::createWithRect(title.c_str(), Rect(0, 0, viewSize.width, viewSize.height));
director->setOpenGLView(glview);
#endif
}

4
templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.mm
View File

@ -92,7 +92,7 @@ std::string getCurAppName(void)
AppDelegate app;
Application::getInstance()->run();
// After run, application needs to be terminated immediately.
[NSApp terminate: self];
[[NSApplication sharedApplication] terminate: self];
}
@ -118,7 +118,7 @@ std::string getCurAppName(void)
director->setOpenGLView(g_eglView);
window = glfwGetCocoaWindow(g_eglView->getWindow());
[NSApp setDelegate: self];
[[NSApplication sharedApplication] setDelegate: self];
[self createViewMenu];
[self updateMenu];