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

fixes to the merge

Browse source
This commit is contained in:
Eric House 2013-11-07 05:30:02 -08:00
parent bb80cdfb08
commit baba78535f
3 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -43,11 +43,10 @@ LOCAL_DEFINES += \
-D__LITTLE_ENDIAN \ -D__LITTLE_ENDIAN \
ifeq ($(CHAT_ENABLED),true) ifeq ($(CHAT_ENABLED),true)
LOCAL_DEFINES += -DXWFEATURE_CHAT LOCAL_DEFINES += -DXWFEATURE_CHAT
endif endif
ifeq ($(THUMBNAIL_ENABLED),true) ifeq ($(THUMBNAIL_ENABLED),true)
local_DEFINES += -DXWFEATURE_ACTIVERECT LOCAL_DEFINES += -DXWFEATURE_ACTIVERECT
endif endif
# -DXWFEATURE_SCOREONEPASS \ # -DXWFEATURE_SCOREONEPASS \

1
xwords4/android/XWords4/jni/Application.mk
View file

@ -1 +0,0 @@
APP_ABI := armeabi x86

1
xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardCanvas.java
View file

@ -154,7 +154,6 @@ public class BoardCanvas extends Canvas implements DrawCtx {
R.string.bonus_w2x_summary , R.string.bonus_w2x_summary ,
R.string.bonus_l3x_summary, R.string.bonus_l3x_summary,
R.string.bonus_w3x_summary }; R.string.bonus_w3x_summary };
res = activity.getResources();
for ( int ii = 0; ii < ids.length; ++ii ) { for ( int ii = 0; ii < ids.length; ++ii ) {
m_bonusSummaries[ ii+1 ] = res.getString( ids[ii] ); m_bonusSummaries[ ii+1 ] = res.getString( ids[ii] );
} }