Skip to content
Snippets Groups Projects
Commit 514f8546 authored by Dmitry Puzyrkov's avatar Dmitry Puzyrkov
Browse files

Merge branch 'hotfix-pro' into 'master'

...

See merge request !1777
parents 24ec2025 eb31633e
No related branches found
No related tags found
1 merge request!1777...
Pipeline #43856 passed with stage
in 23 minutes and 23 seconds
......@@ -8,13 +8,10 @@ linux: !android {
}
win32 {
contains(QMAKE_HOST.os, "Windows") {
sdk_build.commands = $$PWD/../cellframe-sdk/prod_build/build.bat
}
else {
CONFIG(release, debug | release): sdk_build.commands = "$$shell_path($$PWD/../cellframe-sdk/prod_build/build.sh)" --target windows release -DINSTALL_SDK=1 -DCMAKE_INSTALL_PREFIX=/
CONFIG(debug, debug | release): sdk_build.commands = "$$shell_path($$PWD/../cellframe-sdk/prod_build/build.sh)" --target windows rwd -DINSTALL_SDK=1 -DCMAKE_INSTALL_PREFIX=/
}
CONFIG(release, debug | release): sdk_build.commands = "$$shell_path($$PWD/../cellframe-sdk/prod_build/build.sh)" --target windows release -DINSTALL_SDK=1 -DCMAKE_INSTALL_PREFIX=/
CONFIG(debug, debug | release): sdk_build.commands = "$$shell_path($$PWD/../cellframe-sdk/prod_build/build.sh)" --target windows rwd -DINSTALL_SDK=1 -DCMAKE_INSTALL_PREFIX=/
}
android {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment