summaryrefslogtreecommitdiff
path: root/macros/findDeps/getAllLibraries.sci
diff options
context:
space:
mode:
authoryash11122017-07-07 22:34:47 +0530
committeryash11122017-07-07 22:34:47 +0530
commit2340409c98f9b15bb23944b991e97a1aa4e88ce0 (patch)
tree8fa462e65aca52e5e933dee026a78c31baf0181c /macros/findDeps/getAllLibraries.sci
parentf577f255fd5c1d30bc770e9b053823ada8684528 (diff)
parent69c573fe2e59236f063aaa94dcd44b556f945cbc (diff)
downloadscilab2c-2340409c98f9b15bb23944b991e97a1aa4e88ce0.tar.gz
scilab2c-2340409c98f9b15bb23944b991e97a1aa4e88ce0.tar.bz2
scilab2c-2340409c98f9b15bb23944b991e97a1aa4e88ce0.zip
1.Sci2cDeps updated 2.Windows compatibility resolved
Diffstat (limited to 'macros/findDeps/getAllLibraries.sci')
-rw-r--r--macros/findDeps/getAllLibraries.sci4
1 files changed, 4 insertions, 0 deletions
diff --git a/macros/findDeps/getAllLibraries.sci b/macros/findDeps/getAllLibraries.sci
index 9d74bbf7..fe894ee8 100644
--- a/macros/findDeps/getAllLibraries.sci
+++ b/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"