From 08c9529bfa456aab5b73186631af8de284431432 Mon Sep 17 00:00:00 2001
From: Jerome St-Louis <jerome@ecere.com>
Date: Thu, 4 Aug 2016 12:09:40 -0400
Subject: [PATCH] installer: Fixed crash on startup due to color schemes
 instantiated later

---
 installer/Installer.epj |  9 +++++++--
 installer/Makefile      | 20 ++++++++++----------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/installer/Installer.epj b/installer/Installer.epj
index 79be29b..50a6efe 100644
--- a/installer/Installer.epj
+++ b/installer/Installer.epj
@@ -64,13 +64,18 @@
    ],
    "Files" : [
       {
+         "Folder" : "ide",
+         "Files" : [
+            "../ide/src/IDESettings.ec",
+            "../ide/src/OldIDESettings.ec"
+         ]
+      },
+      {
          "Folder" : "src",
          "Files" : [
             "installer.ec"
          ]
       },
-      "../ide/src/IDESettings.ec",
-      "../ide/src/OldIDESettings.ec",
       "../extras/gui/controls/StringsBox.ec",
       "../ide/src/licensing.ec",
       "../extras/createLink.ec",
diff --git a/installer/Makefile b/installer/Makefile
index 5b0174f..da799e3 100644
--- a/installer/Makefile
+++ b/installer/Makefile
@@ -45,9 +45,9 @@ RES =
 TARGET = obj/$(CONFIG).$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/setup-ecere-0.44.15-win32$(E)
 
 _ECSOURCES = \
-	src/installer.ec \
 	../ide/src/IDESettings.ec \
 	../ide/src/OldIDESettings.ec \
+	src/installer.ec \
 	../extras/gui/controls/StringsBox.ec \
 	../ide/src/licensing.ec \
 	../extras/createLink.ec \
@@ -6566,15 +6566,15 @@ endif
 
 # SYMBOL RULES
 
-$(OBJ)installer.sym: src/installer.ec
-	$(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/installer.ec) -o $(call quote_path,$@)
-
 $(OBJ)IDESettings.sym: ../ide/src/IDESettings.ec
 	$(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,../ide/src/IDESettings.ec) -o $(call quote_path,$@)
 
 $(OBJ)OldIDESettings.sym: ../ide/src/OldIDESettings.ec
 	$(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,../ide/src/OldIDESettings.ec) -o $(call quote_path,$@)
 
+$(OBJ)installer.sym: src/installer.ec
+	$(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,src/installer.ec) -o $(call quote_path,$@)
+
 $(OBJ)StringsBox.sym: ../extras/gui/controls/StringsBox.ec
 	$(ECP) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) -c $(call quote_path,../extras/gui/controls/StringsBox.ec) -o $(call quote_path,$@)
 
@@ -6589,15 +6589,15 @@ $(OBJ)CheckListBox.sym: ../extras/gui/controls/CheckListBox.ec
 
 # C OBJECT RULES
 
-$(OBJ)installer.c: src/installer.ec $(OBJ)installer.sym | $(SYMBOLS)
-	$(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/installer.ec) -o $(call quote_path,$@) -symbols $(OBJ)
-
 $(OBJ)IDESettings.c: ../ide/src/IDESettings.ec $(OBJ)IDESettings.sym | $(SYMBOLS)
 	$(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,../ide/src/IDESettings.ec) -o $(call quote_path,$@) -symbols $(OBJ)
 
 $(OBJ)OldIDESettings.c: ../ide/src/OldIDESettings.ec $(OBJ)OldIDESettings.sym | $(SYMBOLS)
 	$(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,../ide/src/OldIDESettings.ec) -o $(call quote_path,$@) -symbols $(OBJ)
 
+$(OBJ)installer.c: src/installer.ec $(OBJ)installer.sym | $(SYMBOLS)
+	$(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,src/installer.ec) -o $(call quote_path,$@) -symbols $(OBJ)
+
 $(OBJ)StringsBox.c: ../extras/gui/controls/StringsBox.ec $(OBJ)StringsBox.sym | $(SYMBOLS)
 	$(ECC) $(CFLAGS) $(CECFLAGS) $(ECFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,../extras/gui/controls/StringsBox.ec) -o $(call quote_path,$@) -symbols $(OBJ)
 
@@ -6612,15 +6612,15 @@ $(OBJ)CheckListBox.c: ../extras/gui/controls/CheckListBox.ec $(OBJ)CheckListBox.
 
 # OBJECT RULES
 
-$(OBJ)installer.o: $(OBJ)installer.c
-	$(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)installer.c) -o $(call quote_path,$@)
-
 $(OBJ)IDESettings.o: $(OBJ)IDESettings.c
 	$(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)IDESettings.c) -o $(call quote_path,$@)
 
 $(OBJ)OldIDESettings.o: $(OBJ)OldIDESettings.c
 	$(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)OldIDESettings.c) -o $(call quote_path,$@)
 
+$(OBJ)installer.o: $(OBJ)installer.c
+	$(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)installer.c) -o $(call quote_path,$@)
+
 $(OBJ)StringsBox.o: $(OBJ)StringsBox.c
 	$(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(call quote_path,$(OBJ)StringsBox.c) -o $(call quote_path,$@)
 
-- 
1.8.3.1