From 39b03de8a91fe494123a6a6f8ff814eceda632d7 Mon Sep 17 00:00:00 2001 From: chuanweizhang2013 Date: Fri, 4 Jul 2014 15:38:55 +0800 Subject: [PATCH] revert Android.mk --- .../proj.win32/libCocosStudio.vcxproj | 2 +- .../runtime-src/Classes/runtime/Runtime.cpp | 19 +++---------------- .../runtime-src/proj.android/jni/Android.mk | 19 +++++++++++++++---- 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj b/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj index e7f9ef66f0..684f848d8d 100644 --- a/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj +++ b/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj @@ -208,7 +208,7 @@ WIN32;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) + $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(EngineRoot)external\win32-specific\zlib\include;%(AdditionalIncludeDirectories) None false diff --git a/templates/lua-template-runtime/frameworks/runtime-src/Classes/runtime/Runtime.cpp b/templates/lua-template-runtime/frameworks/runtime-src/Classes/runtime/Runtime.cpp index b3893f5ae4..1dddcd2832 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/Classes/runtime/Runtime.cpp +++ b/templates/lua-template-runtime/frameworks/runtime-src/Classes/runtime/Runtime.cpp @@ -627,10 +627,6 @@ public: #include "ResData.h" int designWidth = 1280; int designHeight = 800; - string fontName = "Arial"; - if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID){ - fontName = "DroidSans"; - } Director::getInstance()->getOpenGLView()->setDesignResolutionSize(designWidth,designHeight,ResolutionPolicy::EXACT_FIT); Image* imagebg = new Image(); imagebg->initWithImageData(__landscapePngData, sizeof(__landscapePngData)); @@ -677,10 +673,7 @@ public: string strip = getIPAddress(); char szIPAddress[512]={0}; sprintf(szIPAddress, "IP: %s",strip.c_str()); - auto IPlabel = Label::create(); - IPlabel->setString(szIPAddress); - IPlabel->setSystemFontName(fontName.c_str()); - IPlabel->setSystemFontSize(72); + auto IPlabel = Label::createWithSystemFont(szIPAddress,"",72); IPlabel->setAnchorPoint(Vec2(0,0)); int spaceSizex = 72; int spaceSizey = 200; @@ -694,20 +687,14 @@ public: char szVersion[1024]={0}; sprintf(szVersion,"runtimeVersion:%s \ncocos2dVersion:%s",getRuntimeVersion(),cocos2dVersion()); - Label* verLable = Label::create(); - verLable->setString(szVersion); - verLable->setSystemFontName(fontName.c_str()); - verLable->setSystemFontSize(24); + Label* verLable = Label::createWithSystemFont(szVersion,"",24); verLable->setAnchorPoint(Vec2(0,0)); int width = verLable->getBoundingBox().size.width; int height = verLable->getBoundingBox().size.height; verLable->setPosition( Point(VisibleRect::right().x-width, VisibleRect::rightBottom().y) ); verLable->setAlignment(TextHAlignment::LEFT); addChild(verLable, 9002); - _labelUploadFile = Label::create(); - _labelUploadFile->setString(_transferTip); - _labelUploadFile->setSystemFontName(fontName.c_str()); - _labelUploadFile->setSystemFontSize(36); + _labelUploadFile = Label::createWithSystemFont(_transferTip,"",36); _labelUploadFile->setAnchorPoint(Vec2(0,0)); _labelUploadFile->setPosition( Point(VisibleRect::leftTop().x+spaceSizex, IPlabel->getPositionY()-spaceSizex) ); _labelUploadFile->setAlignment(TextHAlignment::LEFT); diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/jni/Android.mk b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/jni/Android.mk index 1c5046dc1f..d4ea0d1d11 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/jni/Android.mk +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/jni/Android.mk @@ -7,6 +7,17 @@ LOCAL_MODULE := cocos2dlua_shared LOCAL_MODULE_FILENAME := libcocos2dlua LOCAL_SRC_FILES := \ +../../Classes/protobuf-lite/google/protobuf/io/coded_stream.cc \ +../../Classes/protobuf-lite/google/protobuf/stubs/common.cc \ +../../Classes/protobuf-lite/google/protobuf/extension_set.cc \ +../../Classes/protobuf-lite/google/protobuf/generated_message_util.cc \ +../../Classes/protobuf-lite/google/protobuf/message_lite.cc \ +../../Classes/protobuf-lite/google/protobuf/stubs/once.cc \ +../../Classes/protobuf-lite/google/protobuf/repeated_field.cc \ +../../Classes/protobuf-lite/google/protobuf/wire_format_lite.cc \ +../../Classes/protobuf-lite/google/protobuf/io/zero_copy_stream.cc \ +../../Classes/protobuf-lite/google/protobuf/io/zero_copy_stream_impl_lite.cc \ +../../Classes/protobuf-lite/google/protobuf/stubs/stringprintf.cc \ ../../Classes/runtime/Landscape_png.cpp \ ../../Classes/runtime/PlayDisable_png.cpp \ ../../Classes/runtime/PlayEnable_png.cpp \ @@ -22,15 +33,15 @@ lua/main.cpp LOCAL_C_INCLUDES := \ -$(LOCAL_PATH)/../../Classes \ -$(LOCAL_PATH)/../../Classes/runtime +$(LOCAL_PATH)/../../Classes/protobuf-lite \ +$(LOCAL_PATH)/../../Classes/runtime \ +$(LOCAL_PATH)/../../Classes LOCAL_STATIC_LIBRARIES := curl_static_prebuilt LOCAL_WHOLE_STATIC_LIBRARIES := cocos_lua_static -LOCAL_WHOLE_STATIC_LIBRARIES += protobuf-lite_static include $(BUILD_SHARED_LIBRARY) $(call import-module,scripting/lua-bindings) -$(call import-module,protobuf-lite/prebuilt/android) +