diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-12-14 19:26:50 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-12-14 19:26:50 +0100 |
| commit | d15a6490f6f2d6b1252fc48feaaba9dd89608569 (patch) | |
| tree | e8fba87f96d46a83360445bfe4cc0822aa25a294 /CMakeLists.txt | |
| parent | f15306a0ac0b9e449344da07fd6304c5704c0913 (diff) | |
| download | MultiMC-d15a6490f6f2d6b1252fc48feaaba9dd89608569.tar MultiMC-d15a6490f6f2d6b1252fc48feaaba9dd89608569.tar.gz MultiMC-d15a6490f6f2d6b1252fc48feaaba9dd89608569.tar.lz MultiMC-d15a6490f6f2d6b1252fc48feaaba9dd89608569.tar.xz MultiMC-d15a6490f6f2d6b1252fc48feaaba9dd89608569.zip | |
Fix bugs introduced by unit test branch
Account json was getting rewritten by a folder
Missing icon on Windows (hopefully fixed, `doing it live`)
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8ea5803d..b3e89fc1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -482,10 +482,10 @@ QT5_ADD_RESOURCES(GENERATED_QRC ${CMAKE_CURRENT_BINARY_DIR}/generated.qrc) QT5_ADD_RESOURCES(GRAPHICS_QRC graphics.qrc) # Add common library -ADD_LIBRARY(MultiMC_common STATIC ${MULTIMC_SOURCES} ${MULTIMC_UI} ${GENERATED_QRC} ${GRAPHICS_QRC} ${MULTIMC_RCS}) +ADD_LIBRARY(MultiMC_common STATIC ${MULTIMC_SOURCES} ${MULTIMC_UI} ${GENERATED_QRC} ${GRAPHICS_QRC}) # Add executable -ADD_EXECUTABLE(MultiMC MACOSX_BUNDLE WIN32 main.cpp) +ADD_EXECUTABLE(MultiMC MACOSX_BUNDLE WIN32 main.cpp ${MULTIMC_RCS}) # Link TARGET_LINK_LIBRARIES(MultiMC MultiMC_common) |