Skip to content

Commit 8000972

Browse files
kunitokikunitoki
committed
More support for android
1 parent 2d4a9dd commit 8000972

File tree

4 files changed

+47
-3
lines changed

4 files changed

+47
-3
lines changed

‎cmake/yup.cmake‎

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -617,29 +617,36 @@ function (yup_add_module module_path)
617617
set (module_defines "")
618618
set (module_searchpaths "")
619619
set (module_searchpaths_private "")
620+
set (module_arc_enabled OFF)
620621

622+
set (module_osx_dependencies "")
621623
set (module_osx_frameworks "")
622624
set (module_osx_weak_frameworks "")
623625
set (module_osx_libs "")
624626
set (module_osx_defines "")
627+
628+
set (module_ios_dependencies "")
625629
set (module_ios_frameworks "")
626630
set (module_ios_weak_frameworks "")
627631
set (module_ios_libs "")
628632
set (module_ios_defines "")
629-
set (module_arc_enabled OFF)
630633

634+
set (module_linux_dependencies "")
631635
set (module_linux_libs "")
632636
set (module_linux_packages "")
633637
set (module_linux_defines "")
634638

639+
set (module_windows_dependencies "")
635640
set (module_windows_libs "")
636641
set (module_windows_defines "")
637642
set (module_windows_options "")
638643
set (module_mingw_libs "")
639644

645+
set (module_wasm_dependencies "")
640646
set (module_wasm_libs "")
641647
set (module_wasm_defines "")
642648

649+
set (module_android_dependencies "")
643650
set (module_android_libs "")
644651
set (module_android_defines "")
645652

@@ -657,6 +664,8 @@ function (yup_add_module module_path)
657664
elseif (${module_config_key} STREQUAL "searchpaths")
658665
_yup_comma_or_space_separated_list (${module_config_value} module_searchpaths)
659666

667+
elseif (${module_config_key} STREQUAL "osxDeps")
668+
_yup_comma_or_space_separated_list (${module_config_value} module_osx_dependencies)
660669
elseif (${module_config_key} STREQUAL "osxFrameworks")
661670
_yup_comma_or_space_separated_list (${module_config_value} module_osx_frameworks)
662671
elseif (${module_config_key} STREQUAL "osxWeakFrameworks")
@@ -666,6 +675,8 @@ function (yup_add_module module_path)
666675
elseif (${module_config_key} STREQUAL "osxDefines")
667676
_yup_comma_or_space_separated_list (${module_config_value} module_osx_defines)
668677

678+
elseif (${module_config_key} STREQUAL "iosDeps")
679+
_yup_comma_or_space_separated_list (${module_config_value} module_ios_dependencies)
669680
elseif (${module_config_key} STREQUAL "iosFrameworks")
670681
_yup_comma_or_space_separated_list (${module_config_value} module_ios_frameworks)
671682
elseif (${module_config_key} STREQUAL "iosWeakFrameworks")
@@ -675,27 +686,35 @@ function (yup_add_module module_path)
675686
elseif (${module_config_key} STREQUAL "iosDefines")
676687
_yup_comma_or_space_separated_list (${module_config_value} module_ios_defines)
677688

689+
elseif (${module_config_key} STREQUAL "linuxDeps")
690+
_yup_comma_or_space_separated_list (${module_config_value} module_linux_dependencies)
678691
elseif (${module_config_key} STREQUAL "linuxLibs")
679692
_yup_comma_or_space_separated_list (${module_config_value} module_linux_libs)
680693
elseif (${module_config_key} STREQUAL "linuxPackages")
681694
_yup_comma_or_space_separated_list (${module_config_value} module_linux_packages)
682695
elseif (${module_config_key} STREQUAL "linuxDefines")
683696
_yup_comma_or_space_separated_list (${module_config_value} module_linux_defines)
684697

698+
elseif (${module_config_key} STREQUAL "windowsDeps")
699+
_yup_comma_or_space_separated_list (${module_config_value} module_windows_dependencies)
685700
elseif (${module_config_key} STREQUAL "windowsLibs")
686701
_yup_comma_or_space_separated_list (${module_config_value} module_windows_libs)
687-
elseif (${module_config_key} STREQUAL "mingwLibs")
688-
_yup_comma_or_space_separated_list (${module_config_value} module_mingw_libs)
689702
elseif (${module_config_key} STREQUAL "windowsDefines")
690703
_yup_comma_or_space_separated_list (${module_config_value} module_windows_defines)
691704
elseif (${module_config_key} STREQUAL "windowsOptions")
692705
_yup_comma_or_space_separated_list (${module_config_value} module_windows_options)
706+
elseif (${module_config_key} STREQUAL "mingwLibs")
707+
_yup_comma_or_space_separated_list (${module_config_value} module_mingw_libs)
693708

