Move natives to the dev.openrs2 package to avoid conflicts

master
Graham 5 years ago
parent 89f6c50ab4
commit a4c5e03c24
  1. 20
      src/assembly/jar.xml

@ -8,52 +8,52 @@
<files> <files>
<file> <file>
<source>${openrs2.natives.directory}/i386-Linux-gcc/shared/libopenrs2-gl-natives-${openrs2.natives.version}.so</source> <source>${openrs2.natives.directory}/i386-Linux-gcc/shared/libopenrs2-gl-natives-${openrs2.natives.version}.so</source>
<outputDirectory>natives/linux-i386</outputDirectory> <outputDirectory>dev/openrs2/natives/linux-i386</outputDirectory>
<destName>libjaggl.so</destName> <destName>libjaggl.so</destName>
</file> </file>
<file> <file>
<source>${openrs2.natives.directory}/i386-Linux-gcc/shared/libopenrs2-gl-dri-natives-${openrs2.natives.version}.so</source> <source>${openrs2.natives.directory}/i386-Linux-gcc/shared/libopenrs2-gl-dri-natives-${openrs2.natives.version}.so</source>
<outputDirectory>natives/linux-i386</outputDirectory> <outputDirectory>dev/openrs2/natives/linux-i386</outputDirectory>
<destName>libjaggl_dri.so</destName> <destName>libjaggl_dri.so</destName>
</file> </file>
<file> <file>
<source>${openrs2.natives.directory}/amd64-Linux-gcc/shared/libopenrs2-gl-natives-${openrs2.natives.version}.so</source> <source>${openrs2.natives.directory}/amd64-Linux-gcc/shared/libopenrs2-gl-natives-${openrs2.natives.version}.so</source>
<outputDirectory>natives/linux-amd64</outputDirectory> <outputDirectory>dev/openrs2/natives/linux-amd64</outputDirectory>
<destName>libjaggl.so</destName> <destName>libjaggl.so</destName>
</file> </file>
<file> <file>
<source>${openrs2.natives.directory}/amd64-Linux-gcc/shared/libopenrs2-gl-dri-natives-${openrs2.natives.version}.so</source> <source>${openrs2.natives.directory}/amd64-Linux-gcc/shared/libopenrs2-gl-dri-natives-${openrs2.natives.version}.so</source>
<outputDirectory>natives/linux-amd64</outputDirectory> <outputDirectory>dev/openrs2/natives/linux-amd64</outputDirectory>
<destName>libjaggl_dri.so</destName> <destName>libjaggl_dri.so</destName>
</file> </file>
<file> <file>
<source>${openrs2.natives.directory}/i386-MacOSX-gcc/shared/libopenrs2-gl-natives-${openrs2.natives.version}.dylib</source> <source>${openrs2.natives.directory}/i386-MacOSX-gcc/shared/libopenrs2-gl-natives-${openrs2.natives.version}.dylib</source>
<outputDirectory>natives/mac-i386</outputDirectory> <outputDirectory>dev/openrs2/natives/mac-i386</outputDirectory>
<destName>libjaggl.dylib</destName> <destName>libjaggl.dylib</destName>
</file> </file>
<file> <file>
<source>${openrs2.natives.directory}/x86_64-MacOSX-gcc/shared/libopenrs2-gl-natives-${openrs2.natives.version}.dylib</source> <source>${openrs2.natives.directory}/x86_64-MacOSX-gcc/shared/libopenrs2-gl-natives-${openrs2.natives.version}.dylib</source>
<outputDirectory>natives/mac-amd64</outputDirectory> <outputDirectory>dev/openrs2/natives/mac-amd64</outputDirectory>
<destName>libjaggl.dylib</destName> <destName>libjaggl.dylib</destName>
</file> </file>
<file> <file>
<source>${openrs2.natives.directory}/x86-Windows-msvc/shared/openrs2-gl-natives-${openrs2.natives.version}.dll</source> <source>${openrs2.natives.directory}/x86-Windows-msvc/shared/openrs2-gl-natives-${openrs2.natives.version}.dll</source>
<outputDirectory>natives/windows-i386</outputDirectory> <outputDirectory>dev/openrs2/natives/windows-i386</outputDirectory>
<destName>jaggl.dll</destName> <destName>jaggl.dll</destName>
</file> </file>
<file> <file>
<source>${openrs2.natives.directory}/x86-Windows-msvc/shared/openrs2-misc-natives-${openrs2.natives.version}.dll</source> <source>${openrs2.natives.directory}/x86-Windows-msvc/shared/openrs2-misc-natives-${openrs2.natives.version}.dll</source>
<outputDirectory>natives/windows-i386</outputDirectory> <outputDirectory>dev/openrs2/natives/windows-i386</outputDirectory>
<destName>jagmisc.dll</destName> <destName>jagmisc.dll</destName>
</file> </file>
<file> <file>
<source>${openrs2.natives.directory}/amd64-Windows-msvc/shared/openrs2-gl-natives-${openrs2.natives.version}.dll</source> <source>${openrs2.natives.directory}/amd64-Windows-msvc/shared/openrs2-gl-natives-${openrs2.natives.version}.dll</source>
<outputDirectory>natives/windows-amd64</outputDirectory> <outputDirectory>dev/openrs2/natives/windows-amd64</outputDirectory>
<destName>jaggl.dll</destName> <destName>jaggl.dll</destName>
</file> </file>
<file> <file>
<source>${openrs2.natives.directory}/amd64-Windows-msvc/shared/openrs2-misc-natives-${openrs2.natives.version}.dll</source> <source>${openrs2.natives.directory}/amd64-Windows-msvc/shared/openrs2-misc-natives-${openrs2.natives.version}.dll</source>
<outputDirectory>natives/windows-amd64</outputDirectory> <outputDirectory>dev/openrs2/natives/windows-amd64</outputDirectory>
<destName>jagmisc.dll</destName> <destName>jagmisc.dll</destName>
</file> </file>
<!-- workaround for https://issues.apache.org/jira/browse/MASSEMBLY-835 --> <!-- workaround for https://issues.apache.org/jira/browse/MASSEMBLY-835 -->

Loading…
Cancel
Save