diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2020-07-14 15:46:09 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2020-07-14 15:46:09 -0500 |
| commit | 1a51e93e55838bb0c68a8699a18d60d4ebe36945 (patch) | |
| tree | e804278a1d15aba367638af074b5ebd579c5271a /src | |
| parent | b62b8210022dbc94270bef7c1ce5d31c195edd33 (diff) | |
| parent | c9d36b1302dc5caf2d1db03e8fb284cbb2255ace (diff) | |
| download | monzero-gui-1a51e93e55838bb0c68a8699a18d60d4ebe36945.tar.gz monzero-gui-1a51e93e55838bb0c68a8699a18d60d4ebe36945.tar.xz monzero-gui-1a51e93e55838bb0c68a8699a18d60d4ebe36945.zip | |
Merge pull request #2991
c9d36b1 cmake: translations deps handling, build translations as a library (xiphon)
d931022 cmake: implement MacOS 'release' build + CI support (xiphon)
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | src/main/main.cpp | 2 |
2 files changed, 13 insertions, 7 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8800c2fb..b73bff79 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -6,7 +6,7 @@ add_subdirectory(model) add_subdirectory(openpgp) add_subdirectory(zxcvbn-c) -qt5_add_resources(RESOURCES ../qml.qrc ${TRANSLATIONS_QRC}) +qt5_add_resources(RESOURCES ../qml.qrc) # Compile source files (.h/.cpp) file(GLOB SOURCE_FILES @@ -44,13 +44,16 @@ file(GLOB SOURCE_FILES "libwalletqt/Subaddress.h" "libwalletqt/SubaddressAccount.h" "libwalletqt/UnsignedTransaction.h" - "daemon/*.h" - "daemon/*.cpp" - "model/*.h" - "model/*.cpp" - "qt/*.h" + "daemon/*.h" + "daemon/*.cpp" + "model/*.h" + "model/*.cpp" + "qt/*.h" "qt/*.cpp" ) +if(APPLE) + list(APPEND SOURCE_FILES "qt/macoshelper.mm") +endif() if(ENABLE_PASS_STRENGTH_METER) file(GLOB PASS_STRENGTH_FILES @@ -130,7 +133,7 @@ target_link_libraries(monero-wallet-gui wallet_merged ${LMDB_LIBRARY} epee - unbound + ${UNBOUND_LIBRARY} ${SODIUM_LIBRARY} easylogging blockchain_db @@ -145,6 +148,7 @@ target_link_libraries(monero-wallet-gui ${EXTRA_LIBRARIES} ${ICU_LIBRARIES} openpgp + translations ) if(DEVICE_TREZOR_READY) diff --git a/src/main/main.cpp b/src/main/main.cpp index 18986409..d7788dc6 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -147,6 +147,8 @@ bool isOpenGL = true; int main(int argc, char *argv[]) { + Q_INIT_RESOURCE(translations); + // platform dependant settings #if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS) bool isDesktop = true; |