Merge branch 'release'

hyle-team · Jun 5, 2019 · 1057cd9 · 1057cd9
2 parents c20bbd8 + 2b33261
commit 1057cd9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/version.h.in b/src/version.h.in
@@ -2,6 +2,6 @@
 
 #define BUILD_COMMIT_ID "@VERSION@"
 #define PROJECT_VERSION "1.0"
-#define PROJECT_VERSION_BUILD_NO 37
+#define PROJECT_VERSION_BUILD_NO 38
 #define PROJECT_VERSION_BUILD_NO_STR STRINGIFY_EXPAND(PROJECT_VERSION_BUILD_NO)
 #define PROJECT_VERSION_LONG PROJECT_VERSION "." PROJECT_VERSION_BUILD_NO_STR "[" BUILD_COMMIT_ID "]"
diff --git a/utils/macosx_fix_boost_libs_path.sh b/utils/macosx_fix_boost_libs_path.sh
@@ -27,6 +27,8 @@ function fix_boost_libs_in_binary() # $1 - path to boost libs, $2 - binary to fi
   install_name_tool -change libboost_atomic.dylib          $1/libboost_atomic.dylib          $2
   install_name_tool -change libboost_program_options.dylib $1/libboost_program_options.dylib $2
   install_name_tool -change libboost_locale.dylib          $1/libboost_locale.dylib          $2
+  install_name_tool -change libboost_timer.dylib           $1/libboost_timer.dylib           $2
+  install_name_tool -change libboost_chrono.dylib          $1/libboost_chrono.dylib          $2
   return 0
 }
 
@@ -35,6 +37,8 @@ function fix_boost_libs_in_libs() # $1 - path to boost libs, $2 - path to libs f
   install_name_tool -change libboost_system.dylib          $1/libboost_system.dylib          $2/libboost_filesystem.dylib
   install_name_tool -change libboost_system.dylib          $1/libboost_system.dylib          $2/libboost_thread.dylib
   install_name_tool -change libboost_system.dylib          $1/libboost_system.dylib          $2/libboost_chrono.dylib
+  install_name_tool -change libboost_system.dylib          $1/libboost_system.dylib          $2/libboost_timer.dylib
+  install_name_tool -change libboost_chrono.dylib          $1/libboost_chrono.dylib          $2/libboost_timer.dylib
   install_name_tool -change libboost_system.dylib          $1/libboost_system.dylib          $2/libboost_locale.dylib
 }