fix android version build

This commit is contained in:
2018-09-17 00:57:43 +02:00
parent 7793c2d2c4
commit f9993d814e

View File

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