Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-02 20:46:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

bring over variant-related changes that somehow got dropped from this

Browse source 
branch
This commit is contained in:
Eric House 2015-08-06 07:25:56 -07:00
parent 618c5ee11c
commit 9e0f72e68b
2 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
xwords4/android/XWords4/jni/Android.mk
View file

@ -1,4 +1,4 @@
# -*- mode: Makefile; compile-command: "cd ../; ${NDK_ROOT}/ndk-build -j3"; -*- # -*- mode: Makefile; -*-
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
@ -41,7 +41,7 @@ LOCAL_DEFINES += \
-DCOMMON_LAYOUT \ -DCOMMON_LAYOUT \
-DCOMMS_VERSION=1 \ -DCOMMS_VERSION=1 \
-DINITIAL_CLIENT_VERS=${INITIAL_CLIENT_VERS} \ -DINITIAL_CLIENT_VERS=${INITIAL_CLIENT_VERS} \
-DVARIANT=\"${VARIANT}\" \ -DVARIANT_${VARIANT} \
-DRELAY_ROOM_DEFAULT=\"\" \ -DRELAY_ROOM_DEFAULT=\"\" \
-D__LITTLE_ENDIAN \ -D__LITTLE_ENDIAN \

19
xwords4/android/XWords4/jni/xwjni.c
View file

@ -469,18 +469,17 @@ JNIEXPORT jstring JNICALL
Java_org_eehouse_android_xw4_jni_XwJNI_comms_1getUUID Java_org_eehouse_android_xw4_jni_XwJNI_comms_1getUUID
( JNIEnv* env, jclass C ) ( JNIEnv* env, jclass C )
{ {
jstring jstr = NULL; jstring jstr =
#ifdef XWFEATURE_BLUETOOTH #ifdef XWFEATURE_BLUETOOTH
const char* uuid; # if defined VARIANT_xw4
if ( 0 == XP_STRCMP( VARIANT, "xw4" ) ) { (*env)->NewStringUTF( env, XW_BT_UUID )
uuid = XW_BT_UUID; # elif defined VARIANT_xw4dbg
} else if ( 0 == XP_STRCMP( VARIANT, "xw4dbg" ) ) { (*env)->NewStringUTF( env, XW_BT_UUID_DBG )
uuid = XW_BT_UUID_DBG; # endif
} else { #else
XP_ASSERT(0); NULL
}
jstr = (*env)->NewStringUTF( env, uuid );
#endif #endif
;
return jstr; return jstr;
} }