juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-06-11 06:23:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #91 from Snapmaker/dev_bury_point_alves

Browse Source 
feature remove not work file
This commit is contained in:
Alves
2025-12-29 18:06:21 +08:00
committed by GitHub
parent 3e97c890c2 38a029516e
commit e285b7262e
5 changed files with 4 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common_func/common_func.hpp
View File

@@ -6,12 +6,12 @@
#define SLIC3R_APP_NAME "Snapmaker Orca"
#define SLIC3R_APP_KEY "Snapmaker_Orca"
#define SLIC3R_VERSION "01.10.01.50"
#define Snapmaker_VERSION "2.2.0"
#define Snapmaker_VERSION "2.2.1"
#define MIN_FIRM_VER "1.0.0"
#ifndef GIT_COMMIT_HASH
#define GIT_COMMIT_HASH "0000000" // 0000000 means uninitialized
#endif
#define SLIC3R_BUILD_ID ""
#define SLIC3R_BUILD_ID "2.2.1"
// #define SLIC3R_RC_VERSION "01.10.01.50"
#define BBL_RELEASE_TO_PUBLIC 1
#define BBL_INTERNAL_TESTING 0

3
src/libslic3r/CMakeLists.txt
View File

@@ -7,8 +7,6 @@ if(NOT DEFINED ORCA_CHECK_GCODE_PLACEHOLDERS)
set(ORCA_CHECK_GCODE_PLACEHOLDERS "0")
endif()
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libslic3r_version.h.in ${CMAKE_CURRENT_BINARY_DIR}/libslic3r_version.h @ONLY)
if (MINGW)
add_compile_options(-Wa,-mbig-obj)
endif ()
@@ -462,7 +460,6 @@ if (APPLE)
endif ()
add_library(libslic3r STATIC ${lisbslic3r_sources}
"${CMAKE_CURRENT_BINARY_DIR}/libslic3r_version.h"
${OpenVDBUtils_SOURCES})
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${lisbslic3r_sources})

18
src/libslic3r/libslic3r_version.h.in
View File

@@ -1,18 +0,0 @@
#ifndef __SLIC3R_VERSION_H
#define __SLIC3R_VERSION_H
#define SLIC3R_APP_NAME "@SLIC3R_APP_NAME@"
#define SLIC3R_APP_KEY "@SLIC3R_APP_KEY@"
#define SLIC3R_VERSION "@SLIC3R_VERSION@"
#define Snapmaker_VERSION "@Snapmaker_VERSION@"
#define MIN_FIRM_VER "@MIN_FIRM_VER@"
#ifndef GIT_COMMIT_HASH
#define GIT_COMMIT_HASH "0000000" // 0000000 means uninitialized
#endif
#define SLIC3R_BUILD_ID "@SLIC3R_BUILD_ID@"
//#define SLIC3R_RC_VERSION "@SLIC3R_VERSION@"
#define BBL_RELEASE_TO_PUBLIC @BBL_RELEASE_TO_PUBLIC@
#define BBL_INTERNAL_TESTING @BBL_INTERNAL_TESTING@
#define ORCA_CHECK_GCODE_PLACEHOLDERS @ORCA_CHECK_GCODE_PLACEHOLDERS@
#endif /* __SLIC3R_VERSION_H */

3
src/slic3r/GUI/ObjectDataViewModel.cpp
View File

@@ -574,7 +574,8 @@ void ObjectDataViewModel::UpdateBitmapForNode(ObjectDataViewModelNode *node)
}
bmp = m_bitmap_cache->insert(scaled_bitmap_name, bmps);
}
if (!bmp)
return;
node->SetBitmap(*bmp);
}

24
t-Path depsbuild) { Remove-Item -Path depsbuild -Recurse -Force; Write-Host Build directory deleted } else { Write-Host No build directory found }
View File

@@ -1,24 +0,0 @@
diff --git a/deps/NanoSVG/NanoSVG.cmake b/deps/NanoSVG/NanoSVG.cmake
index 5c833e3249..ae6550d831 100644
--- a/deps/NanoSVG/NanoSVG.cmake
+++ b/deps/NanoSVG/NanoSVG.cmake
@@ -3,7 +3,7 @@
# for rasterizing svg files from their original size to a squared power of two texture on Windows systems using
# AMD Radeon graphics cards

-orcaslicer_add_cmake_project(NanoSVG
+Snapmaker_Orca_add_cmake_project(NanoSVG
DEPENDS dep_Boost
URL https://github.com/SoftFever/nanosvg/archive/863f6aa97ef62028126fa2c19bd4350394c2e15e.zip
URL_HASH SHA256=8d9c1624ad6518dd6dfa31e4f8dc7da9ec243d88bae595c7a037450617fec851
diff --git a/deps/libnoise/libnoise.cmake b/deps/libnoise/libnoise.cmake
index 0e19f26926..c0ba327394 100644
--- a/deps/libnoise/libnoise.cmake
+++ b/deps/libnoise/libnoise.cmake
@@ -1,4 +1,4 @@
-orcaslicer_add_cmake_project(libnoise
+Snapmaker_Orca_add_cmake_project(libnoise
URL https://github.com/SoftFever/Orca-deps-libnoise/archive/refs/tags/1.0.zip
URL_HASH SHA256=96ffd6cc47898dd8147aab53d7d1b1911b507d9dbaecd5613ca2649468afd8b6
)
\ No newline at end of file