mirror of https://github.com/axmolengine/axmol.git
issue #2905: jsbinding samples and lua binding samples build ok on android
This commit is contained in:
parent
8f9756f030
commit
e50f9fc43b
|
@ -202,7 +202,9 @@ LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dxandroid_static
|
|||
|
||||
# define the macro to compile through support/zip_support/ioapi.c
|
||||
LOCAL_CFLAGS := -Wno-psabi -DUSE_FILE32API
|
||||
LOCAL_CPPFLAGS := -Wno-literal-suffix
|
||||
LOCAL_EXPORT_CFLAGS := -Wno-psabi -DUSE_FILE32API
|
||||
LOCAL_EXPORT_CPPFLAGS := -Wno-literal-suffix
|
||||
|
||||
include $(BUILD_STATIC_LIBRARY)
|
||||
|
||||
|
|
|
@ -29,7 +29,7 @@ CCScale9SpriteLoader.cpp \
|
|||
CCScrollViewLoader.cpp \
|
||||
CCSpriteLoader.cpp
|
||||
|
||||
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/ \
|
||||
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.. \
|
||||
$(LOCAL_PATH)/../../..
|
||||
|
||||
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../2d \
|
||||
|
|
|
@ -56,9 +56,11 @@ LOCAL_EXPORT_CFLAGS += -Wno-psabi
|
|||
|
||||
LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static
|
||||
LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static
|
||||
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_gui_static
|
||||
|
||||
include $(BUILD_STATIC_LIBRARY)
|
||||
|
||||
$(call import-module,2d)
|
||||
$(call import-module,audio/android)
|
||||
$(call import-module,gui)
|
||||
|
||||
|
|
|
@ -52,7 +52,6 @@ LOCAL_WHOLE_STATIC_LIBRARIES += chipmunk_static
|
|||
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_localstorage_static
|
||||
LOCAL_WHOLE_STATIC_LIBRARIES += cocostudio_static
|
||||
LOCAL_WHOLE_STATIC_LIBRARIES += websockets_static
|
||||
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_gui_static
|
||||
|
||||
LOCAL_LDLIBS := -landroid
|
||||
LOCAL_LDLIBS += -llog
|
||||
|
@ -70,4 +69,3 @@ $(call import-module,chipmunk)
|
|||
$(call import-module,storage/local-storage)
|
||||
$(call import-module,editor-support/cocostudio)
|
||||
$(call import-module,websockets/prebuilt/android)
|
||||
$(call import-module,gui)
|
||||
|
|
|
@ -5,61 +5,59 @@ LOCAL_MODULE := cocos_lua_static
|
|||
|
||||
LOCAL_MODULE_FILENAME := liblua
|
||||
|
||||
LOCAL_SRC_FILES := ../cocos2dx_support/CCLuaBridge.cpp \
|
||||
../cocos2dx_support/CCLuaEngine.cpp \
|
||||
../cocos2dx_support/CCLuaStack.cpp \
|
||||
../cocos2dx_support/CCLuaValue.cpp \
|
||||
../cocos2dx_support/Cocos2dxLuaLoader.cpp \
|
||||
../cocos2dx_support/CCBProxy.cpp \
|
||||
../cocos2dx_support/Lua_web_socket.cpp \
|
||||
../cocos2dx_support/LuaOpengl.cpp \
|
||||
../cocos2dx_support/LuaScriptHandlerMgr.cpp \
|
||||
../cocos2dx_support/LuaBasicConversions.cpp \
|
||||
LOCAL_SRC_FILES := CCLuaBridge.cpp \
|
||||
CCLuaEngine.cpp \
|
||||
CCLuaStack.cpp \
|
||||
CCLuaValue.cpp \
|
||||
Cocos2dxLuaLoader.cpp \
|
||||
CCBProxy.cpp \
|
||||
Lua_web_socket.cpp \
|
||||
LuaOpengl.cpp \
|
||||
LuaScriptHandlerMgr.cpp \
|
||||
LuaBasicConversions.cpp \
|
||||
../../auto-generated/lua-bindings/lua_cocos2dx_auto.cpp \
|
||||
../../auto-generated/lua-bindings/lua_cocos2dx_extension_auto.cpp \
|
||||
../cocos2dx_support/lua_cocos2dx_manual.cpp \
|
||||
../cocos2dx_support/lua_cocos2dx_extension_manual.cpp \
|
||||
../cocos2dx_support/lua_cocos2dx_deprecated.cpp \
|
||||
../cocos2dx_support/platform/android/CCLuaJavaBridge.cpp \
|
||||
../cocos2dx_support/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp \
|
||||
../tolua/tolua_event.c \
|
||||
../tolua/tolua_is.c \
|
||||
../tolua/tolua_map.c \
|
||||
../tolua/tolua_push.c \
|
||||
../tolua/tolua_to.c \
|
||||
../cocos2dx_support/tolua_fix.c
|
||||
lua_cocos2dx_manual.cpp \
|
||||
lua_cocos2dx_extension_manual.cpp \
|
||||
lua_cocos2dx_deprecated.cpp \
|
||||
platform/android/CCLuaJavaBridge.cpp \
|
||||
platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp \
|
||||
../../../../external/lua/tolua/tolua_event.c \
|
||||
../../../../external/lua/tolua/tolua_is.c \
|
||||
../../../../external/lua/tolua/tolua_map.c \
|
||||
../../../../external/lua/tolua/tolua_push.c \
|
||||
../../../../external/lua/tolua/tolua_to.c \
|
||||
tolua_fix.c
|
||||
|
||||
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../luajit/include \
|
||||
$(LOCAL_PATH)/../tolua \
|
||||
$(LOCAL_PATH)/../cocos2dx_support \
|
||||
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../../external/lua/tolua \
|
||||
$(LOCAL_PATH)/../../auto-generated/lua-bindings \
|
||||
$(LOCAL_PATH)/../cocos2dx_support/platform/android \
|
||||
$(LOCAL_PATH)/../cocos2dx_support/platform/android/jni
|
||||
$(LOCAL_PATH)/platform/android \
|
||||
$(LOCAL_PATH)/platform/android/jni \
|
||||
$(LOCAL_PATH)/../../../../extensions \
|
||||
$(LOCAL_PATH)/../../../editor-support/cocosbuilder \
|
||||
$(LOCAL_PATH)/../../../editor-support/cocostudio
|
||||
|
||||
|
||||
LOCAL_C_INCLUDES := $(LOCAL_PATH)/ \
|
||||
$(LOCAL_PATH)/../luajit/include \
|
||||
$(LOCAL_PATH)/../tolua \
|
||||
$(LOCAL_PATH)/../../../cocos2dx \
|
||||
$(LOCAL_PATH)/../../../cocos2dx/include \
|
||||
$(LOCAL_PATH)/../../../cocos2dx/platform \
|
||||
$(LOCAL_PATH)/../../../cocos2dx/platform/android \
|
||||
$(LOCAL_PATH)/../../../cocos2dx/kazmath/include \
|
||||
$(LOCAL_PATH)/../../../CocosDenshion/include \
|
||||
$(LOCAL_PATH)/../../../extensions \
|
||||
$(LOCAL_PATH)/../cocos2dx_support \
|
||||
$(LOCAL_PATH)/../../auto-generated/lua-bindings \
|
||||
$(LOCAL_PATH)/../cocos2dx_support/platform/android \
|
||||
$(LOCAL_PATH)/../cocos2dx_support/platform/android/jni
|
||||
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
|
||||
|
||||
|
||||
LOCAL_WHOLE_STATIC_LIBRARIES := luajit_static
|
||||
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_extension_static
|
||||
LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dx_static
|
||||
LOCAL_WHOLE_STATIC_LIBRARIES += websockets_static
|
||||
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_network_static
|
||||
LOCAL_WHOLE_STATIC_LIBRARIES += cocosbuilder_static
|
||||
LOCAL_WHOLE_STATIC_LIBRARIES += cocostudio_static
|
||||
|
||||
LOCAL_CFLAGS += -Wno-psabi
|
||||
LOCAL_EXPORT_CFLAGS += -Wno-psabi
|
||||
|
||||
include $(BUILD_STATIC_LIBRARY)
|
||||
|
||||
$(call import-module,scripting/lua/luajit)
|
||||
$(call import-module,lua/luajit/prebuilt/android)
|
||||
$(call import-module,extensions)
|
||||
$(call import-module,2d)
|
||||
$(call import-module,websockets/prebuilt/android)
|
||||
$(call import-module,network)
|
||||
$(call import-module,editor-support/cocostudio)
|
||||
$(call import-module,editor-support/cocosbuilder)
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
#include "cocos2d.h"
|
||||
#include "CCLuaEngine.h"
|
||||
#include "SimpleAudioEngine.h"
|
||||
#include "cocos-ext.h"
|
||||
#include "extensions/cocos-ext.h"
|
||||
#include "cocosbuilder/CocosBuilder.h"
|
||||
|
||||
USING_NS_CC;
|
||||
|
|
|
@ -1 +1 @@
|
|||
a57fbb5f0f9564858ced00cf47af905e6a7900c6
|
||||
4456a3ba6fbd68175b40e607c6bc19bdfc378ce1
|
|
@ -10,7 +10,7 @@ extern "C" {
|
|||
#include <string>
|
||||
#include "LuaScriptHandlerMgr.h"
|
||||
#include "cocos2d.h"
|
||||
#include "cocos-ext.h"
|
||||
#include "extensions/cocos-ext.h"
|
||||
#include "CCLuaStack.h"
|
||||
#include "CCLuaValue.h"
|
||||
#include "CCLuaEngine.h"
|
||||
|
|
Binary file not shown.
|
@ -3,6 +3,6 @@ LOCAL_PATH := $(call my-dir)
|
|||
include $(CLEAR_VARS)
|
||||
LOCAL_MODULE := luajit_static
|
||||
LOCAL_MODULE_FILENAME := libluajit
|
||||
LOCAL_SRC_FILES := ./android/$(TARGET_ARCH_ABI)/libluajit.a
|
||||
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
|
||||
LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libluajit.a
|
||||
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include
|
||||
include $(PREBUILT_STATIC_LIBRARY)
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue