summaryrefslogtreecommitdiff
path: root/2.3-1/macros/cb_sci2c_gui.sci
diff options
context:
space:
mode:
authoryash11122017-07-07 22:34:47 +0530
committeryash11122017-07-07 22:34:47 +0530
commit2a6c003c67faafd257984f4ae632e40bc6fa9a32 (patch)
tree5eecfb962980f7c32cd167bd7e124166e4741343 /2.3-1/macros/cb_sci2c_gui.sci
parentce61940a1398e66d9d09b81241789576c1ceca01 (diff)
parent640f9fcf3f64298c7958f4bde5a7e6a7602a690d (diff)
downloadScilab2C-2a6c003c67faafd257984f4ae632e40bc6fa9a32.tar.gz
Scilab2C-2a6c003c67faafd257984f4ae632e40bc6fa9a32.tar.bz2
Scilab2C-2a6c003c67faafd257984f4ae632e40bc6fa9a32.zip
1.Sci2cDeps updated 2.Windows compatibility resolved
Diffstat (limited to '2.3-1/macros/cb_sci2c_gui.sci')
-rw-r--r--2.3-1/macros/cb_sci2c_gui.sci22
1 files changed, 10 insertions, 12 deletions
diff --git a/2.3-1/macros/cb_sci2c_gui.sci b/2.3-1/macros/cb_sci2c_gui.sci
index bf77c25f..90dad3ba 100644
--- a/2.3-1/macros/cb_sci2c_gui.sci
+++ b/2.3-1/macros/cb_sci2c_gui.sci
@@ -103,7 +103,11 @@ elseif get(gcbo, "tag")=="cancelbtn" | get(gcbo, "tag")=="close_menu" then
elseif get(gcbo, "tag")=="convertbtn" then
UserScilabMainFile = get(findobj("tag", "fileedit"), "string");
+<<<<<<< HEAD
UserSciFilesPaths = get(findobj("tag", "subfunsedit"), "string");
+=======
+ UserSciFilesPaths = get(findobj("tag", "subfunsedit"), "string");
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// Sci2CLibMainHeaderFName = get(findobj("tag", "headeredit"), "string");
@@ -199,18 +203,12 @@ elseif get(gcbo, "tag")=="convertbtn" then
// -*- DEBUG ONLY -*-
-
- mprintf("UserScilabMainFile = {%s}\n", UserScilabMainFile);
- mprintf("UserSciFilesPaths = {%s}\n", UserSciFilesPaths);
- mprintf("UserSciCodeMainDir = {%s}\n", UserSciCodeMainDir);
- mprintf("RunMode = {%s}\n", RunMode);
- mprintf("CopySciCodeIntoCCode = {%d}\n", bool2s(CopySciCodeIntoCCode));
- mprintf("NativeBuild = {%s}\n", NativeBuild);
- mprintf("Target = {%s}\n", Target);
- mprintf("Board Name = {%s}\n", Board_name);
-// disp("Variable Names:")
-// disp(UserScilabMainFile, UserSciCodeMainDir, UserSciFilesPaths, RunMode, NativeBuild,Target,Board_name)
-// disp("Done")
+ //mprintf("UserScilabMainFile = {%s}\n", UserScilabMainFile);
+ //mprintf("UserSciFilesPaths = {%s}\n", UserSciFilesPaths);
+ //mprintf("UserSciCodeMainDir = {%s}\n", UserSciCodeMainDir);
+ //mprintf("RunMode = {%s}\n", RunMode);
+ //mprintf("CopySciCodeIntoCCode = {%d}\n", bool2s(CopySciCodeIntoCCode));
+ //mprintf("NativeBuild = {%s}\n", NativeBuild);
scilab2c(UserScilabMainFile, UserSciCodeMainDir, UserSciFilesPaths, RunMode, NativeBuild,Target,Board_name);
//
// --- sci2c help ---