The build.sh script fails on UNIX because it references MAC specific file extension for shared libraries. Now, is checks the platform.

Patch attached.

best,

--jan
>From 87a5bcc6fcadbd8ae0f0e4d2e72cea2018ceacf8 Mon Sep 17 00:00:00 2001
From: Jan Mulder <jlmul...@xs4all.nl>
Date: Mon, 27 Apr 2015 13:18:04 +0200
Subject: [PATCH] Set the shared library file extenstion for the specific
 platform.

The shared library extension differs on MacOS.

Signed-off-by: Jan Mulder <jlmul...@xs4all.nl>
---
 scripts/build.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/scripts/build.sh b/scripts/build.sh
index 2089269..f4db551 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -101,16 +101,22 @@ cd src/lib/marble
 make -j4
 make install
 
+if [ $PLATFORM = Darwin ] ; then
+	SH_LIB_EXT=dylib
+else
+	SH_LIB_EXT=so
+fi
+
 cd $SRC/subsurface
 mkdir -p build
 cd build
 cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT .. \
 	-DLIBGIT2_INCLUDE_DIR=$INSTALL_ROOT/include \
-	-DLIBGIT2_LIBRARIES=$INSTALL_ROOT/lib/libgit2.dylib \
+	-DLIBGIT2_LIBRARIES=$INSTALL_ROOT/lib/libgit2.$SH_LIB_EXT \
 	-DLIBDIVECOMPUTER_INCLUDE_DIR=$INSTALL_ROOT/include \
 	-DLIBDIVECOMPUTER_LIBRARIES=$INSTALL_ROOT/lib/libdivecomputer.a \
 	-DMARBLE_INCLUDE_DIR=$INSTALL_ROOT/include \
-	-DMARBLE_LIBRARIES=$INSTALL_ROOT/lib/libssrfmarblewidget.dylib
+	-DMARBLE_LIBRARIES=$INSTALL_ROOT/lib/libssrfmarblewidget.$SH_LIB_EXT
 
 make -j4
 make install
-- 
2.3.6

_______________________________________________
subsurface mailing list
subsurface@subsurface-divelog.org
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface

Reply via email to