diff options
| author | Sven Gothel <[email protected]> | 2020-01-02 16:36:37 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2020-01-02 16:36:37 +0100 |
| commit | cb092e517461b3047c966c38e92668010a3b7ef6 (patch) | |
| tree | 58598c2d718165eceb9a573ccfd3bf1c05da9fbf | |
| parent | e2fe0fbf558da39f762df3779e120d1956e4c47c (diff) | |
native.tag.jar: include *.symbols (fix)
| -rw-r--r-- | make/build-jogl.xml | 4 | ||||
| -rw-r--r-- | make/build.xml | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml index 4be00781e..9a116c866 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -1993,13 +1993,13 @@ manifestfile="${build.jogl}/manifest-natives.mf" module="opengl" includelibs="*.${native.library.suffix} *.symbols" - excludelibs="*jogl_cg.${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} *.symbols" /> + includelibs="*jogl_cg.${native.library.suffix} *jogl_cg.symbols" /> </target> <!-- ================================================================== --> diff --git a/make/build.xml b/make/build.xml index 6f39c34c1..d1c37d918 100644 --- a/make/build.xml +++ b/make/build.xml @@ -91,10 +91,10 @@ <target name="one.lib.dir" depends="init,gluegen.cpptasks.detect.os" unless="one.dir.skip"> <mkdir dir="${lib}" /> <copy todir="${lib}"> - <fileset dir="${build}/jogl/obj" includes="*.${native.library.suffix}" /> - <fileset dir="${build}/nativewindow/obj" includes="*.${native.library.suffix}" /> - <fileset dir="${build}/newt/obj" includes="*.${native.library.suffix}" /> - <!-- fileset dir="${build}/oculusvr/obj" includes="*.${native.library.suffix}" /--> + <fileset dir="${build}/jogl/obj" includes="*.${native.library.suffix} *.symbols" /> + <fileset dir="${build}/nativewindow/obj" includes="*.${native.library.suffix} *.symbols" /> + <fileset dir="${build}/newt/obj" includes="*.${native.library.suffix} *.symbols" /> + <!-- fileset dir="${build}/oculusvr/obj" includes="*.${native.library.suffix} *.symbols" /--> </copy> </target> @@ -185,7 +185,7 @@ manifestfile="${build}/manifest-all-natives.mf" module="opengl" includelibs="*.${native.library.suffix} *.symbols" - excludelibs="*jogl_cg.${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" /> <copy file="${jar}/jogl-all-natives-${os.and.arch}.jar" tofile="${jar}/jogl-all-mobile-natives-${os.and.arch}.jar" /> |