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

issue #838: HelloWorld support x86

This commit is contained in:
minggo 2011-11-23 11:02:18 +08:00
parent d62d8aee55
commit 8b20639d75
26 changed files with 39 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
HelloWorld/Classes/Android.mk Normal file
View File

@ -0,0 +1,18 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := game_logic
LOCAL_SRC_FILES := AppDelegate.cpp \
HelloWorldScene.cpp
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../cocos2dx \
$(LOCAL_PATH)/../../cocos2dx/platform \
$(LOCAL_PATH)/../../cocos2dx/include \
$(LOCAL_PATH)/../../CocosDenshion/include \
$(LOCAL_PATH)/../../cocos2dx/lua_support
LOCAL_LDLIBS := -L$(call host-path, $(LOCAL_PATH)/../android/libs/$(TARGET_ARCH_ABI)) \
-lcocos2d -lcocosdenshion \
-L$(call host-path, $(LOCAL_PATH)/../../cocos2dx/platform/third_party/android/libraries/$(TARGET_ARCH_ABI)) -lcurl
include $(BUILD_SHARED_LIBRARY)

17
HelloWorld/android/build.properties
View File

@ -1,17 +0,0 @@
# This file is used to override default values used by the Ant build system.
#
# This file must be checked in 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.

79
HelloWorld/android/build.xml
View File

@ -1,79 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="HelloWorld" default="help">
<!-- The local.properties file is created and updated by the 'android'
tool.
It contains the path to the SDK. It should *NOT* be checked into
Version Control Systems. -->
<property file="local.properties" />
<!-- The build.properties file can be created by you and is never touched
by the 'android' tool. This is the place to change some of the
default property values used by the Ant rules.
Here are some properties you may want to change/update:
source.dir
The name of the source directory. Default is 'src'.
out.dir
The name of the output directory. Default is 'bin'.
Properties related to the SDK location or the project target should
be updated using the 'android' tool with the 'update' action.
This file is an integral part of the build system for your
application and should be checked into Version Control Systems.
-->
<property file="build.properties" />
<!-- The default.properties file is created and updated by the 'android'
tool, as well as ADT.
This file is an integral part of the build system for your
application and should be checked into Version Control Systems. -->
<property file="default.properties" />
<!-- Required pre-setup import -->
<import file="${sdk.dir}/tools/ant/pre_setup.xml" />
<!-- extension targets. Uncomment the ones where you want to do custom work
in between standard targets -->
<!--
<target name="-pre-build">
</target>
<target name="-pre-compile">
</target>
[This is typically used for code obfuscation.
Compiled code location: ${out.classes.absolute.dir}
If this is not done in place, override ${out.dex.input.absolute.dir}]
<target name="-post-compile">
</target>
-->
<!-- Execute the Android Setup task that will setup some properties
specific to the target, and import the build rules files.
The rules file is imported from
<SDK>/tools/ant/
Depending on the project type it can be either:
- main_rules.xml
- lib_rules.xml
- test_rules.xml
To customize existing targets, there are two options:
- Customize only one target:
- copy/paste the target into this file, *before* the
<setup> task.
- customize it to your needs.
- Customize the whole script.
- copy/paste the content of the rules files (minus the top node)
into this file, *after* the <setup> task
- disable the import of the rules by changing the setup task
below to <setup import="false" />.
- customize to your needs.
-->
<setup />
</project>

2
HelloWorld/android/build_native.sh
View File

@ -1,5 +1,5 @@
# set params
ANDROID_NDK_ROOT=/cygdrive/d/programe/android/ndk/android-ndk-r6
ANDROID_NDK_ROOT=/cygdrive/d/programe/android/ndk/android-ndk-r6b
COCOS2DX_ROOT=/cygdrive/e/cocos2d-x
HELLOWORLD_ROOT=$COCOS2DX_ROOT/HelloWorld/android

2
HelloWorld/android/jni/Android.mk
View File

@ -5,6 +5,6 @@ subdirs := $(addprefix $(LOCAL_PATH)/../../../,$(addsuffix /Android.mk, \
cocos2dx \
CocosDenshion/android \
))
subdirs += $(LOCAL_PATH)/helloworld/Android.mk
subdirs += $(LOCAL_PATH)/../../Classes/Android.mk $(LOCAL_PATH)/helloworld/Android.mk
include $(subdirs)

