Skip to content

Commit 084af75

Browse files
committed
Merge branch 'FreeSlave-exclude-lib-archive-from-install'
2 parents 5a6e0e0 + 0c35148 commit 084af75

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

.github/workflows/manual.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,6 @@ jobs:
9898
run: |
9999
copy build/cl_dll/Debug/client.pdb dist/${{ steps.extract_gamedir.outputs.gamedir }}/cl_dlls/
100100
copy build/dlls/Debug/hl.pdb dist/${{ steps.extract_gamedir.outputs.gamedir }}/dlls/
101-
- name: Delete .lib files from dist
102-
if: startsWith(matrix.os, 'windows')
103-
run: |
104-
Remove-Item -Force -Path dist/${{ steps.extract_gamedir.outputs.gamedir }}/cl_dlls/client.lib
105-
Remove-Item -Force -Path dist/${{ steps.extract_gamedir.outputs.gamedir }}/dlls/hl.lib
106101
- name: Upload linux artifact
107102
if: startsWith(matrix.os, 'ubuntu')
108103
uses: actions/upload-artifact@v4

cl_dll/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,8 @@ if(HAVE_LTO)
228228
endif()
229229

230230
install( TARGETS ${CLDLL_LIBRARY}
231-
DESTINATION "${GAMEDIR}/${CLIENT_INSTALL_DIR}/"
231+
RUNTIME DESTINATION "${GAMEDIR}/${CLIENT_INSTALL_DIR}/"
232+
LIBRARY DESTINATION "${GAMEDIR}/${CLIENT_INSTALL_DIR}/"
232233
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
233234
GROUP_READ GROUP_EXECUTE
234235
WORLD_READ WORLD_EXECUTE )

dlls/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,8 @@ if(HAVE_LTO)
189189
endif()
190190

191191
install( TARGETS ${SVDLL_LIBRARY}
192-
DESTINATION "${GAMEDIR}/${SERVER_INSTALL_DIR}/"
192+
RUNTIME DESTINATION "${GAMEDIR}/${SERVER_INSTALL_DIR}/"
193+
LIBRARY DESTINATION "${GAMEDIR}/${SERVER_INSTALL_DIR}/"
193194
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
194195
GROUP_READ GROUP_EXECUTE
195196
WORLD_READ WORLD_EXECUTE)

0 commit comments

Comments
 (0)