XSDL: fixed compilaiton with new sources

project/jni/application/xserver/AndroidAppSettings.cfg

@@ -269,7 +269,8 @@ APP_PLATFORM=
 
 # Specify architectures to compile, 'all' or 'y' to compile for all architectures.
 # Available architectures: armeabi-v7a arm64-v8a x86 x86_64
-MultiABI='armeabi-v7a arm64-v8a x86 x86_64' # armeabi-v7a arm64-v8a x86 x86_64
+#MultiABI='armeabi-v7a arm64-v8a x86 x86_64'
+MultiABI='arm64-v8a'
 
 # Optional shared libraries to compile - removing some of them will save space
 # MP3 patents are expired, but libmad license is GPL, not LGPL

project/jni/application/xserver/AndroidBuild.sh

@@ -47,7 +47,7 @@ env CURDIR=$CURDIR \
 $CC $CFLAGS $LDFLAGS -o $CURDIR/libapplication-'"$1.so"' -L. \
 $CURDIR/main-'"$1.o"' \
 $CURDIR/gfx-'"$1.o"' \
-hw/kdrive/sdl/sdl.o \
+hw/kdrive/sdl/sdl*.o \
 dix/.libs/libdix.a \
 hw/kdrive/src/.libs/libkdrive.a \
 fb/.libs/libfb.a \

project/jni/application/xserver/readme.txt

@@ -1,30 +1,19 @@
 You will need to install some packages to your Debian/Ubuntu first.
 
-Install following packages, assuming fresh Debian 9 installation for x86_64 architecture:
+Install following packages, assuming fresh Debian 10 installation for x86_64 architecture:
 
 sudo dpkg --add-architecture i386
 sudo apt-get update
-sudo apt-get install bison libpixman-1-dev libxfont-dev libxkbfile-dev libpciaccess-dev xutils-dev \
-xcb-proto python-xcbgen xsltproc x11proto-bigreqs-dev x11proto-composite-dev x11proto-core-dev \
-x11proto-damage-dev x11proto-dmx-dev x11proto-dri2-dev x11proto-fixes-dev x11proto-fonts-dev \
-x11proto-gl-dev x11proto-input-dev x11proto-kb-dev x11proto-print-dev x11proto-randr-dev \
-x11proto-record-dev x11proto-render-dev x11proto-resource-dev x11proto-scrnsaver-dev \
-x11proto-video-dev x11proto-xcmisc-dev x11proto-xext-dev x11proto-xf86bigfont-dev \
-x11proto-xf86dga-dev x11proto-xf86dri-dev x11proto-xf86vidmode-dev x11proto-xinerama-dev \
-libxmuu-dev libxt-dev libsm-dev libice-dev libxrender-dev libxrandr-dev xfonts-utils \
+sudo apt-get install bison xfonts-utils \
 curl autoconf autoconf2.59 automake automake1.11 libtool libtool-bin pkg-config \
-libjpeg-dev libpng-dev git mc locales \
-openjdk-8-jdk ant make zip libstdc++6:i386 libgcc1:i386 zlib1g:i386 libncurses5:i386
+libjpeg-dev libpng-dev git locales \
+make zip
 
-Install Android NDK r11c and Android SDK with Android 6.0 framework, they must be in your $PATH.
+Install Android NDK r20 and Android SDK with Android 10.0 framework, they must be in your $PATH.
 
 Download SDL repo, select xserver project, and build it:
 
 git clone git@github.com:pelya/commandergenius.git sdl-android
 cd sdl-android
 git submodule update --init --recursive
-rm -f project/jni/application/src
-ln -s xserver project/jni/application/src
-./build.sh
-
-That's all.
+./build.sh xserver