chiark
/
gitweb
/
~mdw
/
tripe-android
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
It works a bit more, so that's probably progress.
[tripe-android]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 275a88fdf77d75e4befcb3242256d5d3ad46ffb6..35467a877b689832c391beb27ca111f8ee68cebe 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-129,12
+129,12
@@
TOOLVERSION = 4.9
## Android ABI definitions. We don't bother with `armeabi-v7a': we'll use
## fancy CPU features if we detect that they're available at runtime anyway.
## Android ABI definitions. We don't bother with `armeabi-v7a': we'll use
## fancy CPU features if we detect that they're available at runtime anyway.
-
#ANDROID_ABIS
+= armeabi
+
ANDROID_ABIS
+= armeabi
GNUARCH.armeabi = arm-linux-androideabi
PLATARCH.armeabi = arm
CFLAGS.ndk-armeabi =
GNUARCH.armeabi = arm-linux-androideabi
PLATARCH.armeabi = arm
CFLAGS.ndk-armeabi =
-
#ANDROID_ABIS
+= arm64-v8a
+
ANDROID_ABIS
+= arm64-v8a
GNUARCH.arm64-v8a = aarch64-linux-android
PLATARCH.arm64-v8a = arm64
MINAPI.arm64-v8a = 21
GNUARCH.arm64-v8a = aarch64-linux-android
PLATARCH.arm64-v8a = arm64
MINAPI.arm64-v8a = 21
@@
-144,7
+144,7
@@
TOOLCHAINDIR.x86 = x86
GNUARCH.x86 = i686-linux-android
PLATARCH.x86 = x86
GNUARCH.x86 = i686-linux-android
PLATARCH.x86 = x86
-
#ANDROID_ABIS
+= x86_64
+
ANDROID_ABIS
+= x86_64
TOOLCHAINDIR.x86_64 = x86_64
GNUARCH.x86_64 = x86_64-linux-android
PLATARCH.x86_64 = x86_64
TOOLCHAINDIR.x86_64 = x86_64
GNUARCH.x86_64 = x86_64-linux-android
PLATARCH.x86_64 = x86_64
@@
-354,7
+354,8
@@
libtripe.so_LIBS = $(call ext-builddir,$1,tripe)/server/libtripe.a \
$(call ext-builddir,$1,tripe)/common/libcommon.a \
-L$(call ext-prefix,$1)/lib \
$(call pkg-config,$1,catacomb,LIBS) \
$(call ext-builddir,$1,tripe)/common/libcommon.a \
-L$(call ext-prefix,$1)/lib \
$(call pkg-config,$1,catacomb,LIBS) \
- $(call pkg-config,$1,mLib,LIBS)
+ $(call pkg-config,$1,mLib,LIBS) \
+ -ladns
## Machinery for compiling.
objdir = $(OUTDIR)/obj.$1
## Machinery for compiling.
objdir = $(OUTDIR)/obj.$1