FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Jorge Izquierdo Ciges, "Mostly small changes to add more compile options, and shared linking (still testing that capability, but this enables on a compile basis if the user wants). Robert, when you give the Ok I'll update/rewrite the Android section in the old/new wiki you'll say where is better. Mostly to be clear for the future users what options can configure and what are their purpose."

Browse Source
This commit is contained in:
Robert Osfield
2012-04-19 09:50:10 +00:00
parent 97e4ad473b
commit c6a4fde917
4 changed files with 71 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
PlatformSpecifics/Android/Android.mk.modules.in
View File

@@ -1,27 +1,36 @@
#ANDROID makefile ${MODULE_NAME}
#ANDROID makefile ${MODULE_NAME}
LOCAL_PATH := ${MODULE_DIR}
LOCAL_PATH := ${MODULE_DIR}
include $(CLEAR_VARS)
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
LOCAL_ARM_NEON := true
ifeq (${ANDROID_OPTIM_NEON},true)
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
LOCAL_ARM_NEON := true
endif
endif
LOCAL_CPP_EXTENSION := ${CPP_EXTENSION}
ifeq (${ANDROID_OPTIM_ARM32},true)
LOCAL_ARM_MODE := arm
endif
LOCAL_LDLIBS := ${MODULE_LIBS}
LOCAL_MODULE := ${MODULE_NAME}
LOCAL_CPP_EXTENSION := ${CPP_EXTENSION}
LOCAL_SRC_FILES := ${MODULE_SOURCES}
LOCAL_LDLIBS := ${MODULE_LIBS_FLAGS}
LOCAL_C_INCLUDES := ${MODULE_INCLUDES}
LOCAL_MODULE := ${MODULE_NAME}
LOCAL_CFLAGS := ${MODULE_FLAGS_C}
LOCAL_SRC_FILES := ${MODULE_SOURCES}
LOCAL_CPPFLAGS := ${MODULE_FLAGS_CPP}
LOCAL_C_INCLUDES := ${MODULE_INCLUDES}
LOCAL_CFLAGS := ${MODULE_FLAGS_C}
LOCAL_CPPFLAGS := ${MODULE_FLAGS_CPP}
LOCAL_SHARED_LIBRARIES := ${MODULE_LIBS_SHARED}
LOCAL_STATIC_LIBRARIES := ${MODULE_LIBS_STATIC}
#include $(BUILD_STATIC_LIBRARY)
include ${MODULE_BUILD_TYPE}

8
PlatformSpecifics/Android/Application.mk.master.in
View File

@@ -2,14 +2,14 @@
APP_BUILD_SCRIPT := $(call my-dir)/Android.mk
APP_PROJECT_PATH := $(call my-dir)
APP_OPTIM := release
APP_OPTIM := ${ANDROID_RELEASE_OPTIM}
APP_PLATFORM := android-5
APP_STL := gnustl_static
APP_PLATFORM := ${ANDROID_PLATFORM}
APP_STL := ${ANDROID_STL}
APP_CPPFLAGS := -fexceptions -frtti
#APP_CPPFLAGS := -Os -mthumb-interwork -fno-short-enums
#APP_CPPFLAGS := -Wl,--no-undefined
APP_ABI := armeabi armeabi-v7a
APP_ABI := ${ANDROID_ABI}
APP_MODULES := $ENV{AND_OSG_LIB_NAMES}