709+
elseif (${module_config_key} STREQUAL "wasmDeps")
710+
_yup_comma_or_space_separated_list (${module_config_value} module_wasm_dependencies)
694711
elseif (${module_config_key} STREQUAL "wasmLibs")
695712
_yup_comma_or_space_separated_list (${module_config_value} module_wasm_libs)
696713
elseif (${module_config_key} STREQUAL "wasmDefines")
697714
_yup_comma_or_space_separated_list (${module_config_value} module_wasm_defines)
698715

716+
elseif (${module_config_key} STREQUAL "androidDeps")
717+
_yup_comma_or_space_separated_list (${module_config_value} module_android_dependencies)
699718
elseif (${module_config_key} STREQUAL "androidLibs")
700719
_yup_comma_or_space_separated_list (${module_config_value} module_android_libs)
701720
elseif (${module_config_key} STREQUAL "androidDefines")
@@ -714,27 +733,33 @@ function (yup_add_module module_path)
714733
set (module_frameworks "")
715734
set (module_libs "")
716735
if ("${yup_platform}" MATCHES "^(ios)$")
736+
list (APPEND module_dependencies ${module_ios_dependencies})
717737
list (APPEND module_libs ${module_ios_libs})
718738
list (APPEND module_defines ${module_ios_defines})
719739
_yup_module_prepare_frameworks ("${module_ios_frameworks}" "${module_ios_weak_frameworks}" module_frameworks)
720740
elseif ("${yup_platform}" MATCHES "^(osx)$")
741+
list (APPEND module_dependencies ${module_osx_dependencies})
721742
list (APPEND module_libs ${module_osx_libs})
722743
list (APPEND module_defines ${module_osx_defines})
723744
_yup_module_prepare_frameworks ("${module_osx_frameworks}" "${module_osx_weak_frameworks}" module_frameworks)
724745
elseif ("${yup_platform}" MATCHES "^(linux)$")
746+
list (APPEND module_dependencies ${module_linux_dependencies})
725747
list (APPEND module_libs ${module_linux_libs})
726748
list (APPEND module_defines ${module_linux_defines})
727749
foreach (package ${module_linux_packages})
728750
_yup_get_package_config_libs ("${package}" package_libs)
729751
list (APPEND module_libs ${package_libs})
730752
endforeach()
731753
elseif ("${yup_platform}" MATCHES "^(emscripten)$")
754+
list (APPEND module_dependencies ${module_wasm_dependencies})
732755
list (APPEND module_libs ${module_wasm_libs})
733756
list (APPEND module_defines ${module_wasm_defines})
734757
elseif ("${yup_platform}" MATCHES "^(android)$")
758+
list (APPEND module_dependencies ${module_android_dependencies})
735759
list (APPEND module_libs ${module_android_libs})
736760
list (APPEND module_defines ${module_android_defines})
737761
elseif ("${yup_platform}" MATCHES "^(win32|uwp)$")
762+
list (APPEND module_dependencies ${module_windows_dependencies})
738763
list (APPEND module_defines ${module_windows_defines})
739764
list (APPEND module_options ${module_windows_options})
740765
if (MINGW)

‎examples/graphics/CMakeLists.txt‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,18 @@ if (ANDROID AND NOT YUP_TARGET_ANDROID_BUILD_GRADLE)
3131
_yup_add_default_modules ("${CMAKE_CURRENT_LIST_DIR}/../..")
3232
endif()
3333

34+
# ==== Prepare Android build
35+
yup_add_embedded_binary_resources (
36+
BinaryData
37+
OUT_DIR BinaryData
38+
HEADER BinaryData.h
39+
NAMESPACE yup
40+
RESOURCE_NAMES
41+
RobotoRegularFont
42+
RESOURCES
43+
${CMAKE_CURRENT_LIST_DIR}/data/Roboto-Regular.ttf
44+
)
45+
3446
# ==== Prepare target
3547
yup_standalone_app (
3648
TARGET_NAME ${target_name}
@@ -50,6 +62,7 @@ yup_standalone_app (
5062
sheenbidi
5163
rive
5264
rive_renderer
65+
BinaryData
5366
)
5467

5568
# ==== Prepare sources

‎modules/juce_events/juce_events.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,10 @@
7575
#include <deque>
7676
#include <mutex>
7777

78+
#elif JUCE_ANDROID
79+
#define GLFW_INCLUDE_NONE
80+
#include <GLFW/glfw3.h>
81+
7882
#endif
7983

8084
//==============================================================================

‎modules/juce_events/native/juce_Messaging_android.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ class InternalMessageQueue
6565

6666
for (;;)
6767
{
68+
glfwPollEvents();
69+
6870
{
6971
const ScopedLock sl (lock);
7072

0 commit comments

Comments
 (0)