diff options
Diffstat (limited to 'etc/scilab2c.start')
| -rw-r--r-- | etc/scilab2c.start | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/etc/scilab2c.start b/etc/scilab2c.start index 59cf0865..2b10a581 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 @@ -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 |