sdk/Build System: Solved the $(CPP) space issues

[sdk] / epj2make / epj2make.ec

diff --git a/epj2make/epj2make.ec b/epj2make/epj2make.ec
index ab2b2f2..920d1c0 100644 (file)
--- a/epj2make/epj2make.ec
+++ b/epj2make/epj2make.ec
@@ -259,6 +259,8 @@ class epj2makeApp : GuiApplication
                }
                else
                {
+                  char * compiler = getenv("COMPILER");
+                  if(!compiler) compiler = "Default";
                   settingsContainer.Load();
                   //incref ideSettings;
                   delete settingsContainer;
@@ -266,7 +268,7 @@ class epj2makeApp : GuiApplication
       // TODO: Command line option to choose between the two
       // or a command line option to not use global settings 
       //defaultCompiler = MakeDefaultCompiler();
-                  defaultCompiler = ideSettings.GetCompilerConfig("Default");
+                  defaultCompiler = ideSettings.GetCompilerConfig(compiler);
       // possible TODO: use the workspace to select the active compiler
       // TODO: option to specify compiler name when using global settings
                }
@@ -292,7 +294,7 @@ class epj2makeApp : GuiApplication
                   defaultCompiler.libraryDirs.Add(dir);
                delete optionsCompiler;
 
-               project = LoadProject(epjPath);
+               project = LoadProject(epjPath, null);
                if(project)
                {
                   ProjectConfig defaultConfig = null;
@@ -353,8 +355,8 @@ class epj2makeApp : GuiApplication
                   }
                   if(valid)
                   {
-                     project.GenerateCompilerMk(defaultCompiler);
-                     project.GenerateCrossPlatformCf();
+                     project.GenerateCompilerCf(defaultCompiler);
+                     project.GenerateCrossPlatformMk();
                      if(project.GenerateMakefile(makePath, noResources, includemkPath, project.config))
                      {
                         if(makePath)