From b075a366b2436fa98b561a18aa9179aba077b9de Mon Sep 17 00:00:00 2001 From: vennos5 Date: Mon, 6 Nov 2017 22:03:06 +0200 Subject: [PATCH] Add missing dlangui files --- android/android_project/android_app.mk | 2 +- android/android_project/android_build_config.mk | 10 +++++----- android/dlangui_source_files.mk | 7 +++++++ 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/android/android_project/android_app.mk b/android/android_project/android_app.mk index 4874206e..ccf446c2 100644 --- a/android/android_project/android_app.mk +++ b/android/android_project/android_app.mk @@ -12,4 +12,4 @@ LOCAL_SRC_FILES="\ LOCAL_LDLIBS="" # Android SDK target -ANDROID_TARGET="android-19" +ANDROID_TARGET="android-21" diff --git a/android/android_project/android_build_config.mk b/android/android_project/android_build_config.mk index d44305f1..0d90606f 100644 --- a/android/android_project/android_build_config.mk +++ b/android/android_project/android_build_config.mk @@ -3,9 +3,9 @@ #========================================================================= # Modify this file to specify DLANGUI, Android NDK, SDK and LDC2 locations. -export DLANGUI_DIR=$HOME/src/d/dlangui -export NDK=$HOME/android-ndk-r11c -export SDK=$HOME/android-sdk-linux -export LDC=$HOME/ldc2-android-arm-0.17.0-alpha2-linux-x86_64 +export DLANGUI_DIR=/media/toshiba/dev/pohjagui +export NDK=$NDK +export SDK=$ANDROID_HOME +export LDC=$LDC export NDK_ARCH=x86_64 -export JAVA_HOME=/usr/lib/jvm/java-8-oracle/ +export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/ diff --git a/android/dlangui_source_files.mk b/android/dlangui_source_files.mk index c4c731ad..2e1b574f 100644 --- a/android/dlangui_source_files.mk +++ b/android/dlangui_source_files.mk @@ -15,6 +15,7 @@ $DLANGUI_DIR/src/dlangui/core/asyncsocket.d \ $DLANGUI_DIR/src/dlangui/core/config.d \ $DLANGUI_DIR/src/dlangui/core/textsource.d \ $DLANGUI_DIR/src/dlangui/core/css.d \ +$DLANGUI_DIR/src/dlangui/core/filemanager.d \ $DLANGUI_DIR/src/dlangui/core/files.d \ $DLANGUI_DIR/src/dlangui/core/events.d \ $DLANGUI_DIR/src/dlangui/core/collections.d \ @@ -52,6 +53,7 @@ $DLANGUI_DIR/src/dlangui/graphics/scene/fbximport.d \ $DLANGUI_DIR/src/dlangui/graphics/scene/skybox.d \ $DLANGUI_DIR/src/dlangui/graphics/resources.d \ $DLANGUI_DIR/src/dlangui/graphics/glsupport.d \ +$DLANGUI_DIR/src/dlangui/graphics/iconprovider.d \ $DLANGUI_DIR/src/dlangui/graphics/colors.d \ $DLANGUI_DIR/src/dlangui/graphics/gldrawbuf.d \ $DLANGUI_DIR/src/dlangui/graphics/fonts.d \ @@ -63,6 +65,7 @@ $DLANGUI_DIR/src/dlangui/dml/annotations.d \ $DLANGUI_DIR/src/dlangui/dml/tokenizer.d \ $DLANGUI_DIR/src/dlangui/dml/parser.d \ $DLANGUI_DIR/src/dlangui/widgets/grid.d \ +$DLANGUI_DIR/src/dlangui/widgets/groupbox.d \ $DLANGUI_DIR/src/dlangui/widgets/styles.d \ $DLANGUI_DIR/src/dlangui/widgets/combobox.d \ $DLANGUI_DIR/src/dlangui/widgets/lists.d \ @@ -72,13 +75,17 @@ $DLANGUI_DIR/src/dlangui/widgets/statusline.d \ $DLANGUI_DIR/src/dlangui/widgets/toolbars.d \ $DLANGUI_DIR/src/dlangui/widgets/tree.d \ $DLANGUI_DIR/src/dlangui/widgets/controls.d \ +$DLANGUI_DIR/src/dlangui/widgets/dmlwidgets.d \ $DLANGUI_DIR/src/dlangui/widgets/popup.d \ +$DLANGUI_DIR/src/dlangui/widgets/progressbar.d \ $DLANGUI_DIR/src/dlangui/widgets/tabs.d \ $DLANGUI_DIR/src/dlangui/widgets/editors.d \ $DLANGUI_DIR/src/dlangui/widgets/appframe.d \ +$DLANGUI_DIR/src/dlangui/widgets/charts.d \ $DLANGUI_DIR/src/dlangui/widgets/layouts.d \ $DLANGUI_DIR/src/dlangui/widgets/winframe.d \ $DLANGUI_DIR/src/dlangui/widgets/metadata.d \ +$DLANGUI_DIR/src/dlangui/widgets/scrollbar.d \ $DLANGUI_DIR/src/dlangui/widgets/scroll.d \ $DLANGUI_DIR/src/dlangui/widgets/docks.d \ $DLANGUI_DIR/src/dlangui/widgets/menu.d \