From a4c5e03c24084d7d91d388d81310f6474a8110bf Mon Sep 17 00:00:00 2001 From: Graham Date: Sun, 12 Jan 2020 13:38:10 +0000 Subject: [PATCH] Move natives to the dev.openrs2 package to avoid conflicts --- src/assembly/jar.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/assembly/jar.xml b/src/assembly/jar.xml index 0ea4f95..00d1f83 100644 --- a/src/assembly/jar.xml +++ b/src/assembly/jar.xml @@ -8,52 +8,52 @@ ${openrs2.natives.directory}/i386-Linux-gcc/shared/libopenrs2-gl-natives-${openrs2.natives.version}.so - natives/linux-i386 + dev/openrs2/natives/linux-i386 libjaggl.so ${openrs2.natives.directory}/i386-Linux-gcc/shared/libopenrs2-gl-dri-natives-${openrs2.natives.version}.so - natives/linux-i386 + dev/openrs2/natives/linux-i386 libjaggl_dri.so ${openrs2.natives.directory}/amd64-Linux-gcc/shared/libopenrs2-gl-natives-${openrs2.natives.version}.so - natives/linux-amd64 + dev/openrs2/natives/linux-amd64 libjaggl.so ${openrs2.natives.directory}/amd64-Linux-gcc/shared/libopenrs2-gl-dri-natives-${openrs2.natives.version}.so - natives/linux-amd64 + dev/openrs2/natives/linux-amd64 libjaggl_dri.so ${openrs2.natives.directory}/i386-MacOSX-gcc/shared/libopenrs2-gl-natives-${openrs2.natives.version}.dylib - natives/mac-i386 + dev/openrs2/natives/mac-i386 libjaggl.dylib ${openrs2.natives.directory}/x86_64-MacOSX-gcc/shared/libopenrs2-gl-natives-${openrs2.natives.version}.dylib - natives/mac-amd64 + dev/openrs2/natives/mac-amd64 libjaggl.dylib ${openrs2.natives.directory}/x86-Windows-msvc/shared/openrs2-gl-natives-${openrs2.natives.version}.dll - natives/windows-i386 + dev/openrs2/natives/windows-i386 jaggl.dll ${openrs2.natives.directory}/x86-Windows-msvc/shared/openrs2-misc-natives-${openrs2.natives.version}.dll - natives/windows-i386 + dev/openrs2/natives/windows-i386 jagmisc.dll ${openrs2.natives.directory}/amd64-Windows-msvc/shared/openrs2-gl-natives-${openrs2.natives.version}.dll - natives/windows-amd64 + dev/openrs2/natives/windows-amd64 jaggl.dll ${openrs2.natives.directory}/amd64-Windows-msvc/shared/openrs2-misc-natives-${openrs2.natives.version}.dll - natives/windows-amd64 + dev/openrs2/natives/windows-amd64 jagmisc.dll