aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2012-03-07 02:21:12 +0100
committerSven Gothel <[email protected]>2012-03-07 02:21:12 +0100
commit67a89a1d9ff17c4d6815e21502c55bf533b62416 (patch)
tree3b3467d25faec0d5691a7fecf0613894c7612c20
parentf303bc43437e2fa6ccc8d3f8facd2e5dc7c55069 (diff)
build: Move c.compiler.debug, c.compiler.use-debug and c.compiler.optimise from build.xml -> gluegen-cpptasks-base.xml
- unifies definition - echo values
-rw-r--r--make/build.xml7
-rwxr-xr-xmake/gluegen-cpptasks-base.xml7
2 files changed, 7 insertions, 7 deletions
diff --git a/make/build.xml b/make/build.xml
index 01a989a..484dae4 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -455,13 +455,6 @@
<echo message="Output lib name = ${output.lib.name} -> ${output.lib.name.os}" />
- <!-- NOTE: the value of the debug and optimise attributes will not be overridden if already set externally -->
- <property name="c.compiler.debug" value="false" />
- <!-- Optimise flags one of { none, size, speed, minimal, full, aggressive, extreme, unsafe } -->
- <property name="c.compiler.optimise" value="none" />
-
- <condition property="c.compiler.use-debug"><istrue value="${c.compiler.debug}"/></condition>
-
<mkdir dir="${gluegen.lib.dir}"/>
<echo message="Compiling ${c.compiler.src.files.os} ${c.compiler.src.files.common}" />
diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml
index a475c16..7f5c30b 100755
--- a/make/gluegen-cpptasks-base.xml
+++ b/make/gluegen-cpptasks-base.xml
@@ -166,6 +166,13 @@
<!-- NOTE: the value of the debug attribute will not be overridden if already set externally -->
<property name="c.compiler.debug" value="false" />
+ <condition property="c.compiler.use-debug"><istrue value="${c.compiler.debug}"/></condition>
+ <!-- Optimise flags one of { none, size, speed, minimal, full, aggressive, extreme, unsafe } -->
+ <property name="c.compiler.optimise" value="none" />
+
+ <echo message="c.compiler.debug=${c.compiler.debug}" />
+ <echo message="c.compiler.use-debug=${c.compiler.use-debug}" />
+ <echo message="c.compiler.optimise=${c.compiler.optimise}" />
<condition property="c.strip.libraries"><isfalse value="${c.compiler.debug}"/></condition>