Ecere Software
/
sdk
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f646c8b
)
sdk/Build System: Took out extra inclusion of LDFLAGS; Moved $(CPPFLAGS) and -D_DEBUG...
author
Jerome St-Louis
<jerome@ecere.com>
Wed, 7 Nov 2012 14:18:33 +0000
(09:18 -0500)
committer
Jerome St-Louis
<jerome@ecere.com>
Wed, 7 Nov 2012 14:18:33 +0000
(09:18 -0500)
20 files changed:
compiler/bootstrap/ecc/Makefile
patch
|
blob
|
history
compiler/bootstrap/ecere/Makefile
patch
|
blob
|
history
compiler/bootstrap/ecp/Makefile
patch
|
blob
|
history
compiler/bootstrap/ecs/Makefile
patch
|
blob
|
history
compiler/bootstrap/libec/Makefile
patch
|
blob
|
history
compiler/ecc/Makefile
patch
|
blob
|
history
compiler/ecp/Makefile
patch
|
blob
|
history
compiler/ecs/Makefile
patch
|
blob
|
history
compiler/libec/Makefile
patch
|
blob
|
history
crossplatform.mk
patch
|
blob
|
history
deps/libungif-4.1.1/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
eda/libeda/Makefile
patch
|
blob
|
history
epj2make/Makefile
patch
|
blob
|
history
ide/Makefile
patch
|
blob
|
history
ide/src/project/Project.ec
patch
|
blob
|
history
ide/src/project/ProjectNode.ec
patch
|
blob
|
history
diff --git
a/compiler/bootstrap/ecc/Makefile
b/compiler/bootstrap/ecc/Makefile
index
2453e5c
..
e904a26
100644
(file)
--- a/
compiler/bootstrap/ecc/Makefile
+++ b/
compiler/bootstrap/ecc/Makefile
@@
-88,7
+88,6
@@
ifndef STATIC_LIBRARY_TARGET
OFLAGS += $(FORCE_32_BIT) \
-L../ecere/obj/bootstrap.$(PLATFORM) \
-L../libec/obj/bootstrap.$(PLATFORM)
OFLAGS += $(FORCE_32_BIT) \
-L../ecere/obj/bootstrap.$(PLATFORM) \
-L../libec/obj/bootstrap.$(PLATFORM)
-OFLAGS += $(LDFLAGS)
endif
# TARGETS
endif
# TARGETS
diff --git
a/compiler/bootstrap/ecere/Makefile
b/compiler/bootstrap/ecere/Makefile
index
01984fa
..
7622a67
100644
(file)
--- a/
compiler/bootstrap/ecere/Makefile
+++ b/
compiler/bootstrap/ecere/Makefile
@@
-118,7
+118,6
@@
CECFLAGS += -cpp $(_CPP)
ifndef STATIC_LIBRARY_TARGET
OFLAGS += $(FORCE_32_BIT)
ifndef STATIC_LIBRARY_TARGET
OFLAGS += $(FORCE_32_BIT)
-OFLAGS += $(LDFLAGS)
endif
# TARGETS
endif
# TARGETS
diff --git
a/compiler/bootstrap/ecp/Makefile
b/compiler/bootstrap/ecp/Makefile
index
721706f
..
4a2dd61
100644
(file)
--- a/
compiler/bootstrap/ecp/Makefile
+++ b/
compiler/bootstrap/ecp/Makefile
@@
-88,7
+88,6
@@
ifndef STATIC_LIBRARY_TARGET
OFLAGS += $(FORCE_32_BIT) \
-L../ecere/obj/bootstrap.$(PLATFORM) \
-L../libec/obj/bootstrap.$(PLATFORM)
OFLAGS += $(FORCE_32_BIT) \
-L../ecere/obj/bootstrap.$(PLATFORM) \
-L../libec/obj/bootstrap.$(PLATFORM)
-OFLAGS += $(LDFLAGS)
endif
# TARGETS
endif
# TARGETS
diff --git
a/compiler/bootstrap/ecs/Makefile
b/compiler/bootstrap/ecs/Makefile
index
a5b0ad0
..
c45f23f
100644
(file)
--- a/
compiler/bootstrap/ecs/Makefile
+++ b/
compiler/bootstrap/ecs/Makefile
@@
-88,7
+88,6
@@
ifndef STATIC_LIBRARY_TARGET
OFLAGS += $(FORCE_32_BIT) \
-L../ecere/obj/bootstrap.$(PLATFORM) \
-L../libec/obj/bootstrap.$(PLATFORM)
OFLAGS += $(FORCE_32_BIT) \
-L../ecere/obj/bootstrap.$(PLATFORM) \
-L../libec/obj/bootstrap.$(PLATFORM)
-OFLAGS += $(LDFLAGS)
endif
# TARGETS
endif
# TARGETS
diff --git
a/compiler/bootstrap/libec/Makefile
b/compiler/bootstrap/libec/Makefile
index
e07a106
..
72d529f
100644
(file)
--- a/
compiler/bootstrap/libec/Makefile
+++ b/
compiler/bootstrap/libec/Makefile
@@
-108,7
+108,6
@@
CECFLAGS += -cpp $(_CPP)
ifndef STATIC_LIBRARY_TARGET
OFLAGS += $(FORCE_32_BIT)
ifndef STATIC_LIBRARY_TARGET
OFLAGS += $(FORCE_32_BIT)
-OFLAGS += $(LDFLAGS)
endif
# TARGETS
endif
# TARGETS
diff --git
a/compiler/ecc/Makefile
b/compiler/ecc/Makefile
index
2793c8e
..
8c6c1e7
100755
(executable)
--- a/
compiler/ecc/Makefile
+++ b/
compiler/ecc/Makefile
@@
-90,7
+90,6
@@
ifndef STATIC_LIBRARY_TARGET
OFLAGS += $(FORCE_32_BIT) \
-L../../obj/$(PLATFORM)/bin \
-L../../obj/$(PLATFORM)/lib
OFLAGS += $(FORCE_32_BIT) \
-L../../obj/$(PLATFORM)/bin \
-L../../obj/$(PLATFORM)/lib
-OFLAGS += $(LDFLAGS)
endif
# TARGETS
endif
# TARGETS
diff --git
a/compiler/ecp/Makefile
b/compiler/ecp/Makefile
index
1145cf3
..
7b15812
100755
(executable)
--- a/
compiler/ecp/Makefile
+++ b/
compiler/ecp/Makefile
@@
-90,7
+90,6
@@
ifndef STATIC_LIBRARY_TARGET
OFLAGS += $(FORCE_32_BIT) \
-L../../obj/$(PLATFORM)/bin \
-L../../obj/$(PLATFORM)/lib
OFLAGS += $(FORCE_32_BIT) \
-L../../obj/$(PLATFORM)/bin \
-L../../obj/$(PLATFORM)/lib
-OFLAGS += $(LDFLAGS)
endif
# TARGETS
endif
# TARGETS
diff --git
a/compiler/ecs/Makefile
b/compiler/ecs/Makefile
index
f6643c8
..
ada9fd8
100755
(executable)
--- a/
compiler/ecs/Makefile
+++ b/
compiler/ecs/Makefile
@@
-90,7
+90,6
@@
ifndef STATIC_LIBRARY_TARGET
OFLAGS += $(FORCE_32_BIT) \
-L../../obj/$(PLATFORM)/bin \
-L../../obj/$(PLATFORM)/lib
OFLAGS += $(FORCE_32_BIT) \
-L../../obj/$(PLATFORM)/bin \
-L../../obj/$(PLATFORM)/lib
-OFLAGS += $(LDFLAGS)
endif
# TARGETS
endif
# TARGETS
diff --git
a/compiler/libec/Makefile
b/compiler/libec/Makefile
index
0be1f06
..
3cd765a
100755
(executable)
--- a/
compiler/libec/Makefile
+++ b/
compiler/libec/Makefile
@@
-124,7
+124,6
@@
ifndef STATIC_LIBRARY_TARGET
OFLAGS += $(FORCE_32_BIT) \
-L../../obj/$(PLATFORM)/bin \
-L../../obj/$(PLATFORM)/lib
OFLAGS += $(FORCE_32_BIT) \
-L../../obj/$(PLATFORM)/bin \
-L../../obj/$(PLATFORM)/lib
-OFLAGS += $(LDFLAGS)
endif
# TARGETS
endif
# TARGETS
diff --git
a/crossplatform.mk
b/crossplatform.mk
index
053311f
..
baa7453
100755
(executable)
--- a/
crossplatform.mk
+++ b/
crossplatform.mk
@@
-197,6
+197,11
@@
_L = $(if $(filter $(1),$(EXCLUDED_LIBS)),,-l$(1))
# DEBIAN
ifdef DEBIAN_PACKAGE
OFLAGS += $(LDFLAGS)
# DEBIAN
ifdef DEBIAN_PACKAGE
OFLAGS += $(LDFLAGS)
+CFLAGS += $(CPPFLAGS)
+endif
+
+ifdef DEBUG
+CFLAGS += -D_DEBUG
endif
# COMMON LIBRARIES DETECTION
endif
# COMMON LIBRARIES DETECTION
diff --git
a/deps/libungif-4.1.1/Makefile
b/deps/libungif-4.1.1/Makefile
index
df355cb
..
05337b2
100755
(executable)
--- a/
deps/libungif-4.1.1/Makefile
+++ b/
deps/libungif-4.1.1/Makefile
@@
-70,7
+70,6
@@
CECFLAGS += -cpp $(_CPP)
ifndef STATIC_LIBRARY_TARGET
OFLAGS += $(FORCE_32_BIT)
ifndef STATIC_LIBRARY_TARGET
OFLAGS += $(FORCE_32_BIT)
-OFLAGS += $(LDFLAGS)
endif
# TARGETS
endif
# TARGETS
diff --git
a/documentor/Makefile
b/documentor/Makefile
index
446785e
..
17b7cdf
100755
(executable)
--- a/
documentor/Makefile
+++ b/
documentor/Makefile
@@
-98,7
+98,6
@@
ifndef STATIC_LIBRARY_TARGET
OFLAGS += $(FORCE_32_BIT) \
-L../obj/$(PLATFORM)/bin \
-L../obj/$(PLATFORM)/lib
OFLAGS += $(FORCE_32_BIT) \
-L../obj/$(PLATFORM)/bin \
-L../obj/$(PLATFORM)/lib
-OFLAGS += $(LDFLAGS)
endif
# TARGETS
endif
# TARGETS
diff --git
a/ear/cmd/Makefile
b/ear/cmd/Makefile
index
bca99e6
..
52836ac
100755
(executable)
--- a/
ear/cmd/Makefile
+++ b/
ear/cmd/Makefile
@@
-91,7
+91,6
@@
ifndef STATIC_LIBRARY_TARGET
OFLAGS += $(FORCE_32_BIT) \
-L../../obj/$(PLATFORM)/bin \
-L../../obj/$(PLATFORM)/lib
OFLAGS += $(FORCE_32_BIT) \
-L../../obj/$(PLATFORM)/bin \
-L../../obj/$(PLATFORM)/lib
-OFLAGS += $(LDFLAGS)
endif
# TARGETS
endif
# TARGETS
diff --git
a/ear/extract/Makefile
b/ear/extract/Makefile
index
702c4f6
..
e13131b
100755
(executable)
--- a/
ear/extract/Makefile
+++ b/
ear/extract/Makefile
@@
-172,7
+172,6
@@
ifndef STATIC_LIBRARY_TARGET
OFLAGS += $(FORCE_32_BIT) \
-L../../ecere/obj/vanilla.$(PLATFORM) \
-L../../deps/zlib/obj/release.$(PLATFORM)
OFLAGS += $(FORCE_32_BIT) \
-L../../ecere/obj/vanilla.$(PLATFORM) \
-L../../deps/zlib/obj/release.$(PLATFORM)
-OFLAGS += $(LDFLAGS)
endif
# TARGETS
endif
# TARGETS
diff --git
a/ecere/Makefile
b/ecere/Makefile
index
efc9103
..
8aef6cb
100755
(executable)
--- a/
ecere/Makefile
+++ b/
ecere/Makefile
@@
-502,7
+502,6
@@
CECFLAGS += -cpp $(_CPP)
ifndef STATIC_LIBRARY_TARGET
OFLAGS += $(FORCE_32_BIT)
ifndef STATIC_LIBRARY_TARGET
OFLAGS += $(FORCE_32_BIT)
-OFLAGS += $(LDFLAGS)
endif
# TARGETS
endif
# TARGETS
diff --git
a/eda/libeda/Makefile
b/eda/libeda/Makefile
index
a42ee46
..
9ae621a
100755
(executable)
--- a/
eda/libeda/Makefile
+++ b/
eda/libeda/Makefile
@@
-117,7
+117,6
@@
ifndef STATIC_LIBRARY_TARGET
OFLAGS += $(FORCE_32_BIT) \
-L../../obj/$(PLATFORM)/bin \
-L../../obj/$(PLATFORM)/lib
OFLAGS += $(FORCE_32_BIT) \
-L../../obj/$(PLATFORM)/bin \
-L../../obj/$(PLATFORM)/lib
-OFLAGS += $(LDFLAGS)
endif
# TARGETS
endif
# TARGETS
diff --git
a/epj2make/Makefile
b/epj2make/Makefile
index
a4efa68
..
3caed53
100755
(executable)
--- a/
epj2make/Makefile
+++ b/
epj2make/Makefile
@@
-104,7
+104,6
@@
ifndef STATIC_LIBRARY_TARGET
OFLAGS += $(FORCE_32_BIT) \
-L../obj/$(PLATFORM)/bin \
-L../obj/$(PLATFORM)/lib
OFLAGS += $(FORCE_32_BIT) \
-L../obj/$(PLATFORM)/bin \
-L../obj/$(PLATFORM)/lib
-OFLAGS += $(LDFLAGS)
endif
# TARGETS
endif
# TARGETS
diff --git
a/ide/Makefile
b/ide/Makefile
index
eef23de
..
43f7059
100755
(executable)
--- a/
ide/Makefile
+++ b/
ide/Makefile
@@
-226,7
+226,6
@@
ifndef STATIC_LIBRARY_TARGET
OFLAGS += $(FORCE_32_BIT) \
-L../obj/$(PLATFORM)/bin \
-L../obj/$(PLATFORM)/lib
OFLAGS += $(FORCE_32_BIT) \
-L../obj/$(PLATFORM)/bin \
-L../obj/$(PLATFORM)/lib
-OFLAGS += $(LDFLAGS)
endif
# TARGETS
endif
# TARGETS
diff --git
a/ide/src/project/Project.ec
b/ide/src/project/Project.ec
index
3159e7f
..
9778dbc
100755
(executable)
--- a/
ide/src/project/Project.ec
+++ b/
ide/src/project/Project.ec
@@
-2536,7
+2536,6
@@
private:
if(options && options.libraryDirs)
OutputListOption(f, "L", options.libraryDirs, lineEach, true);
f.Puts("\n");
if(options && options.libraryDirs)
OutputListOption(f, "L", options.libraryDirs, lineEach, true);
f.Puts("\n");
- f.Puts("OFLAGS += $(LDFLAGS)\n");
f.Puts("endif\n");
f.Puts("\n");
f.Puts("endif\n");
f.Puts("\n");
diff --git
a/ide/src/project/ProjectNode.ec
b/ide/src/project/ProjectNode.ec
index
9e6bb29
..
35d498c
100755
(executable)
--- a/
ide/src/project/ProjectNode.ec
+++ b/
ide/src/project/ProjectNode.ec
@@
-2127,7
+2127,8
@@
private:
if(!isGreater)
{
// absolutely common stuff outside of platform only, stuff that can't be changed by platform
if(!isGreater)
{
// absolutely common stuff outside of platform only, stuff that can't be changed by platform
- cflags.concatf(" \\\n\t $(if $(DEBIAN_PACKAGE),$(CPPFLAGS),) $(if $(DEBUG), -D_DEBUG,)");
+ // This would normally go in crossplatform.mk (or compiler.cf if compiler-specific)
+ // cflags.concatf(" \\\n\t $(if $(DEBIAN_PACKAGE),$(CPPFLAGS),) $(if $(DEBUG), -D_DEBUG,)");
}
for(platform = (Platform)1; platform < Platform::enumSize; platform++)
}
for(platform = (Platform)1; platform < Platform::enumSize; platform++)