Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

epj2make: Selecting compiler from COMPILER environment variable

  • Loading branch information...
commit cc4224562ab3352cad6650283f64bdf71523946e 1 parent 997cab8
@jerstlouis jerstlouis authored
Showing with 7 additions and 5 deletions.
  1. +3 −1 epj2make/epj2make.ec
  2. +4 −4 epj2make/locale/epj2make.pot
View
4 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
}
View
8 epj2make/locale/epj2make.pot
@@ -78,15 +78,15 @@ msgstr " toolchain:\n"
msgid " epj2make [-t <target platform>] [-c <configuration>] [toolchain] [directories] [options] [-o <output>] <input>\n"
msgstr " epj2make [-t <target platform>] [-c <configuration>] [toolchain] [directories] [options] [-o <output>] <input>\n"
-#: ./epj2make.ec:376
+#: ./epj2make.ec:378
msgid "Error: Input file (%s) does not exist.\n"
msgstr "Error: Input file (%s) does not exist.\n"
-#: ./epj2make.ec:312
+#: ./epj2make.ec:314
msgid "Error: Project configuration (%s) was not found.\n"
msgstr "Error: Project configuration (%s) was not found.\n"
-#: ./epj2make.ec:372
+#: ./epj2make.ec:374
msgid "Error: Unable to open project file (%s) due to unknown error.\n"
msgstr "Error: Unable to open project file (%s) due to unknown error.\n"
@@ -106,7 +106,7 @@ msgstr "Microsoft Visual Studio 2008 (9.0) Compiler"
msgid "Microsoft Visual Studio 2010 (10.0) Compiler"
msgstr "Microsoft Visual Studio 2010 (10.0) Compiler"
-#: ./epj2make.ec:328
+#: ./epj2make.ec:330
msgid "Notice: Project configuration (%s) will be used.\n"
msgstr "Notice: Project configuration (%s) will be used.\n"
Please sign in to comment.
Something went wrong with that request. Please try again.