FWGS/xash3d-fwgs
2
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs synced 2024-11-22 09:56:22 +01:00
Code Issues 2 Projects Releases Wiki Activity

Rework Makefiles, enable optimisations, fix links

Browse Source
This commit is contained in:
mittorn 2015-05-25 00:20:18 +07:00
parent fe836000cf
commit 39176afce4
11 changed files with 101 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitignore vendored
View File

@ -3,5 +3,12 @@ obj
bin
gen
jni/src/HLSDK/halflife
jni/src/NanoGL/nanogl
jni/src/SDL2/SDL-mirrir
jni/src/Xash3D/xash3d
jni/src/XashXT/XashXT
jni/src/MobileTouchControls/MobileTouchControls
local.properties

4
jni/Application.mk
View File

@ -3,7 +3,9 @@
# See CPLUSPLUS-SUPPORT.html in the NDK documentation for more information
APP_STL := stlport_static
CFLAGS_OPT := -O3 -funsafe-math-optimizations -ftree-vectorize -fgraphite-identity -floop-interchange -funsafe-loop-optimizations -finline-limit=1024
CFLAGS_OPT_ARM := -mthumb -pipe -mfloat-abi=softfp -mfpu=neon -mcpu=cortex-a9
CFLAGS_OPT_X86 := -msse3
APPLICATIONMK_PATH = $(call my-dir)

1
jni/src/HLSDK/halflife

@ -1 +0,0 @@
Subproject commit c3b365fe0831e68199bb39e9f565ca724c7cc430

1
jni/src/HLSDK/halflife Symbolic link
View File

@ -0,0 +1 @@
../../../../halflife/

9
jni/src/MobileTouchControls/Android.mk Normal file
View File

@ -0,0 +1,9 @@
TOUCHCONTROLS_PATH:= $(call my-dir)/MobileTouchControls
include $(TOUCHCONTROLS_PATH)/sigc++/Android.mk
include $(TOUCHCONTROLS_PATH)/TinyXML/Android.mk
include $(TOUCHCONTROLS_PATH)/libpng/Android.mk
include $(TOUCHCONTROLS_PATH)/libzip/Android.mk
include $(TOUCHCONTROLS_PATH)/Android_TouchControls.mk

1
jni/src/NanoGL/nanogl

@ -1 +0,0 @@
Subproject commit 63045ea16759232df455140efd8d5ed67986882d

1
jni/src/NanoGL/nanogl Symbolic link
View File

@ -0,0 +1 @@
../../../../nanogl/

1
jni/src/SDL2
View File

@ -1 +0,0 @@
/home/a1ba/projects/Xash3D/3rdparty/SDL2

77
jni/src/SDL2/Android.mk Normal file
View File

@ -0,0 +1,77 @@
LOCAL_PATH := $(call my-dir)/SDL-mirror
###########################
#
# SDL shared library
#
###########################
include $(CLEAR_VARS)
LOCAL_MODULE := SDL2
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
LOCAL_SRC_FILES := \
$(subst $(LOCAL_PATH)/,, \
$(wildcard $(LOCAL_PATH)/src/*.c) \
$(wildcard $(LOCAL_PATH)/src/audio/*.c) \
$(wildcard $(LOCAL_PATH)/src/audio/android/*.c) \
$(wildcard $(LOCAL_PATH)/src/audio/dummy/*.c) \
$(LOCAL_PATH)/src/atomic/SDL_atomic.c \
$(LOCAL_PATH)/src/atomic/SDL_spinlock.c.arm \
$(wildcard $(LOCAL_PATH)/src/core/android/*.c) \
$(wildcard $(LOCAL_PATH)/src/cpuinfo/*.c) \
$(wildcard $(LOCAL_PATH)/src/dynapi/*.c) \
$(wildcard $(LOCAL_PATH)/src/events/*.c) \
$(wildcard $(LOCAL_PATH)/src/file/*.c) \
$(wildcard $(LOCAL_PATH)/src/haptic/*.c) \
$(wildcard $(LOCAL_PATH)/src/haptic/dummy/*.c) \
$(wildcard $(LOCAL_PATH)/src/joystick/*.c) \
$(wildcard $(LOCAL_PATH)/src/joystick/android/*.c) \
$(wildcard $(LOCAL_PATH)/src/loadso/dlopen/*.c) \
$(wildcard $(LOCAL_PATH)/src/power/*.c) \
$(wildcard $(LOCAL_PATH)/src/power/android/*.c) \
$(wildcard $(LOCAL_PATH)/src/filesystem/android/*.c) \
$(wildcard $(LOCAL_PATH)/src/render/*.c) \
$(wildcard $(LOCAL_PATH)/src/render/*/*.c) \
$(wildcard $(LOCAL_PATH)/src/stdlib/*.c) \
$(wildcard $(LOCAL_PATH)/src/thread/*.c) \
$(wildcard $(LOCAL_PATH)/src/thread/pthread/*.c) \
$(wildcard $(LOCAL_PATH)/src/timer/*.c) \
$(wildcard $(LOCAL_PATH)/src/timer/unix/*.c) \
$(wildcard $(LOCAL_PATH)/src/video/*.c) \
$(wildcard $(LOCAL_PATH)/src/video/android/*.c) \
$(wildcard $(LOCAL_PATH)/src/test/*.c))
LOCAL_CFLAGS += $(CFLAGS_OPT)
ifeq ($(TARGET_ARCH),arm)
LOCAL_CFLAGS += $(CFLAGS_OPT_ARM)
endif
ifeq ($(TARGET_ARCH),x86)
LOCAL_CFLAGS += $(CFLAGS_OPT_X86)
endif
LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES
LOCAL_LDLIBS := -ldl -lGLESv1_CM -lGLESv2 -llog -landroid
include $(BUILD_SHARED_LIBRARY)
###########################
#
# SDL static library
#
###########################
LOCAL_MODULE := SDL2_static
LOCAL_MODULE_FILENAME := libSDL2
LOCAL_SRC_FILES += $(subst $(LOCAL_PATH)/,,$(LOCAL_PATH)/src/main/android/SDL_android_main.c)
LOCAL_LDLIBS :=
LOCAL_EXPORT_LDLIBS := -Wl,--undefined=Java_org_libsdl_app_SDLActivity_nativeInit -ldl -lGLESv1_CM -lGLESv2 -llog -landroid
include $(BUILD_STATIC_LIBRARY)

1
jni/src/SDL2/SDL-mirror Symbolic link
View File

@ -0,0 +1 @@
../../../../SDL2/

1
jni/src/SDL2_image
View File

@ -1 +0,0 @@
/home/a1ba/projects/Xash3D/3rdparty/SDL2_image

1
jni/src/Xash3D/xash3d

@ -1 +0,0 @@
Subproject commit 8e493fcd57ae8f2ab183a5e1d69580f0aa679740

1
jni/src/Xash3D/xash3d Symbolic link
View File

@ -0,0 +1 @@
../../../../xash3d/

1
jni/src/XashXT/XashXT

@ -1 +0,0 @@
Subproject commit 222d4845a6b0cf8926775bcf3c207ef0d31eb53b

1
jni/src/XashXT/XashXT Symbolic link
View File

@ -0,0 +1 @@
../../../../XashXT/