Ecere Software
/
sdk
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
962e2bf
)
sdk/build system: Took out bad ifdef that was breaking CONSOLE
author
Jerome St-Louis
<jerome@ecere.com>
Mon, 5 Nov 2012 08:53:14 +0000
(
03:53
-0500)
committer
Jerome St-Louis
<jerome@ecere.com>
Mon, 5 Nov 2012 08:53:14 +0000
(
03:53
-0500)
22 files changed:
compiler/ecc/Makefile
patch
|
blob
|
history
compiler/ecp/Makefile
patch
|
blob
|
history
compiler/ecs/Makefile
patch
|
blob
|
history
compiler/libec/Makefile
patch
|
blob
|
history
deps/freetype-2.3.12/Makefile
patch
|
blob
|
history
deps/jpeg-6b/Makefile
patch
|
blob
|
history
deps/libffi-3.0.11/Makefile
patch
|
blob
|
history
deps/libpng-1.4.0/Makefile
patch
|
blob
|
history
deps/libungif-4.1.1/Makefile
patch
|
blob
|
history
deps/zlib/Makefile
patch
|
blob
|
history
documentor/Makefile
patch
|
blob
|
history
ear/cmd/Makefile
patch
|
blob
|
history
ear/extract/Makefile
patch
|
blob
|
history
ecere/Makefile
patch
|
blob
|
history
ecere/Makefile.ecereCOM
patch
|
blob
|
history
ecere/Makefile.vanilla
patch
|
blob
|
history
eda/drivers/sqlite/Makefile
patch
|
blob
|
history
eda/drivers/sqliteCipher/Makefile
patch
|
blob
|
history
eda/libeda/Makefile
patch
|
blob
|
history
epj2make/Makefile
patch
|
blob
|
history
ide/Makefile
patch
|
blob
|
history
ide/src/project/Project.ec
patch
|
blob
|
history
diff --git
a/compiler/ecc/Makefile
b/compiler/ecc/Makefile
index
4c5084f
..
d5345db
100755
(executable)
--- a/
compiler/ecc/Makefile
+++ b/
compiler/ecc/Makefile
@@
-25,9
+25,7
@@
ifdef DEBUG
NOSTRIP := y
endif
NOSTRIP := y
endif
-ifdef EXECUTABLE_TARGET
CONSOLE = -mconsole
CONSOLE = -mconsole
-endif
# INCLUDES
# INCLUDES
diff --git
a/compiler/ecp/Makefile
b/compiler/ecp/Makefile
index
0bbf9c2
..
e7f5b46
100755
(executable)
--- a/
compiler/ecp/Makefile
+++ b/
compiler/ecp/Makefile
@@
-25,9
+25,7
@@
ifdef DEBUG
NOSTRIP := y
endif
NOSTRIP := y
endif
-ifdef EXECUTABLE_TARGET
CONSOLE = -mconsole
CONSOLE = -mconsole
-endif
# INCLUDES
# INCLUDES
diff --git
a/compiler/ecs/Makefile
b/compiler/ecs/Makefile
index
f019bfb
..
6e1f749
100755
(executable)
--- a/
compiler/ecs/Makefile
+++ b/
compiler/ecs/Makefile
@@
-25,9
+25,7
@@
ifdef DEBUG
NOSTRIP := y
endif
NOSTRIP := y
endif
-ifdef EXECUTABLE_TARGET
CONSOLE = -mconsole
CONSOLE = -mconsole
-endif
# INCLUDES
# INCLUDES
diff --git
a/compiler/libec/Makefile
b/compiler/libec/Makefile
index
37628a3
..
6db96a4
100755
(executable)
--- a/
compiler/libec/Makefile
+++ b/
compiler/libec/Makefile
@@
-26,9
+26,7
@@
ifdef DEBUG
NOSTRIP := y
endif
NOSTRIP := y
endif
-ifdef EXECUTABLE_TARGET
CONSOLE = -mwindows
CONSOLE = -mwindows
-endif
# INCLUDES
# INCLUDES
diff --git
a/deps/freetype-2.3.12/Makefile
b/deps/freetype-2.3.12/Makefile
index
bc02126
..
dcfc7aa
100755
(executable)
--- a/
deps/freetype-2.3.12/Makefile
+++ b/
deps/freetype-2.3.12/Makefile
@@
-25,9
+25,7
@@
ifdef DEBUG
NOSTRIP := y
endif
NOSTRIP := y
endif
-ifdef EXECUTABLE_TARGET
CONSOLE = -mwindows
CONSOLE = -mwindows
-endif
# INCLUDES
# INCLUDES
diff --git
a/deps/jpeg-6b/Makefile
b/deps/jpeg-6b/Makefile
index
51ec4f1
..
8ec4838
100755
(executable)
--- a/
deps/jpeg-6b/Makefile
+++ b/
deps/jpeg-6b/Makefile
@@
-25,9
+25,7
@@
ifdef DEBUG
NOSTRIP := y
endif
NOSTRIP := y
endif
-ifdef EXECUTABLE_TARGET
CONSOLE = -mwindows
CONSOLE = -mwindows
-endif
# INCLUDES
# INCLUDES
diff --git
a/deps/libffi-3.0.11/Makefile
b/deps/libffi-3.0.11/Makefile
index
024c584
..
602e55b
100755
(executable)
--- a/
deps/libffi-3.0.11/Makefile
+++ b/
deps/libffi-3.0.11/Makefile
@@
-25,9
+25,7
@@
ifdef DEBUG
NOSTRIP := y
endif
NOSTRIP := y
endif
-ifdef EXECUTABLE_TARGET
CONSOLE = -mwindows
CONSOLE = -mwindows
-endif
# INCLUDES
# INCLUDES
diff --git
a/deps/libpng-1.4.0/Makefile
b/deps/libpng-1.4.0/Makefile
index
dd374bf
..
83dce21
100755
(executable)
--- a/
deps/libpng-1.4.0/Makefile
+++ b/
deps/libpng-1.4.0/Makefile
@@
-25,9
+25,7
@@
ifdef DEBUG
NOSTRIP := y
endif
NOSTRIP := y
endif
-ifdef EXECUTABLE_TARGET
CONSOLE = -mwindows
CONSOLE = -mwindows
-endif
# INCLUDES
# INCLUDES
diff --git
a/deps/libungif-4.1.1/Makefile
b/deps/libungif-4.1.1/Makefile
index
379d34a
..
fe018da
100755
(executable)
--- a/
deps/libungif-4.1.1/Makefile
+++ b/
deps/libungif-4.1.1/Makefile
@@
-25,9
+25,7
@@
ifdef DEBUG
NOSTRIP := y
endif
NOSTRIP := y
endif
-ifdef EXECUTABLE_TARGET
CONSOLE = -mwindows
CONSOLE = -mwindows
-endif
# INCLUDES
# INCLUDES
diff --git
a/deps/zlib/Makefile
b/deps/zlib/Makefile
index
128861d
..
81ae7c4
100755
(executable)
--- a/
deps/zlib/Makefile
+++ b/
deps/zlib/Makefile
@@
-25,9
+25,7
@@
ifdef DEBUG
NOSTRIP := y
endif
NOSTRIP := y
endif
-ifdef EXECUTABLE_TARGET
CONSOLE = -mwindows
CONSOLE = -mwindows
-endif
# INCLUDES
# INCLUDES
diff --git
a/documentor/Makefile
b/documentor/Makefile
index
cfeff4b
..
5a00d0a
100755
(executable)
--- a/
documentor/Makefile
+++ b/
documentor/Makefile
@@
-25,9
+25,7
@@
ifdef DEBUG
NOSTRIP := y
endif
NOSTRIP := y
endif
-ifdef EXECUTABLE_TARGET
CONSOLE = -mwindows
CONSOLE = -mwindows
-endif
# INCLUDES
# INCLUDES
diff --git
a/ear/cmd/Makefile
b/ear/cmd/Makefile
index
8a65483
..
b369783
100755
(executable)
--- a/
ear/cmd/Makefile
+++ b/
ear/cmd/Makefile
@@
-25,9
+25,7
@@
ifdef DEBUG
NOSTRIP := y
endif
NOSTRIP := y
endif
-ifdef EXECUTABLE_TARGET
CONSOLE = -mconsole
CONSOLE = -mconsole
-endif
# INCLUDES
# INCLUDES
diff --git
a/ear/extract/Makefile
b/ear/extract/Makefile
index
db351be
..
9ba18a9
100755
(executable)
--- a/
ear/extract/Makefile
+++ b/
ear/extract/Makefile
@@
-25,9
+25,7
@@
ifdef DEBUG
NOSTRIP := y
endif
NOSTRIP := y
endif
-ifdef EXECUTABLE_TARGET
CONSOLE = -mwindows
CONSOLE = -mwindows
-endif
# INCLUDES
# INCLUDES
diff --git
a/ecere/Makefile
b/ecere/Makefile
index
5b181c7
..
92cc82b
100755
(executable)
--- a/
ecere/Makefile
+++ b/
ecere/Makefile
@@
-25,9
+25,7
@@
ifdef DEBUG
NOSTRIP := y
endif
NOSTRIP := y
endif
-ifdef EXECUTABLE_TARGET
CONSOLE = -mwindows
CONSOLE = -mwindows
-endif
# INCLUDES
# INCLUDES
diff --git
a/ecere/Makefile.ecereCOM
b/ecere/Makefile.ecereCOM
index
a44012b
..
0a37df5
100755
(executable)
--- a/
ecere/Makefile.ecereCOM
+++ b/
ecere/Makefile.ecereCOM
@@
-25,9
+25,7
@@
ifdef DEBUG
NOSTRIP := y
endif
NOSTRIP := y
endif
-ifdef EXECUTABLE_TARGET
CONSOLE = -mwindows
CONSOLE = -mwindows
-endif
# INCLUDES
# INCLUDES
diff --git
a/ecere/Makefile.vanilla
b/ecere/Makefile.vanilla
index
07b35c2
..
7d3e1fa
100755
(executable)
--- a/
ecere/Makefile.vanilla
+++ b/
ecere/Makefile.vanilla
@@
-25,9
+25,7
@@
ifdef DEBUG
NOSTRIP := y
endif
NOSTRIP := y
endif
-ifdef EXECUTABLE_TARGET
CONSOLE = -mwindows
CONSOLE = -mwindows
-endif
# INCLUDES
# INCLUDES
diff --git
a/eda/drivers/sqlite/Makefile
b/eda/drivers/sqlite/Makefile
index
f36603d
..
1b7ccf6
100755
(executable)
--- a/
eda/drivers/sqlite/Makefile
+++ b/
eda/drivers/sqlite/Makefile
@@
-25,9
+25,7
@@
ifdef DEBUG
NOSTRIP := y
endif
NOSTRIP := y
endif
-ifdef EXECUTABLE_TARGET
CONSOLE = -mwindows
CONSOLE = -mwindows
-endif
# INCLUDES
# INCLUDES
diff --git
a/eda/drivers/sqliteCipher/Makefile
b/eda/drivers/sqliteCipher/Makefile
index
5deb926
..
d7964d6
100755
(executable)
--- a/
eda/drivers/sqliteCipher/Makefile
+++ b/
eda/drivers/sqliteCipher/Makefile
@@
-25,9
+25,7
@@
ifdef DEBUG
NOSTRIP := y
endif
NOSTRIP := y
endif
-ifdef EXECUTABLE_TARGET
CONSOLE = -mwindows
CONSOLE = -mwindows
-endif
# INCLUDES
# INCLUDES
diff --git
a/eda/libeda/Makefile
b/eda/libeda/Makefile
index
b79dbca
..
686d4fb
100755
(executable)
--- a/
eda/libeda/Makefile
+++ b/
eda/libeda/Makefile
@@
-25,9
+25,7
@@
ifdef DEBUG
NOSTRIP := y
endif
NOSTRIP := y
endif
-ifdef EXECUTABLE_TARGET
CONSOLE = -mwindows
CONSOLE = -mwindows
-endif
# INCLUDES
# INCLUDES
diff --git
a/epj2make/Makefile
b/epj2make/Makefile
index
c4ffbb8
..
fd1f3d3
100755
(executable)
--- a/
epj2make/Makefile
+++ b/
epj2make/Makefile
@@
-25,9
+25,7
@@
ifdef DEBUG
NOSTRIP := y
endif
NOSTRIP := y
endif
-ifdef EXECUTABLE_TARGET
CONSOLE = -mconsole
CONSOLE = -mconsole
-endif
# INCLUDES
# INCLUDES
diff --git
a/ide/Makefile
b/ide/Makefile
index
3d2b261
..
6181ce7
100755
(executable)
--- a/
ide/Makefile
+++ b/
ide/Makefile
@@
-25,9
+25,7
@@
ifdef DEBUG
NOSTRIP := y
endif
NOSTRIP := y
endif
-ifdef EXECUTABLE_TARGET
CONSOLE = -mwindows
CONSOLE = -mwindows
-endif
# INCLUDES
# INCLUDES
diff --git
a/ide/src/project/Project.ec
b/ide/src/project/Project.ec
index
118b9c2
..
61b64bc
100755
(executable)
--- 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 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.Printf("CONSOLE = %s\n", GetConsole(config) ? "-mconsole" : "-mwindows");
- f.Puts("endif\n");
+
//
f.Puts("endif\n");
f.Puts("\n");
f.Puts("# INCLUDES\n\n");
f.Puts("\n");
f.Puts("# INCLUDES\n\n");