diff options
| author | Sven Gothel <[email protected]> | 2019-06-17 03:14:24 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2019-06-17 03:14:24 +0200 |
| commit | 97622eb70b1ff720d91d768768b7a996ac01ad78 (patch) | |
| tree | 247b648bcdffc99277eac03b76580c6ef482ffba /make | |
| parent | 2a8c4d1cfa45794bc27358f3379f8c5bece74537 (diff) | |
Update cpptask.jar to commit 757192655df20cc6a68affe8cbb4d7de387c9c67
Added CC Task Option: 'usehighleveltool' to give user option to
prefer the high-level tool like gcc or clang for static linkage
where usually 'ar' is being used.
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-test.xml | 2 | ||||
| -rw-r--r-- | make/build.xml | 3 | ||||
| -rw-r--r-- | make/lib/cpptasks.jar | bin | 377953 -> 380530 bytes |
3 files changed, 3 insertions, 2 deletions
diff --git a/make/build-test.xml b/make/build-test.xml index 6372696..f39f0bf 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -234,7 +234,7 @@ <condition property="c.compiler.use-debug"><istrue value="${c.compiler.debug}"/></condition> - <cc outtype="shared" + <cc outtype="${output.lib.type}" objdir="${build_t.obj}" outfile="${build_t.lib}/@{output.lib.name}" optimize="${c.compiler.optimise}" diff --git a/make/build.xml b/make/build.xml index 79ec607..2b5c687 100644 --- a/make/build.xml +++ b/make/build.xml @@ -469,7 +469,8 @@ <echo message="Compiling ${c.compiler.src.files.os} ${c.compiler.src.files.common}" /> <echo message="user.dir=${user.dir}" /> - <cc outtype="shared" + <cc outtype="${output.lib.type}" + usehighleveltool="true" objdir="${gluegen.lib.dir}" outfile="${gluegen.lib.dir}/${output.lib.name}" optimize="${c.compiler.optimise}" diff --git a/make/lib/cpptasks.jar b/make/lib/cpptasks.jar Binary files differindex 44a82ed..aa70c08 100644 --- a/make/lib/cpptasks.jar +++ b/make/lib/cpptasks.jar |