diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-08-10 18:34:08 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-08-11 01:07:15 +0200 |
| commit | 1782d5ad9a646ca2a6fab90da5f04c879ddaecd4 (patch) | |
| tree | 9537ecd66dad2fbcb083da2ed07191727a8e10ef /CMakeLists.txt | |
| parent | bf5f5091ef6daeaf7067f4fc8973eb068ddc52fc (diff) | |
| download | MultiMC-1782d5ad9a646ca2a6fab90da5f04c879ddaecd4.tar MultiMC-1782d5ad9a646ca2a6fab90da5f04c879ddaecd4.tar.gz MultiMC-1782d5ad9a646ca2a6fab90da5f04c879ddaecd4.tar.lz MultiMC-1782d5ad9a646ca2a6fab90da5f04c879ddaecd4.tar.xz MultiMC-1782d5ad9a646ca2a6fab90da5f04c879ddaecd4.zip | |
Implement icon picker, bring back raster icons.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e858d888..d907e152 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -176,8 +176,8 @@ gui/instancemodel.h gui/instancedelegate.h gui/versionselectdialog.h gui/lwjglselectdialog.h -gui/iconcache.h gui/instancesettings.h +gui/IconPickerDialog.h java/annotations.h java/classfile.h @@ -209,8 +209,8 @@ gui/instancemodel.cpp gui/instancedelegate.cpp gui/versionselectdialog.cpp gui/lwjglselectdialog.cpp -gui/iconcache.cpp gui/instancesettings.cpp +gui/IconPickerDialog.cpp java/javautils.cpp java/annotations.cpp @@ -232,6 +232,7 @@ gui/consolewindow.ui gui/versionselectdialog.ui gui/lwjglselectdialog.ui gui/instancesettings.ui +gui/IconPickerDialog.ui ) @@ -284,15 +285,6 @@ IF(BUILD_KEYRING_TEST) TARGET_LINK_LIBRARIES(Test libUtil libSettings) ENDIF() -option(BUILD_ASSET_TEST "Build the asset sync test binary" OFF) -IF(BUILD_ASSET_TEST) - # test.cpp - ADD_EXECUTABLE(AssetTest asset_test.cpp) - QT5_USE_MODULES(AssetTest Core Network) - TARGET_LINK_LIBRARIES(AssetTest libUtil backend libSettings) -ENDIF() - - ################################ INSTALLATION AND PACKAGING ################################ # use QtCreator's QTDIR var IF(DEFINED ENV{QTDIR}) |