ecere/gfx/imgDistMap: authorship notice update

[sdk] / epj2make / epj2make.ec

diff --git a/epj2make/epj2make.ec b/epj2make/epj2make.ec
index 5bb0e25..ab991be 100644 (file)
--- a/epj2make/epj2make.ec
+++ b/epj2make/epj2make.ec
@@ -16,10 +16,20 @@ define pathListSep = ":";
 extern int getch(void);
 #endif
 
+IDESettings ideSettings;
+
+IDESettingsContainer settingsContainer
+{
+   dataOwner = &ideSettings;
+   dataClass = class(IDESettings);
+};
+
+IDEConfigHolder ideConfig { };
+
 void ParseDirList(char * string, Container<String> list)
 {
    int c;
-   byte * tokens[256];
+   char * tokens[256];
    int numTokens = TokenizeWith(string, sizeof(tokens) / sizeof(byte *), tokens, ";", false);
    list.Free();
    for(c = 0; c < numTokens; c++)
@@ -226,24 +236,24 @@ class epj2makeApp : GuiApplication
 
       if(!valid)
       {
-         printf($"Syntax:\n");
-         printf($"   epj2make [-t <target platform>] [-c <configuration>] [toolchain] [directories] [options] [-o <output>] <input>\n");
-         printf($"      toolchain:\n");
-         printf($"         [-make <make tool>]\n");
-         printf($"         [-cpp <c preprocessor>]\n");
-         printf($"         [-cc <c compiler>]\n");
-         printf($"         [-ecp <eC preprocessor>]\n");
-         printf($"         [-ecc <eC compiler>]\n");
-         printf($"         [-ecs <eC symbol generator>]\n");
-         printf($"         [-ear <Ecere Archiver>]\n");
-         printf($"      directories:\n");
-         printf($"         [-i <include dir[;inc dir[...]]>]\n");
-         printf($"         [-l <library dir[;lib dir[...]]>]\n");
-         printf($"      options:\n");
-         printf($"         [-noglobalsettings]\n");
-         printf($"         [-noresources]\n");
-         printf($"         [-d <intermediate objects directory>]\n");
-         printf($"         [-includemk <crossplatform.mk path>]\n");
+         printf("%s", $"Syntax:\n");
+         printf("%s", $"   epj2make [-t <target platform>] [-c <configuration>] [toolchain] [directories] [options] [-o <output>] <input>\n");
+         printf("%s", $"      toolchain:\n");
+         printf("%s", $"         [-make <make tool>]\n");
+         printf("%s", $"         [-cpp <c preprocessor>]\n");
+         printf("%s", $"         [-cc <c compiler>]\n");
+         printf("%s", $"         [-ecp <eC preprocessor>]\n");
+         printf("%s", $"         [-ecc <eC compiler>]\n");
+         printf("%s", $"         [-ecs <eC symbol generator>]\n");
+         printf("%s", $"         [-ear <Ecere Archiver>]\n");
+         printf("%s", $"      directories:\n");
+         printf("%s", $"         [-i <include dir[;inc dir[...]]>]\n");
+         printf("%s", $"         [-l <library dir[;lib dir[...]]>]\n");
+         printf("%s", $"      options:\n");
+         printf("%s", $"         [-noglobalsettings]\n");
+         printf("%s", $"         [-noresources]\n");
+         printf("%s", $"         [-d <intermediate objects directory>]\n");
+         printf("%s", $"         [-includemk <crossplatform.mk path>]\n");
       }
       else
       {
@@ -264,13 +274,15 @@ class epj2makeApp : GuiApplication
                   const char * compiler = getenv("COMPILER");
                   if(!compiler) compiler = "Default";
                   settingsContainer.Load();
+                  ideConfig.compilers.read(settingsContainer);
+
                   //incref ideSettings;
                   delete settingsContainer;
 
       // TODO: Command line option to choose between the two
       // or a command line option to not use global settings
       //defaultCompiler = MakeDefaultCompiler();
-                  defaultCompiler = ideSettings.GetCompilerConfig(compiler);
+                  defaultCompiler = ideConfig.compilers.GetCompilerConfig(compiler);
       // possible TODO: use the workspace to select the active compiler
       // TODO: option to specify compiler name when using global settings
                }