4
HelloWorld/android/jni/Application.mk
View File

@ -1,4 +1,6 @@
# it is needed for ndk-r5
APP_STL := stlport_static
APP_MODULES := cocos2d cocosdenshion helloworld
APP_ABI := armeabi armeabi-v7a
APP_MODULES := cocos2d cocosdenshion game_logic helloworld

15
HelloWorld/android/jni/helloworld/Android.mk
View File

@ -2,23 +2,14 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := helloworld
LOCAL_SRC_FILES := main.cpp \
../../../Classes/AppDelegate.cpp \
../../../Classes/HelloWorldScene.cpp
LOCAL_SRC_FILES := main.cpp
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../../cocos2dx \
$(LOCAL_PATH)/../../../../cocos2dx/platform \
$(LOCAL_PATH)/../../../../cocos2dx/include \
$(LOCAL_PATH)/../../../../cocos2dx/lua_support \
$(LOCAL_PATH)/../../../../CocosDenshion/include \
$(LOCAL_PATH)/../../../Classes
# it is used for ndk-r5
# if you build with ndk-r4, comment it
# because the new Windows toolchain doesn't support Cygwin's drive
# mapping (i.e /cygdrive/c/ instead of C:/)
LOCAL_LDLIBS := -L$(call host-path, $(LOCAL_PATH)/../../libs/armeabi) \
-lcocos2d -llog -lcocosdenshion \
-L$(call host-path, $(LOCAL_PATH)/../../../../cocos2dx/platform/third_party/android/libraries) -lcurl
LOCAL_LDLIBS := -L$(call host-path, $(LOCAL_PATH)/../../libs/$(TARGET_ARCH_ABI)) \
-lcocos2d -llog -lgame_logic
include $(BUILD_SHARED_LIBRARY)

10
HelloWorld/android/local.properties
View File

@ -1,10 +0,0 @@
# This file is automatically generated by Android Tools.
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
#
# This file must *NOT* be checked in Version Control Systems,
# as it contains information specific to your local configuration.
# location of the SDK. This is only used by Ant
# For customization when using a Version Control System, please read the
# header note.
sdk.dir=/home/laschweinski/android/android-sdk-linux_86

40
HelloWorld/android/proguard.cfg
View File

@ -1,40 +0,0 @@
-optimizationpasses 5
-dontusemixedcaseclassnames
-dontskipnonpubliclibraryclasses
-dontpreverify
-verbose
-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
-keep public class * extends android.app.Activity
-keep public class * extends android.app.Application
-keep public class * extends android.app.Service
-keep public class * extends android.content.BroadcastReceiver
-keep public class * extends android.content.ContentProvider
-keep public class * extends android.app.backup.BackupAgentHelper
-keep public class * extends android.preference.Preference
-keep public class com.android.vending.licensing.ILicensingService
-keepclasseswithmembernames class * {
native <methods>;
}
-keepclasseswithmembers class * {
public <init>(android.content.Context, android.util.AttributeSet);
}
-keepclasseswithmembers class * {
public <init>(android.content.Context, android.util.AttributeSet, int);
}
-keepclassmembers class * extends android.app.Activity {
public void *(android.view.View);
}
-keepclassmembers enum * {
public static **[] values();
public static ** valueOf(java.lang.String);
}
-keep class * implements android.os.Parcelable {
public static final android.os.Parcelable$Creator *;
}

1
HelloWorld/android/src/org/cocos2dx/application/ApplicationDemo.java
View File

@ -58,6 +58,7 @@ public class ApplicationDemo extends Cocos2dxActivity{
static {
System.loadLibrary("cocos2d");
System.loadLibrary("cocosdenshion");
System.loadLibrary("game_logic");
System.loadLibrary("helloworld");
}
}

8
cocos2dx/Android.mk
View File

@ -104,8 +104,6 @@ tileMap_parallax_nodes/CCTileMapAtlas.cpp \
touch_dispatcher/CCTouchDispatcher.cpp \
touch_dispatcher/CCTouchHandler.cpp
LOCAL_C_INCLUDES := $(LOCAL_PATH)/ \
$(LOCAL_PATH)/include \
$(LOCAL_PATH)/platform \
@ -114,11 +112,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/ \
$(LOCAL_PATH)/platform/third_party/android/libxml2 \
$(LOCAL_PATH)/platform/third_party/android/libjpeg
# it is used for ndk-r5
# if you build with ndk-r4, comment it
# because the new Windows toolchain doesn't support Cygwin's drive
# mapping (i.e /cygdrive/c/ instead of C:/)
LOCAL_LDLIBS := -L$(call host-path, $(LOCAL_PATH)/platform/third_party/android/libraries) \
LOCAL_LDLIBS := -L$(call host-path, $(LOCAL_PATH)/platform/third_party/android/libraries/$(TARGET_ARCH_ABI)) \
-lGLESv1_CM -llog -lz \
-lpng \
-lxml2 \

1
cocos2dx/platform/third_party/android/libraries/armeabi-v7a/libcurl.a.REMOVED.git-id vendored Normal file
View File

@ -0,0 +1 @@
89c49d395ece44cf2d891cd5c2a84f819e229d30

1
cocos2dx/platform/third_party/android/libraries/armeabi-v7a/libiconv.a.REMOVED.git-id vendored Normal file
View File

@ -0,0 +1 @@
ed7341a4fe082dfc3323ab2808729baf6faf72a6

1
cocos2dx/platform/third_party/android/libraries/armeabi-v7a/libjpeg.a.REMOVED.git-id vendored Normal file
View File

@ -0,0 +1 @@
09011474ff4df140a34e82e7cdb5c86cf9a522bc

1
cocos2dx/platform/third_party/android/libraries/armeabi-v7a/libpng.a.REMOVED.git-id vendored Normal file
View File

@ -0,0 +1 @@
d3c4c2e8858fd0eb83f2f4f8e501d10394836add

1
cocos2dx/platform/third_party/android/libraries/armeabi-v7a/libxml2.a.REMOVED.git-id vendored Normal file
View File

@ -0,0 +1 @@
9666bcac0a33d1dcfd5361266eca55f1bace1daf

0
cocos2dx/platform/third_party/android/libraries/libcurl.a.REMOVED.git-id → cocos2dx/platform/third_party/android/libraries/armeabi/libcurl.a.REMOVED.git-id vendored
View File

0
cocos2dx/platform/third_party/android/libraries/libjpeg.a.REMOVED.git-id → cocos2dx/platform/third_party/android/libraries/armeabi/libjpeg.a.REMOVED.git-id vendored
View File

0
cocos2dx/platform/third_party/android/libraries/libpng.a.REMOVED.git-id → cocos2dx/platform/third_party/android/libraries/armeabi/libpng.a.REMOVED.git-id vendored
View File

0
cocos2dx/platform/third_party/android/libraries/libxml2.a.REMOVED.git-id → cocos2dx/platform/third_party/android/libraries/armeabi/libxml2.a.REMOVED.git-id vendored
View File

1
cocos2dx/platform/third_party/android/libraries/x86/libcurl.a.REMOVED.git-id vendored Normal file
View File

@ -0,0 +1 @@
fca1b81187a22728c6c352f121ac03f8abf2ae75

1
cocos2dx/platform/third_party/android/libraries/x86/libiconv.a.REMOVED.git-id vendored Normal file
View File

@ -0,0 +1 @@
f8727a9fe8bb39473706cd3b98cb9a12a4304c6f

1
cocos2dx/platform/third_party/android/libraries/x86/libjpeg.a.REMOVED.git-id vendored Normal file
View File

@ -0,0 +1 @@
42f26e695ffe165b38102fd3b9bd0e2be617bf2b

1
cocos2dx/platform/third_party/android/libraries/x86/libpng.a.REMOVED.git-id vendored Normal file
View File

@ -0,0 +1 @@
e3e0e06dbb367746764f6b1146884f6ef75bb5a2

1
cocos2dx/platform/third_party/android/libraries/x86/libxml2.a.REMOVED.git-id vendored Normal file
View File

@ -0,0 +1 @@
3100e9f83cf078971b4b48b757bf5ebac2d02d37

2
tests/test.android/build_native.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash
# set params
ANDROID_NDK_ROOT=/cygdrive/d/programe/android/ndk/android-ndk-r6
ANDROID_NDK_ROOT=/cygdrive/d/programe/android/ndk/android-ndk-r6b
COCOS2DX_ROOT=/cygdrive/e/cocos2d-x
TESTS_ROOT=$COCOS2DX_ROOT/tests/test.android