Add FMILibrary-2.0.3 to org.simantics.fmil.core\native.

[simantics/fmil.git] / org.simantics.fmil.core / linuxbuild / linuxbuild.sh

diff --git a/org.simantics.fmil.core/linuxbuild/linuxbuild.sh b/org.simantics.fmil.core/linuxbuild/linuxbuild.sh
old mode 100755 (executable)
new mode 100644 (file)
index 37a9673..13ab526
--- a/org.simantics.fmil.core/linuxbuild/linuxbuild.sh
+++ b/org.simantics.fmil.core/linuxbuild/linuxbuild.sh
@@ -1,15 +1,19 @@
 #!/bin/bash
 
-CPPFLAGS="-fPIC -ggdb -std=c++11 -Wall -pedantic -Wno-switch -Wno-unused-function -Iinclude -Iinclude/linux"
+CPPFLAGS="-fPIC -ggdb -std=c++11 -Wall -pedantic -Wno-switch -Wno-unused-function -Iinclude -Iinclude/linux -I../FMILibrary/src/Util/include -I../FMILibrary/src/ZIP/include -I../FMILibrary/src/Import/include -I../FMILibrary/ThirdParty/FMI/default"
 LDFLAGS="-L/builds/fmil/ -lfmilib_shared"
 
+# Stop on first non-zero return value
+set -e
+
 rm -rf obj
 mkdir obj
+g++ ${CPPFLAGS} -o obj/fmi_util.o -c src/fmi_util.c
 g++ ${CPPFLAGS} -o obj/fmu_control.o -c src/fmu_control.cpp
 g++ ${CPPFLAGS} -o obj/sim_support.o -c src/sim_support.c
 g++ ${CPPFLAGS} -o obj/stack.o -c src/stack.c
 
-g++ -ggdb -shared -Wl,-soname,libFMUSimulator.so -o libFMUSimulator.so obj/fmu_control.o obj/sim_support.o obj/stack.o ${LDFLAGS}
+g++ -ggdb -shared -Wl,-soname,libFMUSimulator.so -o libFMUSimulator.so obj/fmi_util.o obj/fmu_control.o obj/sim_support.o obj/stack.o ${LDFLAGS}
 
 patchelf --add-needed libfmilib_shared.so libFMUSimulator.so
-patchelf --set-rpath \$ORIGIN libFMUSimulator.so
\ No newline at end of file
+patchelf --set-rpath \$ORIGIN libFMUSimulator.so