diff options
| author | LC <mathew1800@gmail.com> | 2020-10-19 09:18:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-19 09:18:16 -0400 |
| commit | 0f5bf90013cd1358b3ccb2f22c09748e40a552f4 (patch) | |
| tree | f4fedfa6c797161388822c4b2d62235a9da4781b /Source/Android | |
| parent | c9b2fbb64b94c6b79958f5d69af8e7c891794a39 (diff) | |
| parent | cb14b65aad860a79f949fa1e6986cffeba5e3509 (diff) | |
Merge pull request #9150 from JosJuice/discio-fmt
DiscIO: Make use of fmt where applicable
Diffstat (limited to 'Source/Android')
| -rw-r--r-- | Source/Android/jni/AndroidCommon/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Source/Android/jni/CMakeLists.txt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/Source/Android/jni/AndroidCommon/CMakeLists.txt b/Source/Android/jni/AndroidCommon/CMakeLists.txt index e8bcc22863..c9c48e067a 100644 --- a/Source/Android/jni/AndroidCommon/CMakeLists.txt +++ b/Source/Android/jni/AndroidCommon/CMakeLists.txt @@ -8,6 +8,7 @@ add_library(androidcommon STATIC target_link_libraries(androidcommon PRIVATE android + common log "-Wl,--no-warn-mismatch" "-Wl,--whole-archive" diff --git a/Source/Android/jni/CMakeLists.txt b/Source/Android/jni/CMakeLists.txt index 2b8329f99a..7f31a144aa 100644 --- a/Source/Android/jni/CMakeLists.txt +++ b/Source/Android/jni/CMakeLists.txt @@ -10,6 +10,7 @@ add_library(main SHARED target_link_libraries(main PRIVATE androidcommon + common core uicommon ) |