installer: Don't make 32 bit GDB mandatory

[sdk] / installer / src / installer.ec

diff --git a/installer/src/installer.ec b/installer/src/installer.ec
index 1a83d2e..7b3eaf1 100644 (file)
--- a/installer/src/installer.ec
+++ b/installer/src/installer.ec
@@ -280,7 +280,7 @@ Component coreSDK[CoreSDKID] =
 
 public enum AdditionalID
 {
-   eda, eda32, vanilla, vanilla32, extras, upx, gnurx, gnurx32, /*pthreads, */cpp, /*w32api, */gcci18n, gdbi18n, makei18n, binutilsi18n, none
+   eda, eda32, vanilla, vanilla32, extras, upx, gnurx, gnurx32, /*pthreads, */cpp, /*w32api, gcci18n, gdbi18n, makei18n, binutilsi18n, */none
 };
 
 Component additional[AdditionalID] =
@@ -296,10 +296,11 @@ Component additional[AdditionalID] =
 //   { "pthreads",        "tdm/pthreads",                   "mingw",    null, false, true, minGWIncluded, none },
    { "C++ Compiler",    "tdm/gcc/c++",                   "tdm",    null, false, true, minGWIncluded, none },
 //   { "Win32 APIs",      "mingw/w32api",                  "mingw",    null, false, true, minGWIncluded, none },
-   { "GCC I18n",        "mingw/locale/gcc",              "tdm",    null, false, false, minGWIncluded, none },
+/*   { "GCC I18n",        "mingw/locale/gcc",              "tdm",    null, false, false, minGWIncluded, none },
    { "GDB I18n",        "mingw/locale/gdb",              "tdm",    null, false, false, minGWIncluded, none },
    { "Make I18n",       "mingw/locale/make",             "tdm",    null, false, false, minGWIncluded, none },
    { "Binutils I18n",   "mingw/locale/binutils",         "tdm",    null, false, false, minGWIncluded, none },
+*/
    { null }
 };
 
@@ -767,7 +768,7 @@ class Installer : Window
 
       if(component.mandatory)
       {
-         if(component.arch != bits32 || !osIS64bit || component == &coreSDK[gdb32])
+         if(component.arch != bits32 || !osIS64bit) // || component == &coreSDK[gdb32])
             componentsBox.SetDisabled(row, true);
          else
             component.selected = false;
@@ -856,11 +857,12 @@ class Installer : Window
          if(x86)
          {
             strcpy(installDir32, programFilesDir);
+            PathCat(installDir32, "Ecere SDK");
             osIS64bit = true;
 
             *x86 = 0;
-            PathCat(installDir, "Ecere SDK");
             strcpy(installDir, programFilesDir);
+            PathCat(installDir, "Ecere SDK");
          }
          else
          {