From 4e2e4011764ab9d839351e43363100499304f5b0 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sat, 4 Jan 2020 18:41:44 +0100
Subject: native.tag.jar: Revert explicit inclusion of *.symbols file
reverting commit cb092e517461b3047c966c38e92668010a3b7ef6
---
make/build-jogl.xml | 4 ++--
make/build-nativewindow.xml | 2 +-
make/build-newt.xml | 2 +-
make/build-oculusvr.xml | 2 +-
make/build.xml | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index 9a116c866..c2b0623bc 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -1992,14 +1992,14 @@
nativejarfile="${build.jogl}/jogl-natives-${os.and.arch}.jar"
manifestfile="${build.jogl}/manifest-natives.mf"
module="opengl"
- includelibs="*.${native.library.suffix} *.symbols"
+ includelibs="*.${native.library.suffix}"
excludelibs="*jogl_cg.${native.library.suffix} *jogl_cg.symbols" />
<native.tag.jar objdir="${obj.jogl}"
nativejarfile="${build.jogl}/jogl-cg-natives-${os.and.arch}.jar"
manifestfile="${build.jogl}/manifest-natives.mf"
module="cg"
- includelibs="*jogl_cg.${native.library.suffix} *jogl_cg.symbols" />
+ includelibs="*jogl_cg.${native.library.suffix}" />
</target>
<!-- ================================================================== -->
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
index e123fdf29..7f0057493 100644
--- a/make/build-nativewindow.xml
+++ b/make/build-nativewindow.xml
@@ -1093,7 +1093,7 @@
nativejarfile="${build.nativewindow}/nativewindow-natives-${os.and.arch}.jar"
manifestfile="${build.nativewindow}/manifest-natives.mf"
module="nativewindow"
- includelibs="*.${native.library.suffix} *.symbols" />
+ includelibs="*.${native.library.suffix}" />
</target>
<!-- ================================================================== -->
diff --git a/make/build-newt.xml b/make/build-newt.xml
index 1dadb748a..ec3d95134 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -1162,7 +1162,7 @@
nativejarfile="${build.newt}/newt-natives-${os.and.arch}.jar"
manifestfile="${build.newt}/manifest-natives.mf"
module="newt"
- includelibs="*.${native.library.suffix} *.symbols" />
+ includelibs="*.${native.library.suffix}" />
</target>
<!-- ================================================================== -->
diff --git a/make/build-oculusvr.xml b/make/build-oculusvr.xml
index 51c4cc239..8466f9203 100644
--- a/make/build-oculusvr.xml
+++ b/make/build-oculusvr.xml
@@ -731,7 +731,7 @@
nativejarfile="${build.oculusvr}/oculusvr-natives-${os.and.arch}.jar"
manifestfile="${build.oculusvr}/manifest-natives.mf"
module="oculusvr"
- includelibs="*oculusvr.${native.library.suffix} *.symbols" />
+ includelibs="*oculusvr.${native.library.suffix}" />
</target>
<!-- ================================================================== -->
diff --git a/make/build.xml b/make/build.xml
index d1c37d918..8991b4208 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -184,7 +184,7 @@
nativejarfile="${jar}/jogl-all-natives-${os.and.arch}.jar"
manifestfile="${build}/manifest-all-natives.mf"
module="opengl"
- includelibs="*.${native.library.suffix} *.symbols"
+ includelibs="*.${native.library.suffix}"
excludelibs="*jogl_cg.${native.library.suffix} *jogl_cg.symbols" />
<!-- Produce duplicates for diff 'all' configuration, since non-native-jar aliasing (Bug 1023/Bug 1024) -->
<copy file="${jar}/jogl-all-natives-${os.and.arch}.jar" tofile="${jar}/jogl-all-noawt-natives-${os.and.arch}.jar" />
--
cgit v1.2.3