From f9993d814e6dd403353d6824d7ad84ed0e8920fd Mon Sep 17 00:00:00 2001
From: omigamedev <omarator@gmail.com>
Date: Mon, 17 Sep 2018 00:57:43 +0200
Subject: [PATCH] fix android version build

---
 android/CMakeLists.txt | 115 ++++++++++++++++++++++-------------------
 1 file changed, 61 insertions(+), 54 deletions(-)

diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt
index 39e2feb..0ba3734 100644
--- a/android/CMakeLists.txt
+++ b/android/CMakeLists.txt
@@ -19,6 +19,11 @@ add_library(
 # now build app's shared lib
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++14")
 
+execute_process(
+	COMMAND python ./scripts/pre-build.py ${CMAKE_BUILD_TYPE}
+	WORKING_DIRECTORY ../
+)
+
 add_library(
 	native-lib SHARED
 	../libs/yoga/yoga/YGNodeList.c
@@ -32,65 +37,67 @@ add_library(
 	../libs/poly2tri/poly2tri/sweep/sweep_context.cc
 	../libs/poly2tri/poly2tri/sweep/sweep.cc
 	src/main/cpp/main.cpp
-	../src\/pch.cpp
-	../src\/util.cpp
-	../src\/rtt.cpp
-	../src\/bezier.cpp
-	../src\/asset.cpp
-	../src\/image.cpp
-	../src\/texture.cpp
-	../src\/font.cpp
-	../src\/shader.cpp
-	../src\/shape.cpp
-	../src\/app.cpp
-	../src\/app_cloud.cpp
-	../src\/app_dialogs.cpp
-	../src\/app_events.cpp
-	../src\/app_layout.cpp
-	../src\/app_shaders.cpp
-	../src\/brush.cpp
-	../src\/canvas.cpp
-	../src\/canvas_modes.cpp
-	../src\/log.cpp
-	../src\/action.cpp
-	../src\/layout.cpp
-	../src\/node.cpp
-	../src\/node_border.cpp
-	../src\/node_button.cpp
-	../src\/node_button_custom.cpp
-	../src\/node_canvas.cpp
-	../src\/node_checkbox.cpp
-	../src\/node_color_quad.cpp
-	../src\/node_colorwheel.cpp
-	../src\/node_combobox.cpp
-	../src\/node_dialog_browse.cpp
-	../src\/node_dialog_cloud.cpp
-	../src\/node_dialog_open.cpp
-	../src\/node_dialog_picker.cpp
-	../src\/node_dialog_layer_rename.cpp
-	../src\/node_icon.cpp
-	../src\/node_image.cpp
-	../src\/node_image_texture.cpp
-	../src\/node_message_box.cpp
-	../src\/node_panel_brush.cpp
-	../src\/node_panel_color.cpp
-	../src\/node_panel_layer.cpp
-	../src\/node_panel_stroke.cpp
-	../src\/node_popup_menu.cpp
-	../src\/node_progress_bar.cpp
-	../src\/node_settings.cpp
-	../src\/node_slider.cpp
-	../src\/node_stroke_preview.cpp
-	../src\/node_text.cpp
-	../src\/node_text_input.cpp
-	../src\/node_viewport.cpp
-	../src\/node_scroll.cpp
+	../src/pch.cpp
+	../src/util.cpp
+	../src/rtt.cpp
+	../src/bezier.cpp
+	../src/asset.cpp
+	../src/image.cpp
+	../src/texture.cpp
+	../src/font.cpp
+	../src/shader.cpp
+	../src/shape.cpp
+	../src/app.cpp
+	../src/app_cloud.cpp
+	../src/app_dialogs.cpp
+	../src/app_events.cpp
+	../src/app_layout.cpp
+	../src/app_shaders.cpp
+	../src/brush.cpp
+	../src/canvas.cpp
+	../src/canvas_modes.cpp
+	../src/log.cpp
+	../src/action.cpp
+	../src/layout.cpp
+	../src/version.cpp
+	../src/node.cpp
+	../src/node_border.cpp
+	../src/node_button.cpp
+	../src/node_button_custom.cpp
+	../src/node_canvas.cpp
+	../src/node_checkbox.cpp
+	../src/node_color_quad.cpp
+	../src/node_colorwheel.cpp
+	../src/node_combobox.cpp
+	../src/node_dialog_browse.cpp
+	../src/node_dialog_cloud.cpp
+	../src/node_dialog_open.cpp
+	../src/node_dialog_picker.cpp
+	../src/node_dialog_layer_rename.cpp
+	../src/node_icon.cpp
+	../src/node_image.cpp
+	../src/node_image_texture.cpp
+	../src/node_message_box.cpp
+	../src/node_panel_brush.cpp
+	../src/node_panel_color.cpp
+	../src/node_panel_grid.cpp
+	../src/node_panel_layer.cpp
+	../src/node_panel_stroke.cpp
+	../src/node_popup_menu.cpp
+	../src/node_progress_bar.cpp
+	../src/node_settings.cpp
+	../src/node_slider.cpp
+	../src/node_stroke_preview.cpp
+	../src/node_text.cpp
+	../src/node_text_input.cpp
+	../src/node_viewport.cpp
+	../src/node_scroll.cpp
 )
 
 target_include_directories(native-lib PRIVATE
 	${ANDROID_NDK}/sources/android/native_app_glue
 	src/main/cpp
-	../src\
+	../src
 	../libs/glm
 	../libs/tinyxml2
 	../libs/yoga