diff options
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 69af0136..fff6e61e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -254,6 +254,10 @@ add_subdirectory(mmc_updater) add_subdirectory(depends/LogicalGui) include_directories(${LOGICALGUI_INCLUDE_DIR}) +# Add the GUI -> Logic connection header +add_subdirectory(depends/iconfix) +include_directories(${ICONFIX_INCLUDE_DIR}) + ################################ FILES ################################ ######## Sources and headers ######## @@ -638,9 +642,6 @@ SET(MULTIMC_SOURCES ######## UIs ######## SET(MULTIMC_UIS - # Windows - gui/MainWindow.ui - # Option pages gui/pages/VersionPage.ui gui/pages/ModFolderPage.ui @@ -741,7 +742,7 @@ add_executable(MultiMC MACOSX_BUNDLE WIN32 main.cpp ${MULTIMC_RCS}) # Link target_link_libraries(MultiMC MultiMC_common) -target_link_libraries(MultiMC_common xz-embedded unpack200 libUtil LogicalGui ${QUAZIP_LIBRARIES} ${MultiMC_LINK_ADDITIONAL_LIBS}) +target_link_libraries(MultiMC_common xz-embedded unpack200 iconfix libUtil LogicalGui ${QUAZIP_LIBRARIES} ${MultiMC_LINK_ADDITIONAL_LIBS}) qt5_use_modules(MultiMC Core Widgets Network Xml Concurrent WebKitWidgets ${MultiMC_QT_ADDITIONAL_MODULES}) qt5_use_modules(MultiMC_common Core Widgets Network Xml Concurrent WebKitWidgets ${MultiMC_QT_ADDITIONAL_MODULES}) |