- Improved Android build system and fix minor issues in sources.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4522 dfc29bdd-3216-0410-991c-e03cc46cb475master
parent
4e090576f8
commit
148fe37436
|
@ -72,8 +72,12 @@ IReadFile* CAndroidAssetFileArchive::createAndOpenFile(const io::path& filename)
|
||||||
//! opens a file by index
|
//! opens a file by index
|
||||||
IReadFile* CAndroidAssetFileArchive::createAndOpenFile(u32 index)
|
IReadFile* CAndroidAssetFileArchive::createAndOpenFile(u32 index)
|
||||||
{
|
{
|
||||||
|
#ifdef _DEBUG
|
||||||
assert(false);
|
assert(false);
|
||||||
// Since we can't list files, not much sense in giving them an index
|
// Since we can't list files, not much sense in giving them an index
|
||||||
|
#endif
|
||||||
|
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void CAndroidAssetFileArchive::addDirectory(const io::path &dirname)
|
void CAndroidAssetFileArchive::addDirectory(const io::path &dirname)
|
|
@ -45,9 +45,9 @@ s32 CAndroidAssetReader::read(void* buffer, u32 sizeToRead)
|
||||||
|
|
||||||
bool CAndroidAssetReader::seek(long finalPos, bool relativeMovement)
|
bool CAndroidAssetReader::seek(long finalPos, bool relativeMovement)
|
||||||
{
|
{
|
||||||
long off = AAsset_seek(Asset, finalPos, relativeMovement ? SEEK_CUR
|
off_t status = AAsset_seek(Asset, finalPos, relativeMovement ? SEEK_CUR : SEEK_SET);
|
||||||
: SEEK_SET);
|
|
||||||
return off = relativeMovement-1;
|
return status+1;
|
||||||
}
|
}
|
||||||
|
|
||||||
long CAndroidAssetReader::getSize() const
|
long CAndroidAssetReader::getSize() const
|
|
@ -85,7 +85,9 @@ CIrrDeviceAndroid::CIrrDeviceAndroid(const SIrrlichtCreationParameters& param)
|
||||||
}
|
}
|
||||||
while( IsReady == false );
|
while( IsReady == false );
|
||||||
|
|
||||||
|
#ifdef _DEBUG
|
||||||
assert( Android->window );
|
assert( Android->window );
|
||||||
|
#endif
|
||||||
|
|
||||||
// Create cursor control
|
// Create cursor control
|
||||||
CursorControl = new CCursorControl(this);
|
CursorControl = new CCursorControl(this);
|
|
@ -1,11 +1,25 @@
|
||||||
LOCAL_PATH := $(call my-dir)/../..
|
LOCAL_PATH := $(call my-dir)/../..
|
||||||
|
IRRLICHT_LIB_PATH := $(LOCAL_PATH)/../../lib/Android
|
||||||
|
|
||||||
include $(CLEAR_VARS)
|
include $(CLEAR_VARS)
|
||||||
|
|
||||||
LOCAL_MODULE := IrrAndroid
|
LOCAL_MODULE := Irrlicht
|
||||||
|
IRRLICHT_LIB_NAME := lib$(LOCAL_MODULE).a
|
||||||
|
|
||||||
|
LOCAL_CFLAGS := -D_IRR_ANDROID_PLATFORM_ -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing
|
||||||
|
|
||||||
|
ifndef NDEBUG
|
||||||
|
LOCAL_CFLAGS += -g -D_DEBUG
|
||||||
|
else
|
||||||
|
LOCAL_CFLAGS += -fexpensive-optimizations -O3
|
||||||
|
endif
|
||||||
|
|
||||||
|
LOCAL_C_INCLUDES := ../../../include
|
||||||
|
|
||||||
LOCAL_SRC_FILES := \
|
LOCAL_SRC_FILES := \
|
||||||
CIrrDeviceAndroid.cpp \
|
Android/CIrrDeviceAndroid.cpp \
|
||||||
|
Android/CAndroidAssetReader.cpp \
|
||||||
|
Android/CAndroidAssetFileArchive.cpp \
|
||||||
aesGladman/aescrypt.cpp \
|
aesGladman/aescrypt.cpp \
|
||||||
aesGladman/aeskey.cpp \
|
aesGladman/aeskey.cpp \
|
||||||
aesGladman/aestab.cpp \
|
aesGladman/aestab.cpp \
|
||||||
|
@ -240,8 +254,6 @@ LOCAL_SRC_FILES := \
|
||||||
CXMLWriter.cpp \
|
CXMLWriter.cpp \
|
||||||
CZBuffer.cpp \
|
CZBuffer.cpp \
|
||||||
CZipReader.cpp \
|
CZipReader.cpp \
|
||||||
CAndroidAssetReader.cpp \
|
|
||||||
CAndroidAssetFileArchive.cpp \
|
|
||||||
IBurningShader.cpp \
|
IBurningShader.cpp \
|
||||||
Irrlicht.cpp \
|
Irrlicht.cpp \
|
||||||
irrXML.cpp \
|
irrXML.cpp \
|
||||||
|
@ -316,14 +328,15 @@ LOCAL_SRC_FILES := \
|
||||||
libpng/pngwutil.c \
|
libpng/pngwutil.c \
|
||||||
lzma/LzmaDec.c \
|
lzma/LzmaDec.c \
|
||||||
zlib/adler32.c zlib/crc32.c zlib/gzclose.c zlib/gzread.c zlib/infback.c zlib/inflate.c zlib/trees.c zlib/zutil.c\
|
zlib/adler32.c zlib/crc32.c zlib/gzclose.c zlib/gzread.c zlib/infback.c zlib/inflate.c zlib/trees.c zlib/zutil.c\
|
||||||
zlib/compress.c zlib/deflate.c zlib/gzlib.c zlib/gzwrite.c zlib/inffast.c zlib/inftrees.c zlib/uncompr.c
|
zlib/compress.c zlib/deflate.c zlib/gzlib.c zlib/gzwrite.c zlib/inffast.c zlib/inftrees.c zlib/uncompr.c
|
||||||
|
|
||||||
LOCAL_C_INCLUDES := ../../../include
|
|
||||||
|
|
||||||
LOCAL_CFLAGS := -D_IRR_ANDROID_PLATFORM_ -g -D_DEBUG
|
|
||||||
LOCAL_STATIC_LIBRARIES := android_native_app_glue
|
LOCAL_STATIC_LIBRARIES := android_native_app_glue
|
||||||
|
|
||||||
include $(BUILD_STATIC_LIBRARY)
|
include $(BUILD_STATIC_LIBRARY)
|
||||||
|
|
||||||
$(call import-module,android/native_app_glue)
|
$(call import-module,android/native_app_glue)
|
||||||
|
|
||||||
|
all: $(IRRLICHT_LIB_PATH)
|
||||||
|
$(IRRLICHT_LIB_PATH) : $(TARGET_OUT)/$(IRRLICHT_LIB_NAME)
|
||||||
|
cp $< $@
|
||||||
|
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
APP_PLATFORM := android-9
|
APP_PLATFORM := android-10
|
||||||
APP_MODULES := IrrAndroid
|
APP_MODULES := Irrlicht
|
||||||
|
|
|
@ -1,11 +0,0 @@
|
||||||
# This file is automatically generated by Android Tools.
|
|
||||||
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
|
|
||||||
#
|
|
||||||
# This file must be checked in Version Control Systems.
|
|
||||||
#
|
|
||||||
# To customize properties used by the Ant build system use,
|
|
||||||
# "ant.properties", and override values to adapt the script to your
|
|
||||||
# project structure.
|
|
||||||
|
|
||||||
# Project target.
|
|
||||||
target=android-9
|
|
|
@ -34,6 +34,10 @@ static const char* const copyright = "Irrlicht Engine (c) 2002-2012 Nikolaus Geb
|
||||||
#include "iOS/CIrrDeviceiOS.h"
|
#include "iOS/CIrrDeviceiOS.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef _IRR_COMPILE_WITH_ANDROID_DEVICE_
|
||||||
|
#include "Android/CIrrDeviceAndroid.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef _IRR_COMPILE_WITH_SDL_DEVICE_
|
#ifdef _IRR_COMPILE_WITH_SDL_DEVICE_
|
||||||
#include "CIrrDeviceSDL.h"
|
#include "CIrrDeviceSDL.h"
|
||||||
#endif
|
#endif
|
||||||
|
@ -46,10 +50,6 @@ static const char* const copyright = "Irrlicht Engine (c) 2002-2012 Nikolaus Geb
|
||||||
#include "CIrrDeviceConsole.h"
|
#include "CIrrDeviceConsole.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef _IRR_COMPILE_WITH_ANDROID_DEVICE_
|
|
||||||
#include "CIrrDeviceAndroid.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace irr
|
namespace irr
|
||||||
{
|
{
|
||||||
//! stub for calling createDeviceEx
|
//! stub for calling createDeviceEx
|
||||||
|
@ -100,6 +100,11 @@ namespace irr
|
||||||
dev = new CIrrDeviceIPhone(params);
|
dev = new CIrrDeviceIPhone(params);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef _IRR_COMPILE_WITH_ANDROID_DEVICE_
|
||||||
|
if (params.DeviceType == EIDT_ANDROID || (!dev && params.DeviceType == EIDT_BEST))
|
||||||
|
dev = new CIrrDeviceAndroid(params);
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef _IRR_COMPILE_WITH_SDL_DEVICE_
|
#ifdef _IRR_COMPILE_WITH_SDL_DEVICE_
|
||||||
if (params.DeviceType == EIDT_SDL || (!dev && params.DeviceType == EIDT_BEST))
|
if (params.DeviceType == EIDT_SDL || (!dev && params.DeviceType == EIDT_BEST))
|
||||||
dev = new CIrrDeviceSDL(params);
|
dev = new CIrrDeviceSDL(params);
|
||||||
|
@ -110,11 +115,6 @@ namespace irr
|
||||||
dev = new CIrrDeviceFB(params);
|
dev = new CIrrDeviceFB(params);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef _IRR_COMPILE_WITH_ANDROID_DEVICE_
|
|
||||||
if (params.DeviceType == EIDT_ANDROID || (!dev && params.DeviceType == EIDT_BEST))
|
|
||||||
dev = new CIrrDeviceAndroid(params);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef _IRR_COMPILE_WITH_CONSOLE_DEVICE_
|
#ifdef _IRR_COMPILE_WITH_CONSOLE_DEVICE_
|
||||||
if (params.DeviceType == EIDT_CONSOLE || (!dev && params.DeviceType == EIDT_BEST))
|
if (params.DeviceType == EIDT_CONSOLE || (!dev && params.DeviceType == EIDT_BEST))
|
||||||
dev = new CIrrDeviceConsole(params);
|
dev = new CIrrDeviceConsole(params);
|
||||||
|
|
Loading…
Reference in New Issue