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

Modifying cocos2d_lib.xcodeproj, cocos/Android.mk, cocos/editor-support/cocostudio/Android.mk

This commit is contained in:
pipu 2014-10-12 15:39:22 +08:00
parent 779e73dad0
commit 86aee1e548
4 changed files with 297 additions and 250 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

527
build/cocos2d_libs.xcodeproj/project.pbxproj
View File

File diff suppressed because it is too large Load Diff

1
cocos/Android.mk
View File

@ -270,6 +270,5 @@ $(call import-module,extensions)
$(call import-module,Box2D) $(call import-module,Box2D)
$(call import-module,curl/prebuilt/android) $(call import-module,curl/prebuilt/android)
$(call import-module,websockets/prebuilt/android) $(call import-module,websockets/prebuilt/android)
$(call import-module,protocolBuf/prebuilt/android)

17
cocos/editor-support/cocostudio/Android.mk
View File

@ -61,24 +61,35 @@ ActionTimeline/CCTimeLine.cpp \
ActionTimeline/CCActionTimeline.cpp \ ActionTimeline/CCActionTimeline.cpp \
ActionTimeline/CSLoader.cpp \ ActionTimeline/CSLoader.cpp \
CSParseBinary.pb.cc \ CSParseBinary.pb.cc \
../../../external/protocolBuf/src/google/protobuf/extension_set.cc \
../../../external/protocolBuf/src/google/protobuf/generated_message_util.cc \
../../../external/protocolBuf/src/google/protobuf/message_lite.cc \
../../../external/protocolBuf/src/google/protobuf/repeated_field.cc \
../../../external/protocolBuf/src/google/protobuf/wire_format_lite.cc \
../../../external/protocolBuf/src/google/protobuf/io/coded_stream.cc \
../../../external/protocolBuf/src/google/protobuf/io/zero_copy_stream.cc \
../../../external/protocolBuf/src/google/protobuf/io/zero_copy_stream_impl.cc \
../../../external/protocolBuf/src/google/protobuf/io/zero_copy_stream_impl_lite.cc \
../../../external/protocolBuf/src/google/protobuf/stubs/common.cc \
../../../external/protocolBuf/src/google/protobuf/stubs/once.cc \
../../../external/protocolBuf/src/google/protobuf/stubs/stringprintf.cc \
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.. \ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.. \
$(LOCAL_PATH)/../../../external $(LOCAL_PATH)/../../../external
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../.. \ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../.. \
$(LOCAL_PATH)/../../../external \ $(LOCAL_PATH)/../../../external \
$(LOCAL_PATH)/../../../external/protocolBuf/src/google/protobuf \
$(LOCAL_PATH)/../../../external/protocolBuf/src \
$(LOCAL_PATH)/.. \ $(LOCAL_PATH)/.. \
$(LOCAL_PATH)/../.. \ $(LOCAL_PATH)/../.. \
$(LOCAL_PATH)/WidgetReader \ $(LOCAL_PATH)/WidgetReader \
$(LOCAL_PATH)/../../platform/android \ $(LOCAL_PATH)/../../platform/android \
$(LOCAL_PATH)/../../../external/tinyxml2 \ $(LOCAL_PATH)/../../../external/tinyxml2 \
$(LOCAL_PATH)/../../../external/protocolBuf/include \
$(LOCAL_PATH)/../../../external/protocolBuf/include/google/protobuf \
LOCAL_CFLAGS += -fexceptions LOCAL_CFLAGS += -fexceptions
LOCAL_STATIC_LIBRARIES := cocos_ui_static LOCAL_STATIC_LIBRARIES := cocos_ui_static
LOCAL_STATIC_LIBRARIES += cocos_protocolBuffer_static
LOCAL_STATIC_LIBRARIES += cocosdenshion_static LOCAL_STATIC_LIBRARIES += cocosdenshion_static
LOCAL_STATIC_LIBRARIES += cocos_extension_static LOCAL_STATIC_LIBRARIES += cocos_extension_static
LOCAL_STATIC_LIBRARIES += cocos2dx_internal_static LOCAL_STATIC_LIBRARIES += cocos2dx_internal_static

2
tests/cpp-tests/Resources/ccs-res

@ -1 +1 @@
Subproject commit c307f62357e42d2e7e671f4741f855dc8a5fde3a Subproject commit 72970e16227dd624de4f9dd11395d4e510646441