Revert "Fix broken liblwjgl-java-jni package by compiling all needed source files."
This reverts commit dbde013c25e1c4f95d54c9d5e58083a70f540eb7.
Markus Koschany
4 years ago
| 0 | Description: Compile and add to library missing object files | |
| 1 | Some C files present in "src/native/common", and "src/native/linux" | |
| 2 | were not included in the native library build. This patch should include them | |
| 3 | back. | |
| 4 | . | |
| 5 | Also, when building the Debian package, the library "jawt", which is a | |
| 6 | dependency, was missing as well when building the native library. | |
| 7 | Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=912631#5 | |
| 8 | Last-Update: 2018-12-26 | |
| 9 | ||
| 10 | --- lwjgl-2.9.3+dfsg.orig/platform_build/linux_ant/build.xml | |
| 11 | +++ lwjgl-2.9.3+dfsg/platform_build/linux_ant/build.xml | |
| 12 | @@ -6,7 +6,7 @@ | |
| 13 | <property name="libname64" value="liblwjgl64.so"/> | |
| 14 | <property name="libs32" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -lpthread -L${java.home}/lib/i386 -ljawt" /> | |
| 15 | <property name="libs64" value="-L/usr/X11R6/lib64 -L/usr/X11/lib64 -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -lpthread -L${java.home}/lib/amd64 -ljawt" /> | |
| 16 | - <property name="libs" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXcursor -lXrandr -lXxf86vm -L${java.home}/lib/${os.arch}" /> | |
| 17 | + <property name="libs" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXcursor -lXrandr -lXxf86vm -L${java.home}/lib/${os.arch} -ljawt" /> | |
| 18 | <property name="cflags32" value="-O2 -Wall -c -fPIC -std=c99 -Wunused"/> | |
| 19 | ||
| 20 | <target name="clean"> | |
| 21 | @@ -148,8 +148,12 @@ | |
| 22 | <arg value="-I${native}/linux/opengl"/> | |
| 23 | <mapper type="glob" from="*.c" to="*.o"/> | |
| 24 | <fileset dir="${native}/linux" includes="*.c"/> | |
| 25 | + <fileset dir="${native}/linux/opengl" includes="*.c"/> | |
| 26 | <fileset dir="${native}/generated" includes="*.c"/> | |
| 27 | - <fileset dir="${native}/common" includes="*.c"/> | |
| 28 | + <fileset dir="${native}/common" includes="**/*.c" excludes="opengles/**/*"/> | |
| 29 | + <fileset dir="${native}/generated/openal" includes="*.c"/> | |
| 30 | + <fileset dir="${native}/generated/opencl" includes="*.c"/> | |
| 31 | + <fileset dir="${native}/generated/opengl" includes="*.c"/> | |
| 32 | </apply> | |
| 33 | <apply dir="." parallel="true" executable="gcc" failonerror="true"> | |
| 34 | <srcfile/> |