Merge branch 'release-0331' into HEAD

Author: hemiao2023

CMakePresets.json

@@ -129,6 +129,27 @@
                 "CMAKE_MACOSX_BUNDLE": "ON"
             }
         },
+        {
+            "name": "Clang_Mac_arm64",
+            "displayName": "mac_debug_arm64",
+            "description": "使用编译器: C = /usr/bin/clang, CXX = /usr/bin/clang++",
+            "binaryDir": "${sourceDir}/out/${presetName}/build",
+            "installDir": "${sourceDir}/out/${presetName}/install/",
+            "generator": "Ninja",
+            "cacheVariables": {
+                "CMAKE_C_COMPILER": "/usr/bin/clang",
+                "CMAKE_CXX_COMPILER": "/usr/bin/clang++",
+                "CMAKE_BUILD_TYPE": "Release",
+                "CMAKE_CONFIGURE_TYPE": "${presetName}",
+                "BBL_RELEASE_TO_PUBLIC": "1",
+                "CMAKE_INSTALL_PREFIX": "./CrealityPrint",
+                "CMAKE_PREFIX_PATH": "/Users/qprj/work/DEPS_LIB_DIR/usr/local/",
+                "GENERATE_ORCA_HEADER": "OFF",
+                "CMAKE_MACOSX_RPATH": "ON",
+                "CMAKE_OSX_DEPLOYMENT_TARGET": "11.3",
+                "CMAKE_MACOSX_BUNDLE": "ON"
+            }
+        },
         {
             "name": "mac_clang",
             "displayName": "自定义配置预设",

cmake/modules/NSIS.template.in

@@ -1,5 +1,5 @@
 ; CPack install script designed for a nmake build
-
+RequestExecutionLevel admin
 ;--------------------------------
 ; You must define these values
   @CPACK_PACKAGE_UNICODE@
@@ -10,6 +10,7 @@
   !define APP_NAME  "@CPACK_NSIS_PACKAGE_NAME@"
   !define WebView2Installer "@CPACK_WEBVIEW2_NAME@"
   !define VCREDIST_X64Installer "@CPACK_VCREDIST_X64_NAME@"
+  !define STLTHUMB_X64Installer "@CPACK_STLTHUMB_NAME@"
 ;--------------------------------
 ;Variables
 
@@ -718,7 +719,8 @@ Section "-Core installation"
 
   ExecWait '"$INSTDIR\\${WebView2Installer}" /silent /install'
   ExecWait '"$INSTDIR\\${VCREDIST_X64Installer}" /silent /install'
-  
+  ExecWait '"$INSTDIR\\${STLTHUMB_X64Installer}" /silent /install'
+
   ;Store installation folder
   WriteRegStr SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" "" $INSTDIR
   WriteRegStr HKCU "Software\Microsoft\DirectX\UserGpuPreferences" "$INSTDIR\${PROCESS_NAME}" "GpuPreference=2;"
@@ -807,12 +809,12 @@ WriteRegStr HKCR "cxprj_cxsw\shell\open\command" "" '"$INSTDIR\${PROCESS_NAME}"
 System::Call "Shell32::SHChangeNotify(i 0x8000000, i 0, i 0, i 0)"
 
   ;add stl thumb
-  WriteRegStr HKCR ".stl\shellex\{e357fccd-a995-4576-b01f-234630154e96}" "" "{AF07F051-9D08-44A7-8C63-9296ADFEDDD7}"
-  WriteRegStr HKCR "CLSID\{AF07F051-9D08-44A7-8C63-9296ADFEDDD7}" "" "STLThumbWinShellExtension.STLThumbnailProvider Class"
-  WriteRegDWORD HKCR "CLSID\{AF07F051-9D08-44A7-8C63-9296ADFEDDD7}" "DisableProcessIsolation" 1
-  WriteRegStr HKCR "CLSID\{AF07F051-9D08-44A7-8C63-9296ADFEDDD7}\InprocServer32" "" "$INSTDIR\STLThumbWinShellExtension.dll"
-  WriteRegStr HKCR "CLSID\{AF07F051-9D08-44A7-8C63-9296ADFEDDD7}\InprocServer32" "ThreadingModel" "Apartment"
-
+  ;ExecWait '"regsvr32" /s "$INSTDIR\STLThumbWinShellExtension.dll"'
+  ;WriteRegStr HKCR ".stl\shellex\{e357fccd-a995-4576-b01f-234630154e96}" "" "{AF07F051-9D08-44A7-8C63-9296ADFEDDD7}"
+  ;WriteRegStr HKCR "CLSID\{AF07F051-9D08-44A7-8C63-9296ADFEDDD7}" "" "STLThumbWinShellExtension.STLThumbnailProvider Class"
+  ;WriteRegDWORD HKCR "CLSID\{AF07F051-9D08-44A7-8C63-9296ADFEDDD7}" "DisableProcessIsolation" 1
+  ;WriteRegStr HKCR "CLSID\{AF07F051-9D08-44A7-8C63-9296ADFEDDD7}\InprocServer32" "" "$INSTDIR\STLThumbWinShellExtension.dll"
+  ;WriteRegStr HKCR "CLSID\{AF07F051-9D08-44A7-8C63-9296ADFEDDD7}\InprocServer32" "ThreadingModel" "Both"
 SectionEnd
 
 Section "-Add to path"
@@ -933,9 +935,12 @@ Section "Un.${APP_NAME}"
   Delete "$INSTDIR\AddRemove.exe"
 !endif
 
-  ;Remove stl thumb
-  DeleteRegKey HKCR ".stl\shellex\{e357fccd-a995-4576-b01f-234630154e96}"
-  DeleteRegKey HKCR "CLSID\{AF07F051-9D08-44A7-8C63-9296ADFEDDD7}"
+  ; Remove stl thumb
+  ; ExecWait '"regsvr32" /s /u "$INSTDIR\STLThumbWinShellExtension.dll"'
+  ; Delete "$INSTDIR\stl-thumb.exe"
+  ; Delete "$INSTDIR\STLThumbWinShellExtension.dll"
+  ; DeleteRegKey HKCR ".stl\shellex\{e357fccd-a995-4576-b01f-234630154e96}"
+  ; DeleteRegKey HKCR "CLSID\{AF07F051-9D08-44A7-8C63-9296ADFEDDD7}"
 
   ;Remove the uninstaller itself.
   Delete "$INSTDIR\@CPACK_NSIS_UNINSTALL_NAME@.exe"