summaryrefslogtreecommitdiff
path: root/macros/cb_sci2c_gui.sci
diff options
context:
space:
mode:
Diffstat (limited to 'macros/cb_sci2c_gui.sci')
-rw-r--r--macros/cb_sci2c_gui.sci13
1 files changed, 1 insertions, 12 deletions
diff --git a/macros/cb_sci2c_gui.sci b/macros/cb_sci2c_gui.sci
index 631dc691..90dad3ba 100644
--- a/macros/cb_sci2c_gui.sci
+++ b/macros/cb_sci2c_gui.sci
@@ -203,23 +203,12 @@ elseif get(gcbo, "tag")=="convertbtn" then
// -*- DEBUG ONLY -*-
-<<<<<<< HEAD
-
//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);
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+ //mprintf("NativeBuild = {%s}\n", NativeBuild);
scilab2c(UserScilabMainFile, UserSciCodeMainDir, UserSciFilesPaths, RunMode, NativeBuild,Target,Board_name);
//
// --- sci2c help ---