ide/Settings: Changed default C preprocessor to 'gcc' instead of 'cpp' (as per #624)

diff --git a/ide/locale/ide.pot b/ide/locale/ide.pot
index 7c2e221..b8c09e8 100644 (file)
--- a/ide/locale/ide.pot
+++ b/ide/locale/ide.pot
@@ -14,7 +14,7 @@ msgstr ""
 msgid "   %s: No such file or directory\n"
 msgstr "   %s: No such file or directory\n"
 
-#: ./src/dialogs/GlobalSettingsDialog.ec:458
+#: ./src/dialogs/GlobalSettingsDialog.ec:459
 msgid " Compiler Configuration"
 msgstr " Compiler Configuration"
 
@@ -42,7 +42,7 @@ msgstr " and its sub directories"
 msgid " before search was aborted"
 msgstr " before search was aborted"
 
-#: ./src/dialogs/GlobalSettingsDialog.ec:459
+#: ./src/dialogs/GlobalSettingsDialog.ec:460
 msgid " compiler configuration?"
 msgstr " compiler configuration?"
 
@@ -259,7 +259,7 @@ msgstr "Are you sure you want to remove the \"%s\" project\nfrom this workspace?
 msgid "Are you sure you want to remove the folder \"%s\"\nand all of its contents from the project?"
 msgstr "Are you sure you want to remove the folder \"%s\"\nand all of its contents from the project?"
 
-#: ./src/dialogs/GlobalSettingsDialog.ec:459
+#: ./src/dialogs/GlobalSettingsDialog.ec:460
 #: ./src/ProjectSettings.ec:1295
 msgid "Are you sure you wish to delete the "
 msgstr "Are you sure you wish to delete the "
@@ -345,15 +345,15 @@ msgstr "Building library...\n"
 msgid "Building project %s using the %s configuration...\n"
 msgstr "Building project %s using the %s configuration...\n"
 
-#: ./src/dialogs/GlobalSettingsDialog.ec:718
+#: ./src/dialogs/GlobalSettingsDialog.ec:719
 msgid "C Compiler"
 msgstr "C Compiler"
 
-#: ./src/dialogs/GlobalSettingsDialog.ec:712
+#: ./src/dialogs/GlobalSettingsDialog.ec:713
 msgid "C Preprocessor"
 msgstr "C Preprocessor"
 
-#: ./src/dialogs/GlobalSettingsDialog.ec:724
+#: ./src/dialogs/GlobalSettingsDialog.ec:725
 msgid "C++ Compiler"
 msgstr "C++ Compiler"
 
@@ -459,17 +459,17 @@ msgstr "Compile %s"
 msgid "Compiler"
 msgstr "Compiler"
 
-#: ./src/dialogs/GlobalSettingsDialog.ec:282
+#: ./src/dialogs/GlobalSettingsDialog.ec:283
 #: ./src/dialogs/ProjectTabSettings.ec:22
 msgid "Compiler Configurations Directory"
 msgstr "Compiler Configurations Directory"
 
-#: ./src/dialogs/GlobalSettingsDialog.ec:287
+#: ./src/dialogs/GlobalSettingsDialog.ec:288
 msgid "Compiler Configurations:"
 msgstr "Compiler Configurations:"
 
 #: ./src/dialogs/CompilersDetectionDialog.ec:115
-#: ./src/dialogs/GlobalSettingsDialog.ec:276
+#: ./src/dialogs/GlobalSettingsDialog.ec:277
 msgid "Compilers"
 msgstr "Compilers"
 
@@ -582,11 +582,11 @@ msgstr "Debugging compressed applications is not supported\n"
 msgid "Debugging stopped\n"
 msgstr "Debugging stopped\n"
 
-#: ./src/dialogs/GlobalSettingsDialog.ec:1108
+#: ./src/dialogs/GlobalSettingsDialog.ec:1109
 msgid "Default Compiler"
 msgstr "Default Compiler"
 
-#: ./src/dialogs/GlobalSettingsDialog.ec:1073
+#: ./src/dialogs/GlobalSettingsDialog.ec:1074
 msgid "Default Intermediate Objects Directory"
 msgstr "Default Intermediate Objects Directory"
 
@@ -594,7 +594,7 @@ msgstr "Default Intermediate Objects Directory"
 msgid "Default Name Space"
 msgstr "Default Name Space"
 
-#: ./src/dialogs/GlobalSettingsDialog.ec:1060
+#: ./src/dialogs/GlobalSettingsDialog.ec:1061
 msgid "Default Target Directory"
 msgstr "Default Target Directory"
 
@@ -602,7 +602,7 @@ msgstr "Default Target Directory"
 msgid "Delete"
 msgstr "Delete"
 
-#: ./src/dialogs/GlobalSettingsDialog.ec:458
+#: ./src/dialogs/GlobalSettingsDialog.ec:459
 #: ./src/ProjectSettings.ec:1294
 msgid "Delete "
 msgstr "Delete "
@@ -637,7 +637,7 @@ msgstr "Designer"
 msgid "Detach"
 msgstr "Detach"
 
-#: ./src/dialogs/GlobalSettingsDialog.ec:572
+#: ./src/dialogs/GlobalSettingsDialog.ec:573
 msgid "Directories"
 msgstr "Directories"
 
@@ -666,7 +666,7 @@ msgstr "Document has been modified"
 msgid "ECERE IDE"
 msgstr "ECERE IDE"
 
-#: ./src/dialogs/GlobalSettingsDialog.ec:706
+#: ./src/dialogs/GlobalSettingsDialog.ec:707
 msgid "Ecere Archiver"
 msgstr "Ecere Archiver"
 
@@ -686,7 +686,7 @@ msgstr "Ecere IDE Workspace"
 msgid "Edit"
 msgstr "Edit"
 
-#: ./src/dialogs/GlobalSettingsDialog.ec:232
+#: ./src/dialogs/GlobalSettingsDialog.ec:233
 msgid "Editor"
 msgstr "Editor"
 
@@ -694,11 +694,11 @@ msgstr "Editor"
 msgid "Empty string"
 msgstr "Empty string"
 
-#: ./src/dialogs/GlobalSettingsDialog.ec:801
+#: ./src/dialogs/GlobalSettingsDialog.ec:802
 msgid "Environment"
 msgstr "Environment"
 
-#: ./src/dialogs/GlobalSettingsDialog.ec:807
+#: ./src/dialogs/GlobalSettingsDialog.ec:808
 #: ./src/dialogs/WorkspaceSettings.ec:29
 msgid "Environment Variables"
 msgstr "Environment Variables"
@@ -746,11 +746,11 @@ msgstr "Exclude from Build"
 msgid "Executable"
 msgstr "Executable"
 
-#: ./src/dialogs/GlobalSettingsDialog.ec:567
+#: ./src/dialogs/GlobalSettingsDialog.ec:568
 msgid "Executable Files"
 msgstr "Executable Files"
 
-#: ./src/dialogs/GlobalSettingsDialog.ec:736
+#: ./src/dialogs/GlobalSettingsDialog.ec:737
 msgid "Execution Prefix"
 msgstr "Execution Prefix"
 
@@ -881,7 +881,7 @@ msgstr "GIF Image"
 msgid "GNU Compiler Collection (GCC) / GNU Make"
 msgstr "GNU Compiler Collection (GCC) / GNU Make"
 
-#: ./src/dialogs/GlobalSettingsDialog.ec:730
+#: ./src/dialogs/GlobalSettingsDialog.ec:731
 msgid "GNU Make"
 msgstr "GNU Make"
 
@@ -978,7 +978,7 @@ msgstr "Import Folder"
 msgid "Import Folder..."
 msgstr "Import Folder..."
 
-#: ./src/dialogs/GlobalSettingsDialog.ec:564
+#: ./src/dialogs/GlobalSettingsDialog.ec:565
 msgid "Include Files"
 msgstr "Include Files"
 
@@ -1029,7 +1029,7 @@ msgstr "It can't be compiled."
 msgid "JPG Image"
 msgstr "JPG Image"
 
-#: ./src/dialogs/GlobalSettingsDialog.ec:242
+#: ./src/dialogs/GlobalSettingsDialog.ec:243
 msgid "Keep caret visible (move along) when scrolling"
 msgstr "Keep caret visible (move along) when scrolling"
 
@@ -1037,11 +1037,11 @@ msgstr "Keep caret visible (move along) when scrolling"
 msgid "Lead Architect and Developer"
 msgstr "Lead Architect and Developer"
 
-#: ./src/dialogs/GlobalSettingsDialog.ec:957
+#: ./src/dialogs/GlobalSettingsDialog.ec:958
 msgid "Libraries to exclude:"
 msgstr "Libraries to exclude:"
 
-#: ./src/dialogs/GlobalSettingsDialog.ec:565
+#: ./src/dialogs/GlobalSettingsDialog.ec:566
 msgid "Library Files"
 msgstr "Library Files"
 
@@ -1145,7 +1145,7 @@ msgstr "Mode"
 msgid "Module Name"
 msgstr "Module Name"
 
-#: ./src/dialogs/GlobalSettingsDialog.ec:236
+#: ./src/dialogs/GlobalSettingsDialog.ec:237
 msgid "Move code editor caret freely past end of line"
 msgstr "Move code editor caret freely past end of line"
 
@@ -1235,7 +1235,7 @@ msgstr "Null string"
 msgid "Null type for \"%s\""
 msgstr "Null type for \"%s\""
 
-#: ./src/dialogs/GlobalSettingsDialog.ec:861
+#: ./src/dialogs/GlobalSettingsDialog.ec:862
 msgid "Number of parallel build jobs"
 msgstr "Number of parallel build jobs"
 
@@ -1297,7 +1297,7 @@ msgstr "Open..."
 msgid "Optimization"
 msgstr "Optimization"
 
-#: ./src/dialogs/GlobalSettingsDialog.ec:837
+#: ./src/dialogs/GlobalSettingsDialog.ec:838
 msgid "Options"
 msgstr "Options"
 
@@ -1353,7 +1353,7 @@ msgstr "Pre-build Commands"
 msgid "Preprocessor Definitions"
 msgstr "Preprocessor Definitions"
 
-#: ./src/dialogs/GlobalSettingsDialog.ec:976
+#: ./src/dialogs/GlobalSettingsDialog.ec:977
 msgid "Preprocessor directives:"
 msgstr "Preprocessor directives:"
 
@@ -1370,7 +1370,7 @@ msgctxt "Menu"
 msgid "Project"
 msgstr "Project"
 
-#: ./src/dialogs/GlobalSettingsDialog.ec:1054
+#: ./src/dialogs/GlobalSettingsDialog.ec:1055
 #: ./src/dialogs/ProjectTabSettings.ec:8
 msgid "Project"
 msgstr "Project"
@@ -1705,7 +1705,7 @@ msgstr "Shared and static libraries cannot be run like executables."
 msgid "Sheet"
 msgstr "Sheet"
 
-#: ./src/dialogs/GlobalSettingsDialog.ec:248
+#: ./src/dialogs/GlobalSettingsDialog.ec:249
 msgid "Show line numbers in code editor"
 msgstr "Show line numbers in code editor"
 
@@ -1806,7 +1806,7 @@ msgstr "Target Directory"
 msgid "Target Name"
 msgstr "Target Name"
 
-#: ./src/dialogs/GlobalSettingsDialog.ec:843
+#: ./src/dialogs/GlobalSettingsDialog.ec:844
 msgid "Target Platform"
 msgstr "Target Platform"
 
@@ -1919,7 +1919,7 @@ msgstr "Toggle Breakpoint"
 msgid "Toolbox"
 msgstr "Toolbox"
 
-#: ./src/dialogs/GlobalSettingsDialog.ec:682
+#: ./src/dialogs/GlobalSettingsDialog.ec:683
 msgid "Toolchain"
 msgstr "Toolchain"
 
@@ -1965,11 +1965,11 @@ msgstr "Untitled %d"
 msgid "Updating "
 msgstr "Updating "
 
-#: ./src/dialogs/GlobalSettingsDialog.ec:900
+#: ./src/dialogs/GlobalSettingsDialog.ec:901
 msgid "Use ccache"
 msgstr "Use ccache"
 
-#: ./src/dialogs/GlobalSettingsDialog.ec:918
+#: ./src/dialogs/GlobalSettingsDialog.ec:919
 msgid "Use distcc"
 msgstr "Use distcc"
 
@@ -2038,7 +2038,7 @@ msgid "With contributions from..."
 msgstr "With contributions from..."
 
 #: ./src/dialogs/FindInFilesDialog.ec:441
-#: ./src/dialogs/GlobalSettingsDialog.ec:1102
+#: ./src/dialogs/GlobalSettingsDialog.ec:1103
 #: ./src/dialogs/WorkspaceSettings.ec:6
 msgid "Workspace"
 msgstr "Workspace"
@@ -2092,11 +2092,11 @@ msgstr "You must specify a search location."
 msgid "\nBuild cancelled by user.\n"
 msgstr "\nBuild cancelled by user.\n"
 
-#: ./src/dialogs/GlobalSettingsDialog.ec:938
+#: ./src/dialogs/GlobalSettingsDialog.ec:939
 msgid "distcc hosts"
 msgstr "distcc hosts"
 
-#: ./src/dialogs/GlobalSettingsDialog.ec:694
+#: ./src/dialogs/GlobalSettingsDialog.ec:695
 msgid "eC Compiler"
 msgstr "eC Compiler"
 
@@ -2104,7 +2104,7 @@ msgstr "eC Compiler"
 msgid "eC Files (*.ec, *.eh)"
 msgstr "eC Files (*.ec, *.eh)"
 
-#: ./src/dialogs/GlobalSettingsDialog.ec:688
+#: ./src/dialogs/GlobalSettingsDialog.ec:689
 msgid "eC Precompiler"
 msgstr "eC Precompiler"
 
@@ -2112,7 +2112,7 @@ msgstr "eC Precompiler"
 msgid "eC Source Code"
 msgstr "eC Source Code"
 
-#: ./src/dialogs/GlobalSettingsDialog.ec:700
+#: ./src/dialogs/GlobalSettingsDialog.ec:701
 msgid "eC Symbol Loader"
 msgstr "eC Symbol Loader"
 

diff --git a/ide/src/OldIDESettings.ec b/ide/src/OldIDESettings.ec
index 8a747b8..2371ae1 100644 (file)
--- a/ide/src/OldIDESettings.ec
+++ b/ide/src/OldIDESettings.ec
@@ -24,7 +24,7 @@ define ecpDefaultCommand = "ecp";
 define eccDefaultCommand = "ecc";
 define ecsDefaultCommand = "ecs";
 define earDefaultCommand = "ear";
-define cppDefaultCommand = "cpp";
+define cppDefaultCommand = "gcc"; // As per #624 we decided to default to "gcc"... "cpp";
 define ccDefaultCommand = "gcc";
 define cxxDefaultCommand = "g++";