diff options
| author | yash1112 | 2017-07-07 22:03:16 +0530 |
|---|---|---|
| committer | yash1112 | 2017-07-07 22:03:16 +0530 |
| commit | 640f9fcf3f64298c7958f4bde5a7e6a7602a690d (patch) | |
| tree | f2d5c577e9c719190f2ce68c976a9acefd6611c6 /2.3-1/etc | |
| parent | e9de337a34e123749927039f7011fb30fc96f7c9 (diff) | |
| parent | 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 (diff) | |
| download | Scilab2C-640f9fcf3f64298c7958f4bde5a7e6a7602a690d.tar.gz Scilab2C-640f9fcf3f64298c7958f4bde5a7e6a7602a690d.tar.bz2 Scilab2C-640f9fcf3f64298c7958f4bde5a7e6a7602a690d.zip | |
Scilab2C Arduino Updated
Diffstat (limited to '2.3-1/etc')
| -rw-r--r-- | 2.3-1/etc/scilab2c.start | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/2.3-1/etc/scilab2c.start b/2.3-1/etc/scilab2c.start index 2f364c68..2b10a581 100644 --- a/2.3-1/etc/scilab2c.start +++ b/2.3-1/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 @@ -47,7 +56,11 @@ if or(getscilabmode() == ["NW";"STD"]) then mprintf("\tLoad demos\n"); pathdemos = pathconvert(root_tlbx + "/demos/scilab2c.dem.gateway.sce",%f,%t); +<<<<<<< HEAD // add_demo(gettext("Scilab2C"),pathdemos); +======= + add_demo(gettext("Scilab2C"),pathdemos); +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 clear pathdemos ; end |