From 98cfe57b8a398e5e4c640ab194515b68c64c04b6 Mon Sep 17 00:00:00 2001 From: remi durand Date: Fri, 4 Jun 2021 15:16:52 +0200 Subject: [PATCH] fix buggy windows opengl32.dll --- .github/workflows/ccpp_win.yml | 16 ++++++---------- .github/workflows/ccpp_win_debug.yml | 16 ++++++---------- .github/workflows/ccpp_win_rc.yml | 16 ++++++---------- version.inc | 1 + 4 files changed, 19 insertions(+), 30 deletions(-) diff --git a/.github/workflows/ccpp_win.yml b/.github/workflows/ccpp_win.yml index 0025f866c4c..5098bddcd28 100644 --- 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 index e54197c8797..75b953c9a91 100644 --- 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 index eb054a7258f..d9c514ad3be 100644 --- 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 index 4fac72e2937..901ac062959 100644 --- 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.") +