to build scilab on Windows (temp.)
[scilab.git] / scilab / modules / tclsci / src / c / EnvTclTk.c
index 69dc320..6808901 100644 (file)
@@ -11,7 +11,7 @@
 #include "tcl.h"
 #include "tk.h"
 #include "MALLOC.h"
-#include "../../localization/includes/QueryStringError.h"
+//#include "../../localization/includes/QueryStringError.h"
 #include "../../fileio/includes/ConvertPathUnixToWindows.h"
 /*-----------------------------------------------------------------------------------*/
 BOOL Set_TCL_LIBRARY_PATH(char *DefaultPath)
@@ -37,12 +37,12 @@ BOOL Set_TCL_LIBRARY_PATH(char *DefaultPath)
        /* c:\progra~1\scilab-5.0\modules\tclsci\tcl\tcl8.4 */
        if (GetShortPathName(DefaultPath,ShortPath,PATH_MAX)==0)
        {
-               char *msg1=QueryStringError("Incorrect TCL_LIBRARY environment variable");
-               char *msg2=QueryStringError("TCL_LIBRARY has been redefined to ");
-               fprintf(stderr,"\n%s\n%s%s.\n",msg1,msg2,DefaultPath);
+               //char *msg1=QueryStringError("Incorrect TCL_LIBRARY environment variable");
+               //char *msg2=QueryStringError("TCL_LIBRARY has been redefined to ");
+               fprintf(stderr,"\n%s\n%s%s.\n","Incorrect TCL_LIBRARY environment variable","TCL_LIBRARY has been redefined to ",DefaultPath);
                if (CopyOfDefaultPath) {FREE(CopyOfDefaultPath);CopyOfDefaultPath=NULL;}
-               if (msg1) {FREE(msg1);msg1=NULL;}
-               if (msg2) {FREE(msg2);msg2=NULL;}
+//             if (msg1) {FREE(msg1);msg1=NULL;}
+//             if (msg2) {FREE(msg2);msg2=NULL;}
 
                ConvertPathUnixToWindowsFormat(ShortPath,CopyOfDefaultPath);
                wsprintf (env, "TCL_LIBRARY=%s\\modules\\tclsci\\tcl\\tcl%d.%d",CopyOfDefaultPath,major,minor);
@@ -89,12 +89,12 @@ BOOL Set_TK_LIBRARY_PATH(char *DefaultPath)
        /* c:\progra~1\scilab-3.1\modules\tclsci\tcl\tk8.4 */
        if (GetShortPathName(DefaultPath,ShortPath,PATH_MAX)==0)
        {
-               char *msg1=QueryStringError("Incorrect TK_LIBRARY environment variable");
-               char *msg2=QueryStringError("TK_LIBRARY has been redefined to ");
-               fprintf(stderr,"\n%s\n%s%s.\n",msg1,msg2,DefaultPath);
+               //char *msg1=QueryStringError("Incorrect TK_LIBRARY environment variable");
+               //char *msg2=QueryStringError("TK_LIBRARY has been redefined to ");
+               fprintf(stderr,"\n%s\n%s%s.\n","Incorrect TK_LIBRARY environment variable","TK_LIBRARY has been redefined to ",DefaultPath);
                if (CopyOfDefaultPath) {FREE(CopyOfDefaultPath);CopyOfDefaultPath=NULL;}
-               if (msg1){FREE(msg1);msg1=NULL;}
-               if (msg2){FREE(msg2);msg2=NULL;}
+               //if (msg1){FREE(msg1);msg1=NULL;}
+               //if (msg2){FREE(msg2);msg2=NULL;}
 
                ConvertPathUnixToWindowsFormat(ShortPath,CopyOfDefaultPath);
                wsprintf (env, "TK_LIBRARY=%s\\modules\\tclsci\\tcl\\tk%d.%d",CopyOfDefaultPath,major,minor);