fix buggy windows opengl32.dll

supermerill · Jun 4, 2021 · 98cfe57 · 98cfe57
1 parent 1ba0aa0
commit 98cfe57
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 30 deletions.
diff --git a/.github/workflows/ccpp_win.yml b/.github/workflows/ccpp_win.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/.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
@@ -27,3 +27,4 @@ set(SLIC3R_GITHUB "slic3r/Slic3r")
 set(SLIC3R_DOWNLOAD "https://slic3r.org/download")
 # string to display in the spalshscreen
 set(SLIC3R_INTRO "Slic3r contains sizable contributions from Prusa Research. Original work by Alessandro Ranellucci and the RepRap community.")
+