Commit 408d32fb authored by Leander Schulten's avatar Leander Schulten

Update deployWindows.sh and gitlab-ci.yml for new boost libs

parent 52f67c8b
Pipeline #185356 passed with stage
in 4 minutes and 40 seconds
...@@ -23,6 +23,8 @@ build: ...@@ -23,6 +23,8 @@ build:
artifacts: artifacts:
paths: paths:
- build/release/Lichtsteuerung.exe - build/release/Lichtsteuerung.exe
- src/lib/boost/lib/libboost_context-mt-x64.dll
- src/lib/boost/lib/libboost_coroutine-mt-x64.dll
# we use this version file to check if a new version exists # we use this version file to check if a new version exists
version: version:
...@@ -45,6 +47,8 @@ deploy: ...@@ -45,6 +47,8 @@ deploy:
- windows-release - windows-release
script: script:
- cp build/release/Lichtsteuerung.exe windows-release-5.13.0 - cp build/release/Lichtsteuerung.exe windows-release-5.13.0
- cp src/lib/boost/lib/libboost_context-mt-x64.dll windows-release-5.13.0
- cp src/lib/boost/lib/libboost_coroutine-mt-x64.dll windows-release-5.13.0
- mkdir -p windows-release-5.13.0/modulesHeader - mkdir -p windows-release-5.13.0/modulesHeader
- cp -r src/modules windows-release-5.13.0/modulesHeader - cp -r src/modules windows-release-5.13.0/modulesHeader
- echo "includePath=modulesHeader" >> windows-release-5.13.0/settings.ini - echo "includePath=modulesHeader" >> windows-release-5.13.0/settings.ini
......
...@@ -41,25 +41,16 @@ echo "Finish running windeployqt" ...@@ -41,25 +41,16 @@ echo "Finish running windeployqt"
#copy boost libs #copy boost libs
if [[ $bit == "32" ]]; then if [[ $bit == "32" ]]; then
if [[ $biuld_type == "debug" ]]; then echo "32-Bit boost build are no longer supported!"
boost_context_lib="libboost_contextd.dll"
boost_coroutine_lib="libboost_coroutined.dll"
else
boost_context_lib="libboost_context.dll"
boost_coroutine_lib="libboost_coroutine.dll"
fi
else else
if [[ $biuld_type == "debug" ]]; then if [[ $biuld_type == "debug" ]]; then
debug_infix="d-" debug_infix="d-"
else else
debug_infix='' debug_infix=''
fi fi
boost_context_lib="mingw73/libboost_context-mgw73-mt-${debug_infix}x64-1_69.dll" cp "src/lib/boost/lib/libboost_coroutine-mt-${debug_infix}x64.dll" "$target_folder/"
boost_coroutine_lib="mingw73/libboost_coroutine-mgw73-mt-${debug_infix}x64-1_69.dll" cp "src/lib/boost/lib/libboost_context-mt-${debug_infix}x64.dll" "$target_folder/"
fi fi
cp "src/lib/boost/$boost_context_lib" "$target_folder/"
cp "src/lib/boost/$boost_coroutine_lib" "$target_folder/"
#copy AudioFFT #copy AudioFFT
cp "src/lib/AudioFFT/dll/win${bit}/AudioFFT.dll" "$target_folder" cp "src/lib/AudioFFT/dll/win${bit}/AudioFFT.dll" "$target_folder"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment