Rebuild linux/amd64 libs using builtin libjpeg/libpng and zlib

For #138
pwiecz · Nov 19, 2024 · 5d5bf95 · 5d5bf95
1 parent f0b2aa6
commit 5d5bf95
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/cgo_linux_amd64.go b/cgo_linux_amd64.go
@@ -3,6 +3,6 @@
 package fltk
 
 // #cgo linux,amd64 CXXFLAGS: -std=c++11
-// #cgo linux,amd64 CPPFLAGS: -I${SRCDIR}/include/linux/amd64 -I${SRCDIR}/include/linux/amd64/png -I${SRCDIR}/include/linux/amd64/zlib -I${SRCDIR}/include/linux/amd64/jpeg -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_THREAD_SAFE -D_REENTRANT
-// #cgo linux,amd64 LDFLAGS: ${SRCDIR}/lib/linux/amd64/libfltk_images.a /usr/lib/x86_64-linux-gnu/libjpeg.so /usr/lib/x86_64-linux-gnu/libpng.so /usr/lib/x86_64-linux-gnu/libz.so ${SRCDIR}/lib/linux/amd64/libfltk_gl.a -L/usr/lib/x86_64-linux-gnu -lwayland-egl -lwayland-client -lEGL -lGLU -lGL ${SRCDIR}/lib/linux/amd64/libfltk_forms.a ${SRCDIR}/lib/linux/amd64/libfltk.a -lm -lpthread -lXinerama -lXfixes -lXcursor -L/usr/lib/x86_64-linux-gnu -lpangoxft-1.0 -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lXft -lpangocairo-1.0 -lcairo -lX11 -lXrender -lwayland-cursor -lwayland-client -lxkbcommon -ldbus-1 -ldecor-0 -ldl
+// #cgo linux,amd64 CPPFLAGS: -I${SRCDIR}/include/linux/amd64 -I${SRCDIR}/include/linux/amd64/FL/images -I${SRCDIR}/include/linux/amd64/png -I${SRCDIR}/include/linux/amd64/zlib -I${SRCDIR}/include/linux/amd64/jpeg -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_THREAD_SAFE -D_REENTRANT
+// #cgo linux,amd64 LDFLAGS: ${SRCDIR}/lib/linux/amd64/libfltk_images.a ${SRCDIR}/lib/linux/amd64/libfltk_jpeg.a ${SRCDIR}/lib/linux/amd64/libfltk_png.a ${SRCDIR}/lib/linux/amd64/libfltk_z.a ${SRCDIR}/lib/linux/amd64/libfltk_gl.a -L/usr/lib/x86_64-linux-gnu -lwayland-egl -lwayland-client -lEGL -lGLU -lGL ${SRCDIR}/lib/linux/amd64/libfltk_forms.a ${SRCDIR}/lib/linux/amd64/libfltk.a -lm -lpthread -lXinerama -lXfixes -lXcursor -L/usr/lib/x86_64-linux-gnu -lpangoxft-1.0 -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lfontconfig -lfreetype -lXft -lpangocairo-1.0 -lcairo -lX11 -lXrender -lwayland-cursor -lwayland-client -lxkbcommon -ldbus-1 -ldecor-0 -ldl
 import "C"
diff --git a/fltk-build.go b/fltk-build.go
@@ -134,11 +134,12 @@ func main() {
 		"-DFLTK_BUILD_TEST=OFF",
 		"-DFLTK_BUILD_EXAMPLES=OFF",
 		"-DFLTK_BUILD_FLUID=OFF",
+		"-DFLTK_BUILD_HTML_DOCS=OFF",
+		"-DFLTK_BUILD_PDF_DOCS=OFF",
 		"-DFLTK_BUILD_FLTK_OPTIONS=OFF",
-		"-DOPTION_USE_WAYLAND=OFF",
-		"-DOPTION_USE_SYSTEM_LIBJPEG=OFF",
-		"-DOPTION_USE_SYSTEM_LIBPNG=OFF",
-		"-DOPTION_USE_SYSTEM_ZLIB=OFF",
+		"-DFLTK_USE_SYSTEM_LIBJPEG=OFF",
+		"-DFLTK_USE_SYSTEM_LIBPNG=OFF",
+		"-DFLTK_USE_SYSTEM_ZLIB=OFF",
 		"-DCMAKE_INSTALL_PREFIX="+currentDir,
 		"-DCMAKE_INSTALL_INCLUDEDIR="+includeDir,
 		"-DCMAKE_INSTALL_LIBDIR="+libDir,

diff --git a/lib/linux/amd64/libfltk_images.a b/lib/linux/amd64/libfltk_images.a
diff --git a/lib/linux/amd64/libfltk_jpeg.a b/lib/linux/amd64/libfltk_jpeg.a
diff --git a/lib/linux/amd64/libfltk_png.a b/lib/linux/amd64/libfltk_png.a
diff --git a/lib/linux/amd64/libfltk_z.a b/lib/linux/amd64/libfltk_z.a