Merge branch 'merill-merge'

supermerill · Jun 4, 2021 · ce02497 · ce02497 · supermerill · Jun 5, 2021
2 parents 653aeb8 + 98cfe57
commit ce02497
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 31 deletions.
diff --git a/.github/workflows/ccpp_win.yml b/.github/workflows/ccpp_win.yml
@@ -92,18 +92,14 @@ jobs:
       working-directory: ./build
       shell: cmd
       run: xcopy /RCYIE ..\resources package\resources
-    - name: copy dll
+    - name: copy dll & exe
       working-directory: ./build
       shell: cmd
-      run: xcopy /RCYIE src\release\*.dll package\
-    - name: copy exe
-      working-directory: ./build
-      shell: cmd
-      run: xcopy /RCYIE src\release\*.exe package\
-    - name: copy ms runtime
-      working-directory: ./build
-      shell: cmd
-      run: xcopy /RCYIE c:\windows\system32\VCRUNTIME140* package\
+      run: |
+        xcopy /RCYIE src\release\*.dll package\
+        xcopy /RCYIE src\release\*.exe package\
+        xcopy /RCYIE c:\windows\system32\VCRUNTIME140* package\
+        del package\opengl32.dll
 #    - name: create zip
 #      working-directory: ./build
 #      shell: cmd

diff --git a/.github/workflows/ccpp_win_debug.yml b/.github/workflows/ccpp_win_debug.yml
@@ -89,18 +89,14 @@ jobs:
       working-directory: ./build
       shell: cmd
       run: xcopy /RCYIE ..\resources package\resources
-    - name: copy dll
+    - name: copy dll & exe
       working-directory: ./build
       shell: cmd
-      run: xcopy /RCYIE src\Debug\*.dll package\
-    - name: copy exe
-      working-directory: ./build
-      shell: cmd
-      run: xcopy /RCYIE src\Debug\*.exe package\
-    - name: copy ms runtime
-      working-directory: ./build
-      shell: cmd
-      run: xcopy /RCYIE c:\windows\system32\VCRUNTIME140* package\
+      run: |
+        xcopy /RCYIE src\release\*.dll package\
+        xcopy /RCYIE src\release\*.exe package\
+        xcopy /RCYIE c:\windows\system32\VCRUNTIME140* package\
+        del package\opengl32.dll
 #    - name: create zip
 #      working-directory: ./build
 #      shell: cmd

diff --git a/.github/workflows/ccpp_win_rc.yml b/.github/workflows/ccpp_win_rc.yml
@@ -89,18 +89,14 @@ jobs:
       working-directory: ./build
       shell: cmd
       run: xcopy /RCYIE ..\resources package\resources
-    - name: copy dll
+    - name: copy dll & exe
       working-directory: ./build
       shell: cmd
-      run: xcopy /RCYIE src\release\*.dll package\
-    - name: copy exe
-      working-directory: ./build
-      shell: cmd
-      run: xcopy /RCYIE src\release\*.exe package\
-    - name: copy ms runtime
-      working-directory: ./build
-      shell: cmd
-      run: xcopy /RCYIE c:\windows\system32\VCRUNTIME140* package\
+      run: |
+        xcopy /RCYIE src\release\*.dll package\
+        xcopy /RCYIE src\release\*.exe package\
+        xcopy /RCYIE c:\windows\system32\VCRUNTIME140* package\
+        del package\opengl32.dll
 #    - name: create zip
 #      working-directory: ./build
 #      shell: cmd

diff --git a/version.inc b/version.inc
@@ -26,4 +26,4 @@ set(SLIC3R_GITHUB "supermerill/SuperSlicer")
 # download url
 set(SLIC3R_DOWNLOAD "https://github.com/supermerill/SuperSlicer/releases")
 # string to display in the spalshscreen
-set(SLIC3R_INTRO "SuperSlicer is a skinned version of Slic3r, based on the original Slic3r by Alessandro Ranellucci & the RepRap community, and PrusaSlicer by Prusa.")
+set(SLIC3R_INTRO "SuperSlicer is a skinned version of Slic3r, based on the original Slic3r by Alessandro Ranellucci & the RepRap community, and PrusaSlicer by Prusa.")