diff options
Diffstat (limited to '2.3-1/macros/cb_sci2c_gui.sci')
| -rw-r--r-- | 2.3-1/macros/cb_sci2c_gui.sci | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/2.3-1/macros/cb_sci2c_gui.sci b/2.3-1/macros/cb_sci2c_gui.sci index 2267c6cc..631dc691 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,6 +203,7 @@ elseif get(gcbo, "tag")=="convertbtn" then // -*- DEBUG ONLY -*- +<<<<<<< HEAD //mprintf("UserScilabMainFile = {%s}\n", UserScilabMainFile); //mprintf("UserSciFilesPaths = {%s}\n", UserSciFilesPaths); @@ -206,6 +211,15 @@ elseif get(gcbo, "tag")=="convertbtn" then //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); +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 scilab2c(UserScilabMainFile, UserSciCodeMainDir, UserSciFilesPaths, RunMode, NativeBuild,Target,Board_name); // // --- sci2c help --- |