Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-08 05:24:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

catch up with features etc. that must be on to not crash opening a game

Browse source
This commit is contained in:
Eric House 2013-12-05 07:17:33 -08:00
parent 49e0bf639a
commit 5fb2d9c82a
1 changed files with 28 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
xwords4/android/XWords4-bt/jni/Android.mk
View file

@ -4,40 +4,52 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
COMMON_PATH=../../../common COMMON_PATH=../../../common
local_C_INCLUDES+= \ LOCAL_C_INCLUDES+= \
-I$(LOCAL_PATH)/$(COMMON_PATH) \ -I$(LOCAL_PATH)/$(COMMON_PATH) \
-I$(LOCAL_PATH)/../../../relay \ -I$(LOCAL_PATH)/../../../relay \
local_LDLIBS += -llog LOCAL_LDLIBS += -llog
local_DEBUG = -DMEM_DEBUG -DDEBUG -DENABLE_LOGGING ifeq ($(BUILD_TARGET),debug)
local_DEFINES += \ LOCAL_DEBUG = -DMEM_DEBUG -DDEBUG -DENABLE_LOGGING -DCOMMS_CHECKSUM -Wno-unused-but-set-variable
$(local_DEBUG) \ endif
LOCAL_DEFINES += \
$(LOCAL_DEBUG) \
-DXWFEATURE_RELAY \ -DXWFEATURE_RELAY \
-DXWFEATURE_BLUETOOTH \ -DXWFEATURE_BLUETOOTH \
-DXWFEATURE_SMS \ -DXWFEATURE_SMS \
-DXWFEATURE_COMMSACK \
-DXWFEATURE_TURNCHANGENOTIFY \ -DXWFEATURE_TURNCHANGENOTIFY \
-DXWFEATURE_CHAT \
-DCOMMS_XPORT_FLAGSPROC \ -DCOMMS_XPORT_FLAGSPROC \
-DKEY_SUPPORT \ -DKEY_SUPPORT \
-DXWFEATURE_CROSSHAIRS \ -DXWFEATURE_CROSSHAIRS \
-DPOINTER_SUPPORT \ -DPOINTER_SUPPORT \
-DSCROLL_DRAG_THRESHHOLD=1 \ -DSCROLL_DRAG_THRESHHOLD=1 \
-DDROP_BITMAPS \ -DDROP_BITMAPS \
-DDISABLE_EMPTYTRAY_UNDO \ -DXWFEATURE_TRAYUNDO_ONE \
-DDISABLE_TILE_SEL \ -DDISABLE_TILE_SEL \
-DXWFEATURE_BOARDWORDS \ -DXWFEATURE_BOARDWORDS \
-DXWFEATURE_WALKDICT \ -DXWFEATURE_WALKDICT \
-DXWFEATURE_WALKDICT_FILTER \ -DXWFEATURE_WALKDICT_FILTER \
-DXWFEATURE_DICTSANITY \ -DXWFEATURE_DICTSANITY \
-DFEATURE_TRAY_EDIT \ -DFEATURE_TRAY_EDIT \
-DXWFEATURE_BONUSALL \
-DMAX_ROWS=32 \ -DMAX_ROWS=32 \
-DINITIAL_CLIENT_VERS=2 \ -DHASH_STREAM \
-DXWFEATURE_BASE64 \
-DXWFEATURE_DEVID \
-DCOMMON_LAYOUT \
-DINITIAL_CLIENT_VERS=${INITIAL_CLIENT_VERS} \
-DRELAY_ROOM_DEFAULT=\"\" \ -DRELAY_ROOM_DEFAULT=\"\" \
-D__LITTLE_ENDIAN \ -D__LITTLE_ENDIAN \
ifeq ($(CHAT_ENABLED),true)
LOCAL_DEFINES += -DXWFEATURE_CHAT
endif
local_SRC_FILES += \ # -DXWFEATURE_SCOREONEPASS \
LOCAL_SRC_FILES += \
xwjni.c \ xwjni.c \
utilwrapper.c \ utilwrapper.c \
drawwrapper.c \ drawwrapper.c \
@ -48,7 +60,7 @@ local_SRC_FILES += \
COMMON_PATH=../../../common COMMON_PATH=../../../common
common_SRC_FILES += \ COMMON_SRC_FILES += \
$(COMMON_PATH)/boarddrw.c \ $(COMMON_PATH)/boarddrw.c \
$(COMMON_PATH)/scorebdp.c \ $(COMMON_PATH)/scorebdp.c \
$(COMMON_PATH)/dragdrpp.c \ $(COMMON_PATH)/dragdrpp.c \
@ -71,11 +83,12 @@ common_SRC_FILES += \
$(COMMON_PATH)/dbgutil.c \ $(COMMON_PATH)/dbgutil.c \
LOCAL_CFLAGS+=$(local_C_INCLUDES) $(local_DEFINES) -Wall LOCAL_CFLAGS+=$(LOCAL_C_INCLUDES) $(LOCAL_DEFINES) -Wall
LOCAL_SRC_FILES := $(linux_SRC_FILES) $(local_SRC_FILES) $(common_SRC_FILES) LOCAL_SRC_FILES := $(linux_SRC_FILES) $(LOCAL_SRC_FILES) $(COMMON_SRC_FILES)
LOCAL_MODULE := xwjni LOCAL_MODULE := xwjni
LOCAL_LDLIBS := -L${SYSROOT}/usr/lib -llog -lz LOCAL_LDLIBS := -L${SYSROOT}/usr/lib -llog -lz
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
COMMON_SRC_FILES :=
COMMON_PATH :=