Skip to content
Snippets Groups Projects
Commit 446c03e4 authored by Michal Kravcenko's avatar Michal Kravcenko
Browse files

FIX: compilation scripts

parent 9dcd59ad
No related branches found
No related tags found
No related merge requests found
...@@ -10,6 +10,7 @@ win_visual_studio_static_local_deps: ...@@ -10,6 +10,7 @@ win_visual_studio_static_local_deps:
- cd build_scripts\windows - cd build_scripts\windows
- call win_download_dependencies.bat - call win_download_dependencies.bat
- set DEPENDENCIES_LINK_TYPE=static - set DEPENDENCIES_LINK_TYPE=static
- set clean_after=yes
- call win_VS_build_x64_debug.bat - call win_VS_build_x64_debug.bat
- cd ..\.. - cd ..\..
...@@ -77,6 +78,7 @@ ubuntu_boost_system: ...@@ -77,6 +78,7 @@ ubuntu_boost_system:
- export TERM=xterm - export TERM=xterm
- cd build_scripts/linux - cd build_scripts/linux
- export DEPENDENCIES_LINK_TYPE=shared - export DEPENDENCIES_LINK_TYPE=shared
- export CLEAN_AFTER=yes
- ./linux_gcc_build_x64_debug_system.sh - ./linux_gcc_build_x64_debug_system.sh
- cd ../.. - cd ../..
...@@ -98,6 +100,7 @@ ubuntu_boost_local_static_deps: ...@@ -98,6 +100,7 @@ ubuntu_boost_local_static_deps:
- cd build_scripts/linux - cd build_scripts/linux
- ./download_dependencies.sh - ./download_dependencies.sh
- export DEPENDENCIES_LINK_TYPE=static - export DEPENDENCIES_LINK_TYPE=static
- export CLEAN_AFTER=yes
- ./linux_gcc_build_x64_debug_local.sh - ./linux_gcc_build_x64_debug_local.sh
- cd ../.. - cd ../..
...@@ -119,6 +122,7 @@ ubuntu_boost_local_dynamic_deps: ...@@ -119,6 +122,7 @@ ubuntu_boost_local_dynamic_deps:
- cd build_scripts/linux - cd build_scripts/linux
- ./download_dependencies.sh - ./download_dependencies.sh
- export DEPENDENCIES_LINK_TYPE=shared - export DEPENDENCIES_LINK_TYPE=shared
- export CLEAN_AFTER=yes
- ./linux_gcc_build_x64_debug_local.sh - ./linux_gcc_build_x64_debug_local.sh
- cd ../.. - cd ../..
......
...@@ -22,6 +22,9 @@ CXX_COMPILER="g++" ...@@ -22,6 +22,9 @@ CXX_COMPILER="g++"
C_COMPILER="gcc" C_COMPILER="gcc"
#**********************DO NOT CHANGE BEYOND THIS LINE**************************************** #**********************DO NOT CHANGE BEYOND THIS LINE****************************************
if [ -z ${DEPENDENCIES_LINK_TYPE} ]; then DEPENDENCIES_LINK_TYPE=static; fi
if [ -z ${CLEAN_AFTER} ]; then CLEAN_AFTER=yes; fi
export LINK_TYPE=static export LINK_TYPE=static
if [ $DEPENDENCIES_LINK_TYPE = "shared" ] if [ $DEPENDENCIES_LINK_TYPE = "shared" ]
then then
......
...@@ -20,6 +20,8 @@ CXX_COMPILER="g++" ...@@ -20,6 +20,8 @@ CXX_COMPILER="g++"
C_COMPILER="gcc" C_COMPILER="gcc"
#**********************DO NOT CHANGE BEYOND THIS LINE**************************************** #**********************DO NOT CHANGE BEYOND THIS LINE****************************************
if [ -z ${DEPENDENCIES_LINK_TYPE} ]; then DEPENDENCIES_LINK_TYPE=static; fi
if [ -z ${CLEAN_AFTER} ]; then CLEAN_AFTER=yes; fi
LINK_TYPE=static LINK_TYPE=static
if [ $DEPENDENCIES_LINK_TYPE = "shared" ] if [ $DEPENDENCIES_LINK_TYPE = "shared" ]
......
Subproject commit 7ff9ae132ba8e8d9ecc329788a55b6e54139068b Subproject commit 0792dde1c543aba10d66d634f923e6993f9699d3
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