From 441ab7eedcb8fe120a7f934684ed5545cdd7a4b6 Mon Sep 17 00:00:00 2001 From: Petr Mrázek Date: Wed, 13 Oct 2021 01:59:25 +0200 Subject: NOISSUE debranding for real, initial work This is probably very broken on macOS and Windows and will need a lot of work to complete fully. --- libraries/classparser/CMakeLists.txt | 6 +++--- libraries/iconfix/CMakeLists.txt | 12 ++++++------ libraries/quazip | 2 +- libraries/rainbow/CMakeLists.txt | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) (limited to 'libraries') diff --git a/libraries/classparser/CMakeLists.txt b/libraries/classparser/CMakeLists.txt index 3fe7591d..c07e871c 100644 --- a/libraries/classparser/CMakeLists.txt +++ b/libraries/classparser/CMakeLists.txt @@ -36,6 +36,6 @@ src/annotations.cpp add_definitions(-DCLASSPARSER_LIBRARY) -add_library(MultiMC_classparser STATIC ${CLASSPARSER_SOURCES} ${CLASSPARSER_HEADERS}) -target_include_directories(MultiMC_classparser PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") -target_link_libraries(MultiMC_classparser MultiMC_quazip Qt5::Core) +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) diff --git a/libraries/iconfix/CMakeLists.txt b/libraries/iconfix/CMakeLists.txt index ccf0edea..52a31c68 100644 --- a/libraries/iconfix/CMakeLists.txt +++ b/libraries/iconfix/CMakeLists.txt @@ -12,17 +12,17 @@ internal/qiconloader.cpp internal/qiconloader_p.h ) -add_library(MultiMC_iconfix SHARED ${ICONFIX_SOURCES}) -target_include_directories(MultiMC_iconfix PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_CURRENT_BINARY_DIR}" ) +add_library(Launcher_iconfix SHARED ${ICONFIX_SOURCES}) +target_include_directories(Launcher_iconfix PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_CURRENT_BINARY_DIR}" ) -target_link_libraries(MultiMC_iconfix Qt5::Core Qt5::Widgets) +target_link_libraries(Launcher_iconfix Qt5::Core Qt5::Widgets) -set_target_properties(MultiMC_iconfix PROPERTIES CXX_VISIBILITY_PRESET hidden VISIBILITY_INLINES_HIDDEN 1) -generate_export_header(MultiMC_iconfix) +set_target_properties(Launcher_iconfix PROPERTIES CXX_VISIBILITY_PRESET hidden VISIBILITY_INLINES_HIDDEN 1) +generate_export_header(Launcher_iconfix) # Install it install( - TARGETS MultiMC_iconfix + TARGETS Launcher_iconfix RUNTIME DESTINATION ${LIBRARY_DEST_DIR} LIBRARY DESTINATION ${LIBRARY_DEST_DIR} ) \ No newline at end of file diff --git a/libraries/quazip b/libraries/quazip index 3691d57d..b1a72ac0 160000 --- a/libraries/quazip +++ b/libraries/quazip @@ -1 +1 @@ -Subproject commit 3691d57d3af13f49b2be2b62accddefee3c26b9c +Subproject commit b1a72ac0bb5a732bf887a535ab75c6f9bedb6b6b diff --git a/libraries/rainbow/CMakeLists.txt b/libraries/rainbow/CMakeLists.txt index ad806faa..833538e3 100644 --- a/libraries/rainbow/CMakeLists.txt +++ b/libraries/rainbow/CMakeLists.txt @@ -9,14 +9,14 @@ src/rainbow.cpp ) add_definitions(-DRAINBOW_LIBRARY) -add_library(MultiMC_rainbow SHARED ${RAINBOW_SOURCES}) -target_include_directories(MultiMC_rainbow PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") +add_library(Launcher_rainbow SHARED ${RAINBOW_SOURCES}) +target_include_directories(Launcher_rainbow PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") -target_link_libraries(MultiMC_rainbow Qt5::Core Qt5::Gui) +target_link_libraries(Launcher_rainbow Qt5::Core Qt5::Gui) # Install it install( - TARGETS MultiMC_rainbow + TARGETS Launcher_rainbow RUNTIME DESTINATION ${LIBRARY_DEST_DIR} LIBRARY DESTINATION ${LIBRARY_DEST_DIR} ) -- cgit