CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement icon picker, bring back raster icons.

Browse Source
This commit is contained in:
Petr Mrázek
2013-08-10 18:34:08 +02:00
parent bf5f5091ef
commit 1782d5ad9a
75 changed files with 1098 additions and 424 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@ -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})