GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-18 06:55:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

change definition of Slic3r key name based on SLIC3R_ALPHA

Browse Source
This commit is contained in:
Joseph Lenox 2021-04-05 23:27:09 -05:00
parent 8e68a63d7b
commit 379cb8cb86
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -41,6 +41,7 @@ option(SLIC3R_MSVC_COMPILE_PARALLEL "Compile on Visual Studio in parallel" 1)
option(SLIC3R_MSVC_PDB "Generate PDB files on MSVC in Release mode" 1) option(SLIC3R_MSVC_PDB "Generate PDB files on MSVC in Release mode" 1)
option(SLIC3R_PERL_XS "Compile XS Perl module and enable Perl unit and integration tests" 0) option(SLIC3R_PERL_XS "Compile XS Perl module and enable Perl unit and integration tests" 0)
option(SLIC3R_ASAN "Enable ASan on Clang and GCC" 0) option(SLIC3R_ASAN "Enable ASan on Clang and GCC" 0)
option(SLIC3R_ALPHA "Development/Experimental version; use separate profile directory." OFF)
set(SLIC3R_GTK "2" CACHE STRING "GTK version to use with wxWidgets on Linux") set(SLIC3R_GTK "2" CACHE STRING "GTK version to use with wxWidgets on Linux")

2
src/libslic3r/CMakeLists.txt
View File

@ -347,6 +347,8 @@ if(SLIC3R_PROFILE)
target_link_libraries(libslic3r Shiny) target_link_libraries(libslic3r Shiny)
endif() endif()
target_compile_definitions(libslic3r PRIVATE $<$<BOOL:${SLIC3R_ALPHA}>:SLIC3R_ALPHA>)
if (SLIC3R_PCH AND NOT SLIC3R_SYNTAXONLY) if (SLIC3R_PCH AND NOT SLIC3R_SYNTAXONLY)
add_precompiled_header(libslic3r pchheader.hpp FORCEINCLUDE) add_precompiled_header(libslic3r pchheader.hpp FORCEINCLUDE)
endif () endif ()

7
src/slic3r/CMakeLists.txt
View File

@ -1,6 +1,12 @@
cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.13)
project(libslic3r_gui) project(libslic3r_gui)
if(NOT WIN32)
# Add DEBUG flags to debug builds.
add_compile_options(${_CC_DEBUG_FLAGS})
endif()
include(PrecompiledHeader) include(PrecompiledHeader)
set(SLIC3R_GUI_SOURCES set(SLIC3R_GUI_SOURCES
@ -247,6 +253,7 @@ if (APPLE)
endif () endif ()
add_library(libslic3r_gui STATIC ${SLIC3R_GUI_SOURCES}) add_library(libslic3r_gui STATIC ${SLIC3R_GUI_SOURCES})
target_compile_definitions(libslic3r_gui PRIVATE $<$<BOOL:${SLIC3R_ALPHA}>:SLIC3R_ALPHA>)
encoding_check(libslic3r_gui) encoding_check(libslic3r_gui)

9
src/slic3r/GUI/GUI_App.cpp
View File

@ -700,9 +700,12 @@ bool GUI_App::init_opengl()
void GUI_App::init_app_config() void GUI_App::init_app_config()
{ {
// Profiles for the alpha are stored into the PrusaSlicer-alpha directory to not mix with the current release. #ifdef SLIC3R_ALPHA
// SetAppName(SLIC3R_APP_KEY); // Profiles for the alpha are stored into the PrusaSlicer-alpha directory to not mix with the current release.
SetAppName(SLIC3R_APP_KEY "-alpha"); SetAppName(SLIC3R_APP_KEY "-alpha");
#else
SetAppName(SLIC3R_APP_KEY);
#endif
// SetAppDisplayName(SLIC3R_APP_NAME); // SetAppDisplayName(SLIC3R_APP_NAME);
// Set the Slic3r data directory at the Slic3r XS module. // Set the Slic3r data directory at the Slic3r XS module.