build system: reverted to using immediate assignment instead of deffered for EXECUTAB...
authorRejean Loyer <rejean.loyer@gmail.com>
Wed, 18 Apr 2012 13:36:49 +0000 (09:36 -0400)
committerRejean Loyer <rejean.loyer@gmail.com>
Wed, 30 May 2012 21:56:30 +0000 (17:56 -0400)
crossplatform.mk
ide/src/project/Project.ec

index 89f18e2..db82707 100644 (file)
@@ -137,9 +137,9 @@ ifdef WINDOWS
    FVISIBILITY :=
    FPIC :=
 ifeq "$(TARGET_TYPE)" "executable"
-   EXECUTABLE = $(CONSOLE)
+   EXECUTABLE := $(CONSOLE)
 else
-   EXECUTABLE =
+   EXECUTABLE :=
 endif
 else
    FVISIBILITY := -fvisibility=hidden
index bc5b343..7b0bab6 100644 (file)
@@ -2011,6 +2011,10 @@ private:
          }
          f.Printf("\n");
 
+         f.Printf("ifeq \"$(TARGET_TYPE)\" \"%s\"\n", TargetTypeToMakefileVariable(executable));
+         f.Printf("CONSOLE = %s\n", GetConsole(config) ? "-mconsole" : "-mwindows");
+         f.Printf("endif\n\n");
+
          f.Printf("# FLAGS\n\n");
 
          f.Printf("CFLAGS =\n");
@@ -2128,10 +2132,6 @@ private:
             resNode.GenMakefilePrintNode(f, this, resources, null, listItems, config);
          OutputFileList(f, "RESOURCES", listItems, varStringLenDiffs, null);
 
-         f.Printf("ifeq \"$(TARGET_TYPE)\" \"%s\"\n", TargetTypeToMakefileVariable(executable));
-         f.Printf("CONSOLE = %s\n", GetConsole(config) ? "-mconsole" : "-mwindows");
-         f.Printf("endif\n\n");
-
          f.Printf("LIBS += $(SHAREDLIB) $(EXECUTABLE) $(LINKOPT)\n\n");
          if((config && config.options && config.options.libraries) ||
                (options && options.libraries))