From 0ac4ce7078c3fde1ffeb88a921ec8bce46568928 Mon Sep 17 00:00:00 2001 From: Aidan Case Date: Wed, 27 Mar 2024 18:37:50 -0500 Subject: [PATCH] Revert the last 5 commits --- CMakeLists.txt | 9 --------- flatpak/io.github.softfever.OrcaSlicer.yml | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 35571013a1..2a2965a1b0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -276,14 +276,6 @@ if (NOT MSVC AND ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMP add_compile_options(-Wno-unknown-pragmas) # Adding -fext-numeric-literals to enable GCC extensions on definitions of quad float literals, which are required by Boost. add_compile_options(-fext-numeric-literals) - # More of a "size" optimization, use thin archives for static building to not waste space - # Taken from https://bugs.webkit.org/show_bug.cgi?id=108330 - if(SLIC3R_STATIC AND ${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - set(CMAKE_CXX_ARCHIVE_CREATE " crUT ") - set(CMAKE_C_ARCHIVE_CREATE " crUT ") - set(CMAKE_CXX_ARCHIVE_APPEND " rUT ") - set(CMAKE_C_ARCHIVE_APPEND " rUT ") - endif() endif() # Bit of a hack for flatpak building: compress the debug info with zstd to save space in CI @@ -291,7 +283,6 @@ if (NOT MSVC AND ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMP add_compile_options(-gz=zstd) endif() - endif() if (SLIC3R_ASAN) diff --git a/flatpak/io.github.softfever.OrcaSlicer.yml b/flatpak/io.github.softfever.OrcaSlicer.yml index 6c859c1e81..9e0cd53426 100755 --- a/flatpak/io.github.softfever.OrcaSlicer.yml +++ b/flatpak/io.github.softfever.OrcaSlicer.yml @@ -256,8 +256,8 @@ modules: -DSLIC3R_STATIC=ON \ -DSLIC3R_BUILD_TESTS=OFF \ -DSLIC3R_DESKTOP_INTEGRATION=OFF \ - -DFLATPAK=ON \ -DCMAKE_BUILD_TYPE=Release \ + -DFLATPAK=ON \ -DBBL_RELEASE_TO_PUBLIC=1 CXXFLAGS=-std=gnu++20 cmake --build . --target install -j$FLATPAK_BUILDER_N_JOBS