Skip to content

Commit df104cd

Browse files
committed
fix vs 2022 dll copy
1 parent 95d97d7 commit df104cd

File tree

3 files changed

+25
-8
lines changed

3 files changed

+25
-8
lines changed

.github/workflows/ccpp_win.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,12 @@ jobs:
8181
- name: make .pot
8282
working-directory: ./build
8383
run: msbuild /m /P:Configuration=RelWithDebInfo gettext_make_pot.vcxproj
84+
- name: create OCCT wrapper
85+
working-directory: ./build
86+
run: msbuild /m /P:Configuration=RelWithDebInfo src\occt_wrapper\OCCTWrapper.vcxproj
87+
- name: copy dll
88+
working-directory: ./build
89+
run: msbuild /m /P:Configuration=RelWithDebInfo src\slic3rDllsCopy.vcxproj
8490
- name: create directory and copy into it
8591
working-directory: ./build
8692
run: ls
@@ -101,7 +107,6 @@ jobs:
101107
working-directory: ./build
102108
shell: cmd
103109
run: |
104-
xcopy /RCYIE Slic3r_win_build\*.dll package\
105110
xcopy /RCYIE Slic3r_win_build\local-settings.bat package\${{ github.event.repository.name }}_local-settings.bat
106111
xcopy /RCYIE Slic3r_win_build\mesa package\
107112
- name: copy new resources
@@ -115,6 +120,7 @@ jobs:
115120
xcopy /RCYIE src\RelWithDebInfo\*.dll package\
116121
xcopy /RCYIE src\RelWithDebInfo\*.exe package\
117122
xcopy /RCYIE c:\windows\system32\VCRUNTIME140* package\
123+
xcopy /RCYIE c:\windows\system32\msvcp140* package\
118124
del package\opengl32.dll
119125
# - name: create zip
120126
# working-directory: ./build

.github/workflows/ccpp_win_debug.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,19 @@ jobs:
113113
- run: mkdir build
114114
- name: cmake
115115
working-directory: ./build
116-
run: cmake .. -G "Visual Studio 16 2019" -A x64 -DCMAKE_PREFIX_PATH="d:\a\${{ github.event.repository.name }}\${{ github.event.repository.name }}\deps\build\destdir\usr\local"
116+
run: cmake .. -G "Visual Studio 17 2022" -A x64 -DCMAKE_PREFIX_PATH="d:\a\${{ github.event.repository.name }}\${{ github.event.repository.name }}\deps\build\destdir\usr\local"
117117
- name: make
118118
working-directory: ./build
119119
run: msbuild /m /P:Configuration=Debug INSTALL.vcxproj
120120
- name: make .mo
121121
working-directory: ./build
122122
run: msbuild /m /P:Configuration=Debug gettext_po_to_mo.vcxproj
123+
- name: create OCCT wrapper
124+
working-directory: ./build
125+
run: msbuild /m /P:Configuration=Debug src\occt_wrapper\OCCTWrapper.vcxproj
126+
- name: copy dll
127+
working-directory: ./build
128+
run: msbuild /m /P:Configuration=Debug src\slic3rDllsCopy.vcxproj
123129
- name: create directory and copy into it
124130
working-directory: ./build
125131
run: ls
@@ -140,7 +146,6 @@ jobs:
140146
working-directory: ./build
141147
shell: cmd
142148
run: |
143-
xcopy /RCYIE Slic3r_win_build\*.dll package\
144149
xcopy /RCYIE Slic3r_win_build\local-settings.bat package\${{ github.event.repository.name }}_local-settings.bat
145150
xcopy /RCYIE Slic3r_win_build\mesa package\
146151
- name: copy new resources

.github/workflows/ccpp_win_rc.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,12 @@ jobs:
7979
- name: make .pot
8080
working-directory: ./build
8181
run: msbuild /m /P:Configuration=Release gettext_make_pot.vcxproj
82+
- name: create OCCT wrapper
83+
working-directory: ./build
84+
run: msbuild /m /P:Configuration=Release src\occt_wrapper\OCCTWrapper.vcxproj
85+
- name: copy dll
86+
working-directory: ./build
87+
run: msbuild /m /P:Configuration=Release src\slic3rDllsCopy.vcxproj
8288
- name: create directory and copy into it
8389
working-directory: ./build
8490
run: ls
@@ -87,10 +93,10 @@ jobs:
8793
shell: powershell
8894
#todo: add the opengl folder
8995
run: mkdir package
90-
- name: copy from release
91-
working-directory: ./build
92-
shell: powershell
93-
run: '(new-object System.Net.WebClient).DownloadFile("https://github.com/supermerill/SuperSlicer_deps/releases/download/1.8/Slic3r_win_build.zip", "Slic3r_win_build.zip")'
96+
# - name: copy from release
97+
# working-directory: ./build
98+
# shell: powershell
99+
# run: '(new-object System.Net.WebClient).DownloadFile("https://github.com/supermerill/SuperSlicer_deps/releases/download/1.8/Slic3r_win_build.zip", "Slic3r_win_build.zip")'
94100
- name: unzip
95101
working-directory: ./build
96102
shell: cmd
@@ -99,7 +105,6 @@ jobs:
99105
working-directory: ./build
100106
shell: cmd
101107
run: |
102-
xcopy /RCYIE Slic3r_win_build\*.dll package\
103108
xcopy /RCYIE Slic3r_win_build\local-settings.bat package\${{ github.event.repository.name }}_local-settings.bat
104109
xcopy /RCYIE Slic3r_win_build\mesa package\
105110
- name: copy new resources
@@ -115,6 +120,7 @@ jobs:
115120
xcopy /RCYIE src\release\*.dll package\
116121
xcopy /RCYIE src\release\*.exe package\
117122
xcopy /RCYIE c:\windows\system32\VCRUNTIME140* package\
123+
xcopy /RCYIE c:\windows\system32\msvcp140* package\
118124
del package\opengl32.dll
119125
# - name: create zip
120126
# working-directory: ./build

0 commit comments

Comments
 (0)