diff options
Diffstat (limited to 'libraries')
-rw-r--r-- | libraries/classparser/CMakeLists.txt | 2 | ||||
-rw-r--r-- | libraries/classparser/src/classparser.cpp | 2 | ||||
-rw-r--r-- | libraries/iconfix/CMakeLists.txt | 10 | ||||
-rw-r--r-- | libraries/katabasis/README.md | 4 | ||||
m--------- | libraries/quazip | 0 | ||||
-rw-r--r-- | libraries/rainbow/CMakeLists.txt | 8 |
6 files changed, 9 insertions, 17 deletions
diff --git a/libraries/classparser/CMakeLists.txt b/libraries/classparser/CMakeLists.txt index c07e871c..fc510e68 100644 --- a/libraries/classparser/CMakeLists.txt +++ b/libraries/classparser/CMakeLists.txt @@ -38,4 +38,4 @@ add_definitions(-DCLASSPARSER_LIBRARY) add_library(Launcher_classparser STATIC ${CLASSPARSER_SOURCES} ${CLASSPARSER_HEADERS}) target_include_directories(Launcher_classparser PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") -target_link_libraries(Launcher_classparser Launcher_quazip Qt5::Core) +target_link_libraries(Launcher_classparser QuaZip::QuaZip Qt5::Core) diff --git a/libraries/classparser/src/classparser.cpp b/libraries/classparser/src/classparser.cpp index 8825ea39..601521f6 100644 --- a/libraries/classparser/src/classparser.cpp +++ b/libraries/classparser/src/classparser.cpp @@ -18,7 +18,7 @@ #include "classparser.h" #include <QFile> -#include <quazipfile.h> +#include <quazip/quazipfile.h> #include <QDebug> namespace classparser diff --git a/libraries/iconfix/CMakeLists.txt b/libraries/iconfix/CMakeLists.txt index 52a31c68..049879c4 100644 --- a/libraries/iconfix/CMakeLists.txt +++ b/libraries/iconfix/CMakeLists.txt @@ -12,17 +12,9 @@ internal/qiconloader.cpp internal/qiconloader_p.h ) -add_library(Launcher_iconfix SHARED ${ICONFIX_SOURCES}) +add_library(Launcher_iconfix ${ICONFIX_SOURCES}) target_include_directories(Launcher_iconfix PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_CURRENT_BINARY_DIR}" ) target_link_libraries(Launcher_iconfix Qt5::Core Qt5::Widgets) -set_target_properties(Launcher_iconfix PROPERTIES CXX_VISIBILITY_PRESET hidden VISIBILITY_INLINES_HIDDEN 1) generate_export_header(Launcher_iconfix) - -# Install it -install( - TARGETS Launcher_iconfix - RUNTIME DESTINATION ${LIBRARY_DEST_DIR} - LIBRARY DESTINATION ${LIBRARY_DEST_DIR} -)
\ No newline at end of file diff --git a/libraries/katabasis/README.md b/libraries/katabasis/README.md index a4dc0994..08f3c9d1 100644 --- a/libraries/katabasis/README.md +++ b/libraries/katabasis/README.md @@ -1,4 +1,4 @@ -# Katabasis - MS-flavoerd OAuth for Qt, derived from the O2 library +# Katabasis - MS-flavored OAuth for Qt, derived from the O2 library This library's sole purpose is to make interacting with MSA and various MSA and XBox authenticated services less painful. @@ -10,7 +10,7 @@ Notes to contributors: * Please follow the coding style of the existing source, where reasonable * Code contributions are released under Simplified BSD License, as specified in LICENSE. Do not contribute if this license does not suit your code - * If you are interested in working on this, come to the MultiMC Discord server and talk first + * If you are interested in working on this, come to the PolyMC Discord server and talk first ## Installation diff --git a/libraries/quazip b/libraries/quazip -Subproject c9ef32de19bceb58d236f5c22382698deaec69f +Subproject 09ec1d10c6d627f895109b21728dda000cbfa7d diff --git a/libraries/rainbow/CMakeLists.txt b/libraries/rainbow/CMakeLists.txt index 833538e3..a07135c3 100644 --- a/libraries/rainbow/CMakeLists.txt +++ b/libraries/rainbow/CMakeLists.txt @@ -9,14 +9,14 @@ src/rainbow.cpp ) add_definitions(-DRAINBOW_LIBRARY) -add_library(Launcher_rainbow SHARED ${RAINBOW_SOURCES}) -target_include_directories(Launcher_rainbow PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") +add_library(PolyMC_rainbow SHARED ${RAINBOW_SOURCES}) +target_include_directories(PolyMC_rainbow PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") -target_link_libraries(Launcher_rainbow Qt5::Core Qt5::Gui) +target_link_libraries(PolyMC_rainbow Qt5::Core Qt5::Gui) # Install it install( - TARGETS Launcher_rainbow + TARGETS PolyMC_rainbow RUNTIME DESTINATION ${LIBRARY_DEST_DIR} LIBRARY DESTINATION ${LIBRARY_DEST_DIR} ) |