From 00c66521969e06f1f6d81c49b064150b50b8aba4 Mon Sep 17 00:00:00 2001 From: Jerome St-Louis Date: Mon, 5 Nov 2012 03:53:14 -0500 Subject: [PATCH] sdk/build system: Took out bad ifdef that was breaking CONSOLE --- compiler/ecc/Makefile | 2 -- compiler/ecp/Makefile | 2 -- compiler/ecs/Makefile | 2 -- compiler/libec/Makefile | 2 -- deps/freetype-2.3.12/Makefile | 2 -- deps/jpeg-6b/Makefile | 2 -- deps/libffi-3.0.11/Makefile | 2 -- deps/libpng-1.4.0/Makefile | 2 -- deps/libungif-4.1.1/Makefile | 2 -- deps/zlib/Makefile | 2 -- documentor/Makefile | 2 -- ear/cmd/Makefile | 2 -- ear/extract/Makefile | 2 -- ecere/Makefile | 2 -- ecere/Makefile.ecereCOM | 2 -- ecere/Makefile.vanilla | 2 -- eda/drivers/sqlite/Makefile | 2 -- eda/drivers/sqliteCipher/Makefile | 2 -- eda/libeda/Makefile | 2 -- epj2make/Makefile | 2 -- ide/Makefile | 2 -- ide/src/project/Project.ec | 5 +++-- 22 files changed, 3 insertions(+), 44 deletions(-) diff --git a/compiler/ecc/Makefile b/compiler/ecc/Makefile index 4c5084f..d5345db 100755 --- a/compiler/ecc/Makefile +++ b/compiler/ecc/Makefile @@ -25,9 +25,7 @@ ifdef DEBUG NOSTRIP := y endif -ifdef EXECUTABLE_TARGET CONSOLE = -mconsole -endif # INCLUDES diff --git a/compiler/ecp/Makefile b/compiler/ecp/Makefile index 0bbf9c2..e7f5b46 100755 --- a/compiler/ecp/Makefile +++ b/compiler/ecp/Makefile @@ -25,9 +25,7 @@ ifdef DEBUG NOSTRIP := y endif -ifdef EXECUTABLE_TARGET CONSOLE = -mconsole -endif # INCLUDES diff --git a/compiler/ecs/Makefile b/compiler/ecs/Makefile index f019bfb..6e1f749 100755 --- a/compiler/ecs/Makefile +++ b/compiler/ecs/Makefile @@ -25,9 +25,7 @@ ifdef DEBUG NOSTRIP := y endif -ifdef EXECUTABLE_TARGET CONSOLE = -mconsole -endif # INCLUDES diff --git a/compiler/libec/Makefile b/compiler/libec/Makefile index 37628a3..6db96a4 100755 --- a/compiler/libec/Makefile +++ b/compiler/libec/Makefile @@ -26,9 +26,7 @@ ifdef DEBUG NOSTRIP := y endif -ifdef EXECUTABLE_TARGET CONSOLE = -mwindows -endif # INCLUDES diff --git a/deps/freetype-2.3.12/Makefile b/deps/freetype-2.3.12/Makefile index bc02126..dcfc7aa 100755 --- a/deps/freetype-2.3.12/Makefile +++ b/deps/freetype-2.3.12/Makefile @@ -25,9 +25,7 @@ ifdef DEBUG NOSTRIP := y endif -ifdef EXECUTABLE_TARGET CONSOLE = -mwindows -endif # INCLUDES diff --git a/deps/jpeg-6b/Makefile b/deps/jpeg-6b/Makefile index 51ec4f1..8ec4838 100755 --- a/deps/jpeg-6b/Makefile +++ b/deps/jpeg-6b/Makefile @@ -25,9 +25,7 @@ ifdef DEBUG NOSTRIP := y endif -ifdef EXECUTABLE_TARGET CONSOLE = -mwindows -endif # INCLUDES diff --git a/deps/libffi-3.0.11/Makefile b/deps/libffi-3.0.11/Makefile index 024c584..602e55b 100755 --- a/deps/libffi-3.0.11/Makefile +++ b/deps/libffi-3.0.11/Makefile @@ -25,9 +25,7 @@ ifdef DEBUG NOSTRIP := y endif -ifdef EXECUTABLE_TARGET CONSOLE = -mwindows -endif # INCLUDES diff --git a/deps/libpng-1.4.0/Makefile b/deps/libpng-1.4.0/Makefile index dd374bf..83dce21 100755 --- a/deps/libpng-1.4.0/Makefile +++ b/deps/libpng-1.4.0/Makefile @@ -25,9 +25,7 @@ ifdef DEBUG NOSTRIP := y endif -ifdef EXECUTABLE_TARGET CONSOLE = -mwindows -endif # INCLUDES diff --git a/deps/libungif-4.1.1/Makefile b/deps/libungif-4.1.1/Makefile index 379d34a..fe018da 100755 --- a/deps/libungif-4.1.1/Makefile +++ b/deps/libungif-4.1.1/Makefile @@ -25,9 +25,7 @@ ifdef DEBUG NOSTRIP := y endif -ifdef EXECUTABLE_TARGET CONSOLE = -mwindows -endif # INCLUDES diff --git a/deps/zlib/Makefile b/deps/zlib/Makefile index 128861d..81ae7c4 100755 --- a/deps/zlib/Makefile +++ b/deps/zlib/Makefile @@ -25,9 +25,7 @@ ifdef DEBUG NOSTRIP := y endif -ifdef EXECUTABLE_TARGET CONSOLE = -mwindows -endif # INCLUDES diff --git a/documentor/Makefile b/documentor/Makefile index cfeff4b..5a00d0a 100755 --- a/documentor/Makefile +++ b/documentor/Makefile @@ -25,9 +25,7 @@ ifdef DEBUG NOSTRIP := y endif -ifdef EXECUTABLE_TARGET CONSOLE = -mwindows -endif # INCLUDES diff --git a/ear/cmd/Makefile b/ear/cmd/Makefile index 8a65483..b369783 100755 --- a/ear/cmd/Makefile +++ b/ear/cmd/Makefile @@ -25,9 +25,7 @@ ifdef DEBUG NOSTRIP := y endif -ifdef EXECUTABLE_TARGET CONSOLE = -mconsole -endif # INCLUDES diff --git a/ear/extract/Makefile b/ear/extract/Makefile index db351be..9ba18a9 100755 --- a/ear/extract/Makefile +++ b/ear/extract/Makefile @@ -25,9 +25,7 @@ ifdef DEBUG NOSTRIP := y endif -ifdef EXECUTABLE_TARGET CONSOLE = -mwindows -endif # INCLUDES diff --git a/ecere/Makefile b/ecere/Makefile index 5b181c7..92cc82b 100755 --- a/ecere/Makefile +++ b/ecere/Makefile @@ -25,9 +25,7 @@ ifdef DEBUG NOSTRIP := y endif -ifdef EXECUTABLE_TARGET CONSOLE = -mwindows -endif # INCLUDES diff --git a/ecere/Makefile.ecereCOM b/ecere/Makefile.ecereCOM index a44012b..0a37df5 100755 --- a/ecere/Makefile.ecereCOM +++ b/ecere/Makefile.ecereCOM @@ -25,9 +25,7 @@ ifdef DEBUG NOSTRIP := y endif -ifdef EXECUTABLE_TARGET CONSOLE = -mwindows -endif # INCLUDES diff --git a/ecere/Makefile.vanilla b/ecere/Makefile.vanilla index 07b35c2..7d3e1fa 100755 --- a/ecere/Makefile.vanilla +++ b/ecere/Makefile.vanilla @@ -25,9 +25,7 @@ ifdef DEBUG NOSTRIP := y endif -ifdef EXECUTABLE_TARGET CONSOLE = -mwindows -endif # INCLUDES diff --git a/eda/drivers/sqlite/Makefile b/eda/drivers/sqlite/Makefile index f36603d..1b7ccf6 100755 --- a/eda/drivers/sqlite/Makefile +++ b/eda/drivers/sqlite/Makefile @@ -25,9 +25,7 @@ ifdef DEBUG NOSTRIP := y endif -ifdef EXECUTABLE_TARGET CONSOLE = -mwindows -endif # INCLUDES diff --git a/eda/drivers/sqliteCipher/Makefile b/eda/drivers/sqliteCipher/Makefile index 5deb926..d7964d6 100755 --- a/eda/drivers/sqliteCipher/Makefile +++ b/eda/drivers/sqliteCipher/Makefile @@ -25,9 +25,7 @@ ifdef DEBUG NOSTRIP := y endif -ifdef EXECUTABLE_TARGET CONSOLE = -mwindows -endif # INCLUDES diff --git a/eda/libeda/Makefile b/eda/libeda/Makefile index b79dbca..686d4fb 100755 --- a/eda/libeda/Makefile +++ b/eda/libeda/Makefile @@ -25,9 +25,7 @@ ifdef DEBUG NOSTRIP := y endif -ifdef EXECUTABLE_TARGET CONSOLE = -mwindows -endif # INCLUDES diff --git a/epj2make/Makefile b/epj2make/Makefile index c4ffbb8..fd1f3d3 100755 --- a/epj2make/Makefile +++ b/epj2make/Makefile @@ -25,9 +25,7 @@ ifdef DEBUG NOSTRIP := y endif -ifdef EXECUTABLE_TARGET CONSOLE = -mconsole -endif # INCLUDES diff --git a/ide/Makefile b/ide/Makefile index 3d2b261..6181ce7 100755 --- a/ide/Makefile +++ b/ide/Makefile @@ -25,9 +25,7 @@ ifdef DEBUG NOSTRIP := y endif -ifdef EXECUTABLE_TARGET CONSOLE = -mwindows -endif # INCLUDES diff --git a/ide/src/project/Project.ec b/ide/src/project/Project.ec index 118b9c2..61b64bc 100755 --- a/ide/src/project/Project.ec +++ b/ide/src/project/Project.ec @@ -2263,9 +2263,10 @@ private: f.Puts("ifdef DEBUG\n" "NOSTRIP := y\n" "endif\n"); f.Puts("\n"); - f.Puts("ifdef EXECUTABLE_TARGET\n"); + // Important: We cannot use this ifdef anymore, EXECUTABLE_TARGET is not yet defined. It's embedded in the crossplatform.mk EXECUTABLE + //f.Puts("ifdef EXECUTABLE_TARGET\n"); f.Printf("CONSOLE = %s\n", GetConsole(config) ? "-mconsole" : "-mwindows"); - f.Puts("endif\n"); + //f.Puts("endif\n"); f.Puts("\n"); f.Puts("# INCLUDES\n\n"); -- 1.8.3.1