Armv6 Builds

[flpstr]

(12-01-2012 03:50 PM)MaXiMu Wrote:  Upload 0.4 commit 4393dc02a6 with native 92bd22ffe5 hrydgard authored December 01, 2012 http://www.multiupload.nl/WLPW9S1VUK

I Only in my compilations for now disable and create for the separate unsupported code native/math/math_utilarmv6.cpp

Code:

#include "math/math_util.h"
#include <math.h>
#include <stdlib.h>

/*
static unsigned int randSeed = 22222;    // Change this for different random sequences.

void SetSeed(unsigned int seed) {
    randSeed = seed * 382792592;
}

unsigned int GenerateRandomNumber() {
    randSeed = (randSeed * 196314165) + 907633515;
    randSeed ^= _rotl(randSeed, 13);
    return randSeed;
}*/

#include <math.h>

#if defined(ARM)

void EnableFZ()
{
    int x;
    asm(
              # "fmrx %[result],FPSCR \r\n"
        "orr %[result],%[result],#16777216 \r\n"
              # "fmxr FPSCR,%[result]"
        :[result] "=r" (x) : :
    );
    #//printf("ARM FPSCR: %08x\n",x);
}

void DisableFZ( )
{
    __asm__ volatile(
    #"fmrx r0, fpscr\n" //Not supported code by armeabi
        "bic r0, $(1 << 24)\n"
    #"fmxr fpscr, r0" : : : "r0"); //Not supported code by armeabi
}
#else

void EnableFZ()
{


}
void DisableFZ()
{

}

#endif

And the Native/android.mk separate TARGET_arch_ABI armeabi /Armeabi-7a and add ARM Mode for the compatibility

Code:

# Basic Android.mk for libnative

LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)

LOCAL_MODULE    := libnative
LOCAL_ARM_MODE := arm
LOCAL_SRC_FILES :=\
    android/native_audio.cpp \
    audio/wav_read.cpp \
    audio/mixer.cpp.arm \
    base/buffer.cpp \
    base/display.cpp \
    base/timeutil.cpp \
    base/colorutil.cpp \
    base/error_context.cpp \
    base/stringutil.cpp \
    ext/sha1/sha1.cpp \
    ext/stb_vorbis/stb_vorbis.c.arm \
    ext/vjson/json.cpp \
    ext/vjson/block_allocator.cpp \
    file/dialog.cpp \
    file/fd_util.cpp \
    file/easy_file.cpp \
    file/chunk_file.cpp \
    file/file_util.cpp \
    file/zip_read.cpp \
    json/json_writer.cpp \
    math/curves.cpp \
    math/lin/aabb.cpp.arm \
    math/lin/plane.cpp.arm \
    math/lin/quat.cpp.arm \
    math/lin/vec3.cpp.arm \
    math/lin/matrix4x4.cpp.arm \
    midi/midi_input.cpp \
    net/http_client.cpp \
    net/resolve.cpp \
    profiler/profiler.cpp \
    gfx_es2/glsl_program.cpp \
    gfx_es2/gl_state.cpp \
    gfx_es2/draw_buffer.cpp.arm \
    gfx_es2/vertex_format.cpp \
    gfx_es2/fbo.cpp \
    gfx/gl_debug_log.cpp \
    gfx/gl_lost_manager.cpp \
    gfx/texture.cpp \
    gfx/texture_atlas.cpp \
    gfx/texture_gen.cpp \
    image/zim_load.cpp \
    ui/ui.cpp \
    ui/ui_context.cpp \
    ui/screen.cpp \
    ui/virtual_input.cpp \
    util/random/perlin.cpp

LOCAL_CFLAGS := -O2 -DGL_GLEXT_PROTOTYPES -DARM -DUSING_GLES2 -fsigned-char -fno-strict-aliasing
LOCAL_CPPFLAGS := -fno-exceptions -fno-rtti -std=gnu++0x
LOCAL_LDLIBS := -lz
LOCAL_C_INCLUDES := $(LOCAL_PATH)/ext/libzip

ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
LOCAL_SRC_FILES += math/math_util.cpp
else ifeq ($(TARGET_ARCH_ABI),armeabi)
LOCAL_SRC_FILES += math/math_utilarmv6.cpp
endif

include $(BUILD_STATIC_LIBRARY)

Is easy separate files for others platforms supported on android in future by ifeq($(TARGET_ARCH_ABI), x86 or MIPS
LOCAL_SRC_FILES +=FOLDER/FILES.cpp

PPsspp/android/jni/Aplication.mk

Code:

APP_STL := stlport_static
APP_ABI := armeabi armeabi-v7a

Thanks buddy, I'll test here, and make my modifications