summaryrefslogtreecommitdiff
path: root/etc/scilab2c.start
diff options
context:
space:
mode:
authorBrijeshcr2017-07-08 20:18:17 +0530
committerGitHub2017-07-08 20:18:17 +0530
commitbd03b38be0918837e147e969c6bb2014900009db (patch)
tree2cd9b7b1c15092e1367ed15e81aa71ccc9e05190 /etc/scilab2c.start
parent97d1c6847a05bdb93557553a6bdcfd0f15feda99 (diff)
downloadScilab2C_fossee_old-bd03b38be0918837e147e969c6bb2014900009db.tar.gz
Scilab2C_fossee_old-bd03b38be0918837e147e969c6bb2014900009db.tar.bz2
Scilab2C_fossee_old-bd03b38be0918837e147e969c6bb2014900009db.zip
Revert "SCi2cDeps updated, Windows compatibility resolved"
Diffstat (limited to 'etc/scilab2c.start')
-rw-r--r--etc/scilab2c.start9
1 files changed, 0 insertions, 9 deletions
diff --git a/etc/scilab2c.start b/etc/scilab2c.start
index ff243e9..91a5861 100644
--- a/etc/scilab2c.start
+++ b/etc/scilab2c.start
@@ -20,21 +20,12 @@ 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