summaryrefslogtreecommitdiff
path: root/2.3-1/macros/findDeps/getAllLibraries.sci
diff options
context:
space:
mode:
Diffstat (limited to '2.3-1/macros/findDeps/getAllLibraries.sci')
-rw-r--r--2.3-1/macros/findDeps/getAllLibraries.sci4
1 files changed, 4 insertions, 0 deletions
diff --git a/2.3-1/macros/findDeps/getAllLibraries.sci b/2.3-1/macros/findDeps/getAllLibraries.sci
index 9d74bbf7..fe894ee8 100644
--- a/2.3-1/macros/findDeps/getAllLibraries.sci
+++ b/2.3-1/macros/findDeps/getAllLibraries.sci
@@ -24,9 +24,13 @@ function allLibraries = getAllLibraries(SharedInfo)
Target = SharedInfo.Target;
//Library files required for "RasberryPi" target
RPi_libs = [
+<<<<<<< HEAD
"thirdparty/lib/raspberrypi/libRPIwfi.a"
"thirdparty/lib/raspberrypi/libwiringPi.a"
"thirdparty/lib/raspberrypi/libwiringPiDev.a"
+=======
+ "thirdparty/lib/raspberrypi/libwiringPi.so"
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
"thirdparty/lib/raspberrypi/libcblas.a"
"thirdparty/lib/raspberrypi/librefblas.a"
"thirdparty/lib/raspberrypi/liblapack.a"