summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authoryash11122017-07-07 22:34:47 +0530
committeryash11122017-07-07 22:34:47 +0530
commit2340409c98f9b15bb23944b991e97a1aa4e88ce0 (patch)
tree8fa462e65aca52e5e933dee026a78c31baf0181c /etc
parentf577f255fd5c1d30bc770e9b053823ada8684528 (diff)
parent69c573fe2e59236f063aaa94dcd44b556f945cbc (diff)
downloadScilab2C_fossee_old-2340409c98f9b15bb23944b991e97a1aa4e88ce0.tar.gz
Scilab2C_fossee_old-2340409c98f9b15bb23944b991e97a1aa4e88ce0.tar.bz2
Scilab2C_fossee_old-2340409c98f9b15bb23944b991e97a1aa4e88ce0.zip
1.Sci2cDeps updated 2.Windows compatibility resolved
Diffstat (limited to 'etc')
-rw-r--r--etc/scilab2c.start9
1 files changed, 9 insertions, 0 deletions
diff --git a/etc/scilab2c.start b/etc/scilab2c.start
index 91a5861..ff243e9 100644
--- a/etc/scilab2c.start
+++ b/etc/scilab2c.start
@@ -20,12 +20,21 @@ sci2c_GenFunctionslib = lib(pathmacros + "GeneralFunctions" + filesep());
sci2c_SymbolTablelib = lib(pathmacros + "SymbolTable" + filesep());
sci2c_ToolInitlib = lib(pathmacros + "ToolInitialization" + filesep());
sci2c_finDeps = lib(pathmacros + "findDeps" + filesep());
+<<<<<<< HEAD
sci2c_AVRlib = lib(pathmacros + "Hardware\AVR" + filesep());
sci2c_RPilib = lib(pathmacros + "Hardware\RasberryPi"+ filesep());
sci2c_ScilabArduinolib = lib(pathmacros + "Scilab-Arduino" + filesep());
sci2c_CVCorelib = lib(pathmacros + "ImageProcessing\core" + filesep());
sci2c_CVHighguilib = lib(pathmacros + "ImageProcessing\highgui" + filesep());
sci2c_CVImgproclib = lib(pathmacros + "ImageProcessing\imgproc" + filesep());
+=======
+sci2c_AVRlib = lib(pathmacros + "Hardware\AVR" + filesep());
+sci2c_RPilib = lib(pathmacros + "Hardware\RasberryPi"+ filesep());
+sci2c_ScilabArduinolib = lib(pathmacros + "Scilab-Arduino" + filesep());
+sci2c_CVCorelib = lib(pathmacros + "ImageProcessing\core" + filesep());
+sci2c_CVHighguilib = lib(pathmacros + "ImageProcessing\highgui" + filesep());
+sci2c_CVImgproclib = lib(pathmacros + "ImageProcessing\imgproc" + filesep());
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
clear pathmacros;
// Load and add help chapter