Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 04:12:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Gabriel Calero's hint.

Browse source
This commit is contained in:
NissimHadar 2019-01-21 10:32:33 -08:00
parent 56fa467b63
commit c199654ded
3 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/docker/Dockerfile
View file

@ -27,7 +27,7 @@ RUN mkdir -p "$ANDROID_HOME" "$ANDROID_SDK_HOME" && \
unzip sdk.zip && \ unzip sdk.zip && \
rm sdk.zip && \ rm sdk.zip && \
yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses
RUN yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses && yes | $ANDROID_HOME/tools/bin/sdkmanager --update
# Install Android Build Tool and Libraries # Install Android Build Tool and Libraries
RUN $ANDROID_HOME/tools/bin/sdkmanager --update RUN $ANDROID_HOME/tools/bin/sdkmanager --update
RUN $ANDROID_HOME/tools/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" \ RUN $ANDROID_HOME/tools/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" \

4
tools/CMakeLists.txt
View file

@ -32,8 +32,8 @@ if (BUILD_TOOLS)
set_target_properties(oven PROPERTIES FOLDER "Tools") set_target_properties(oven PROPERTIES FOLDER "Tools")
# No need to build on Android or in a Production build # No need to build on Android or in a Production build
## if (NOT ANDROID AND NOT RELEASE_TYPE STREQUAL "PRODUCTION") if (NOT ANDROID AND NOT RELEASE_TYPE STREQUAL "PRODUCTION")
add_subdirectory(nitpick) add_subdirectory(nitpick)
set_target_properties(nitpick PROPERTIES FOLDER "Tools") set_target_properties(nitpick PROPERTIES FOLDER "Tools")
## endif() endif()
endif() endif()

3
tools/nitpick/CMakeLists.txt
View file

@ -76,9 +76,6 @@ elseif (WIN32)
# add an executable that also has the icon itself and the configured rc file as resources # add an executable that also has the icon itself and the configured rc file as resources
add_executable(${TARGET_NAME} WIN32 ${NITPICK_SRCS} ${QM} ${CONFIGURE_ICON_RC_OUTPUT} ${CONFIGURE_VERSION_INFO_RC_OUTPUT}) add_executable(${TARGET_NAME} WIN32 ${NITPICK_SRCS} ${QM} ${CONFIGURE_ICON_RC_OUTPUT} ${CONFIGURE_VERSION_INFO_RC_OUTPUT})
elseif (ANDROID)
# on android the target is a library that gets linked/used by the APK shell that qtcreateapk produces
add_library(${TARGET_NAME} ${INTERFACE_SRCS} ${QM})
else () else ()
add_executable(${TARGET_NAME} ${NITPICK_SRCS} ${QM}) add_executable(${TARGET_NAME} ${NITPICK_SRCS} ${QM})
endif () endif ()