summaryrefslogtreecommitdiff
path: root/macros/cb_sci2c_gui.sci
diff options
context:
space:
mode:
authorBrijeshcr2017-07-08 20:18:17 +0530
committerGitHub2017-07-08 20:18:17 +0530
commitbd03b38be0918837e147e969c6bb2014900009db (patch)
tree2cd9b7b1c15092e1367ed15e81aa71ccc9e05190 /macros/cb_sci2c_gui.sci
parent97d1c6847a05bdb93557553a6bdcfd0f15feda99 (diff)
downloadscilab2c-bd03b38be0918837e147e969c6bb2014900009db.tar.gz
scilab2c-bd03b38be0918837e147e969c6bb2014900009db.tar.bz2
scilab2c-bd03b38be0918837e147e969c6bb2014900009db.zip
Revert "SCi2cDeps updated, Windows compatibility resolved"
Diffstat (limited to 'macros/cb_sci2c_gui.sci')
-rw-r--r--macros/cb_sci2c_gui.sci22
1 files changed, 12 insertions, 10 deletions
diff --git a/macros/cb_sci2c_gui.sci b/macros/cb_sci2c_gui.sci
index 90dad3ba..bf77c25f 100644
--- a/macros/cb_sci2c_gui.sci
+++ b/macros/cb_sci2c_gui.sci
@@ -103,11 +103,7 @@ 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");
@@ -203,12 +199,18 @@ 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("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")
scilab2c(UserScilabMainFile, UserSciCodeMainDir, UserSciFilesPaths, RunMode, NativeBuild,Target,Board_name);
//
// --- sci2c help ---