diff options
| author | remi durand <remi-j.durand@thalesgroup.com> | 2021-06-04 17:38:22 +0300 |
|---|---|---|
| committer | remi durand <remi-j.durand@thalesgroup.com> | 2021-06-04 17:38:22 +0300 |
| commit | ce024979effc077aaf0c43405efe367a52472c18 (patch) | |
| tree | 1e39d7a51f0554c256760ab96377248e48073fbb | |
| parent | 653aeb8a9ab8c7e74d77658086894550bb538165 (diff) | |
| parent | 98cfe57b8a398e5e4c640ab194515b68c64c04b6 (diff) | |
Merge branch 'merill-merge'2.3.56.2
| -rw-r--r-- | .github/workflows/ccpp_win.yml | 16 | ||||
| -rw-r--r-- | .github/workflows/ccpp_win_debug.yml | 16 | ||||
| -rw-r--r-- | .github/workflows/ccpp_win_rc.yml | 16 | ||||
| -rw-r--r-- | version.inc | 2 |
4 files changed, 19 insertions, 31 deletions
diff --git a/.github/workflows/ccpp_win.yml b/.github/workflows/ccpp_win.yml index a6a5ecea8..92885150e 100644 --- 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 index f49cdfa1b..012fb9d03 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 f0ef887e3..9205e6a26 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 fd252fb7e..5712c8a6b 100644 --- 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.")
\ No newline at end of file +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.") |