aboutsummaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2019-06-17 04:48:14 +0200
committerSven Gothel <[email protected]>2019-06-17 04:48:14 +0200
commit062901d807770646604322aa45d1e018270ae7ce (patch)
treef0b00411d4423b4a4d5a1f04804029af3e80da82 /make
parent330dad069dee5a0cc0480cf5cd9052000004223a (diff)
Update cpptask.jar to commit 18e04a2fb9c2a3556040091213f82fc570bc5736
and comment-out verbose OSX compiler/link flags, as well as removing one dead linker cfg target.
Diffstat (limited to 'make')
-rw-r--r--make/build.xml4
-rwxr-xr-xmake/gluegen-cpptasks-base.xml9
-rw-r--r--make/lib/cpptasks.jarbin380530 -> 380532 bytes
3 files changed, 5 insertions, 8 deletions
diff --git a/make/build.xml b/make/build.xml
index cb21bdf..d243a2d 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -388,10 +388,6 @@
<property name="c.src.dir.os" value="unix" />
</target>
- <linker id="linker.cfg.ios.amd64.gluegen" extends="linker.cfg.ios.amd64">
- <linkerarg value="-exported_symbols_list lib"/>
- </linker>
-
<target name="declare.ios.amd64" if="isIOSAmd64">
<echo message="IOSAmd64" />
<property name="compiler.cfg.id" value="compiler.cfg.ios.amd64" />
diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml
index 5e38e2a..0974c1d 100755
--- a/make/gluegen-cpptasks-base.xml
+++ b/make/gluegen-cpptasks-base.xml
@@ -1243,7 +1243,7 @@
</compiler>
<compiler id="compiler.cfg.ios.amd64" name="${gcc.compat.compiler}">
- <compilerarg value="-v"/>
+ <!-- compilerarg value="-v"/ -->
<compilerarg value="-arch"/>
<compilerarg value="x86_64"/>
<compilerarg value="-Wmost" />
@@ -1258,7 +1258,7 @@
</compiler>
<compiler id="compiler.cfg.ios.arm64" name="${gcc.compat.compiler}">
- <compilerarg value="-v"/>
+ <!-- compilerarg value="-v"/ -->
<compilerarg value="-arch"/>
<compilerarg value="arm64"/>
<compilerarg value="-Wmost" />
@@ -1459,6 +1459,7 @@
<!-- MacOSX linker configuration -->
<linker id="linker.cfg.macosx" name="${gcc.compat.compiler}">
+ <!-- compilerarg value="-v"/ -->
<linkerarg value="-arch" if="use.macosppc"/>
<linkerarg value="ppc" if="use.macosppc"/>
<linkerarg value="-arch" if="use.macosx32"/>
@@ -1471,7 +1472,7 @@
</linker>
<linker id="linker.cfg.ios.amd64" name="${gcc.compat.compiler}">
- <linkerarg value="-v"/>
+ <!-- compilerarg value="-v"/ -->
<linkerarg value="-arch"/>
<linkerarg value="x86_64"/>
<linkerarg value="-miphoneos-version-min=10.5"/>
@@ -1480,7 +1481,7 @@
</linker>
<linker id="linker.cfg.ios.arm64" name="${gcc.compat.compiler}">
- <linkerarg value="-v"/>
+ <!-- compilerarg value="-v"/ -->
<linkerarg value="-arch"/>
<linkerarg value="arm64"/>
<linkerarg value="-miphoneos-version-min=10.5"/>
diff --git a/make/lib/cpptasks.jar b/make/lib/cpptasks.jar
index aa70c08..152e69d 100644
--- a/make/lib/cpptasks.jar
+++ b/make/lib/cpptasks.jar
Binary files differ