Changeset 4815Tweet

Timestamp:

06/13/12 02:01:12 (12 months ago)

Author:

sam

Message:

build: fix Win32 build and allow to build Win64 binaries from Linux, and
ship the static library and includes too.

Location:

libcaca/trunk

Files:

• Makefile.am (modified) (1 diff)
• build-win32 (modified) (3 diffs)
• build-win64 (copied) (copied from libcaca/trunk/build-win32) (3 diffs)
• caca/caca.h (modified) (2 diffs)

libcaca/trunk/Makefile.am

@@ -5 +5 @@
 DIST_SUBDIRS = $(SUBDIRS) win32
 
-EXTRA_DIST = NOTES COPYING.GPL COPYING.ISC COPYING.LGPL bootstrap build-dos build-kernel build-win32 caca-config.in libcaca.spec libcaca.sln
+EXTRA_DIST = NOTES COPYING.GPL COPYING.ISC COPYING.LGPL bootstrap build-dos build-kernel build-win32 build-win64 caca-config.in libcaca.spec libcaca.sln
 AUTOMAKE_OPTIONS = dist-bzip2
 

libcaca/trunk/build-win32

@@ -8 +8 @@
 # Clean up our working directory
 SRCDIR="`pwd`"
-DIRNAME="libpipi-win32-`sed -ne 's/^AC_INIT(.*, \(.*\)).*/\1/p' configure.ac`"
+DIRNAME="libcaca-win32-`sed -ne 's/^AC_INIT(.*, \(.*\)).*/\1/p' configure.ac`"
 INSTALLDIR="`pwd`/${DIRNAME}"
 BUILDDIR="${INSTALLDIR}/build"
@@ -20 +20 @@
 cd "${BUILDDIR}"
 # Build for win32
-"${SRCDIR}/configure" --host=i586-mingw32msvc --prefix=/ --bindir=/bin --libdir=/lib --disable-imlib2 --disable-java --disable-doc "$@"
-make pkglibdir=/lib pkgdatadir=/data bindir=/bin
+"${SRCDIR}/configure" --host=i686-w64-mingw32 --build=none --prefix=/ --bindir=/bin --libdir=/lib --disable-imlib2 --disable-java --disable-doc "$@"
+make -j4 pkglibdir=/lib pkgdatadir=/data bindir=/bin
 # Install into our private directory
-make install DESTDIR="${INSTALLDIR}" pkglibdir=/lib/ pkgdatadir=/ bindir=/bin/
+make -j4 install DESTDIR="${INSTALLDIR}" pkglibdir=/lib/ pkgdatadir=/ bindir=/bin/
 cd "${SRCDIR}"
 rm -Rf "${BUILDDIR}"
 
 mv "${INSTALLDIR}/bin/"* "${INSTALLDIR}/"
+rmdir "${INSTALLDIR}/bin"
 mv "${INSTALLDIR}/lib/"* "${INSTALLDIR}/"
+for f in libcaca libcaca++; do
+   mv "${INSTALLDIR}/${f}.a" "${INSTALLDIR}/lib/${f}.lib"
+done
 rm -f "${INSTALLDIR}/caca-config.exe" # Just in case. *sigh*.
-i586-mingw32msvc-strip "${INSTALLDIR}/"*.exe || true
-i586-mingw32msvc-strip "${INSTALLDIR}/"*.dll || true
-rmdir "${INSTALLDIR}/bin"
-rmdir "${INSTALLDIR}/lib"
+i686-w64-mingw32-strip "${INSTALLDIR}/"*.exe || true
+i686-w64-mingw32-strip "${INSTALLDIR}/"*.dll || true
 
 mkdir "${INSTALLDIR}/doc"
@@ -42 +44 @@
 rm -Rf "${INSTALLDIR}/share"
 rm -Rf "${INSTALLDIR}/man"
-rm -Rf "${INSTALLDIR}/include"
-rm -Rf "${INSTALLDIR}/pkg-config"
+rm -Rf "${INSTALLDIR}/pkgconfig"
 rm -f "${INSTALLDIR}/caca-config"
 rm -f "${INSTALLDIR}/"*.a

libcaca/trunk/build-win64

@@ -8 +8 @@
 # Clean up our working directory
 SRCDIR="`pwd`"
-DIRNAME="libpipi-win32-`sed -ne 's/^AC_INIT(.*, \(.*\)).*/\1/p' configure.ac`"
+DIRNAME="libcaca-win64-`sed -ne 's/^AC_INIT(.*, \(.*\)).*/\1/p' configure.ac`"
 INSTALLDIR="`pwd`/${DIRNAME}"
 BUILDDIR="${INSTALLDIR}/build"
@@ -19 +19 @@
 
 cd "${BUILDDIR}"
-# Build for win32
-"${SRCDIR}/configure" --host=i586-mingw32msvc --prefix=/ --bindir=/bin --libdir=/lib --disable-imlib2 --disable-java --disable-doc "$@"
-make pkglibdir=/lib pkgdatadir=/data bindir=/bin
+# Build for win64
+"${SRCDIR}/configure" --host=x86_64-w64-mingw32 --build=none --prefix=/ --bindir=/bin --libdir=/lib --disable-imlib2 --disable-java --disable-doc "$@"
+make -j4 pkglibdir=/lib pkgdatadir=/data bindir=/bin
 # Install into our private directory
-make install DESTDIR="${INSTALLDIR}" pkglibdir=/lib/ pkgdatadir=/ bindir=/bin/
+make -j4 install DESTDIR="${INSTALLDIR}" pkglibdir=/lib/ pkgdatadir=/ bindir=/bin/
 cd "${SRCDIR}"
 rm -Rf "${BUILDDIR}"
 
 mv "${INSTALLDIR}/bin/"* "${INSTALLDIR}/"
+rmdir "${INSTALLDIR}/bin"
 mv "${INSTALLDIR}/lib/"* "${INSTALLDIR}/"
+for f in libcaca libcaca++; do
+   mv "${INSTALLDIR}/${f}.a" "${INSTALLDIR}/lib/${f}.lib"
+done
 rm -f "${INSTALLDIR}/caca-config.exe" # Just in case. *sigh*.
-i586-mingw32msvc-strip "${INSTALLDIR}/"*.exe || true
-i586-mingw32msvc-strip "${INSTALLDIR}/"*.dll || true
-rmdir "${INSTALLDIR}/bin"
-rmdir "${INSTALLDIR}/lib"
+x86_64-w64-mingw32-strip "${INSTALLDIR}/"*.exe || true
+x86_64-w64-mingw32-strip "${INSTALLDIR}/"*.dll || true
 
 mkdir "${INSTALLDIR}/doc"
@@ -42 +44 @@
 rm -Rf "${INSTALLDIR}/share"
 rm -Rf "${INSTALLDIR}/man"
-rm -Rf "${INSTALLDIR}/include"
-rm -Rf "${INSTALLDIR}/pkg-config"
+rm -Rf "${INSTALLDIR}/pkgconfig"
 rm -f "${INSTALLDIR}/caca-config"
 rm -f "${INSTALLDIR}/"*.a

libcaca/trunk/caca/caca.h

@@ -721 +721 @@
 __extern caca_canvas_t * cucul_import_canvas(cucul_buffer_t *,
                                               char const *) CACA_DEPRECATED;
+#if !defined _WIN32 || !defined __GNUC__
 __extern ssize_t caca_import_memory(caca_canvas_t *, void const *, size_t,
                                     char const *) CACA_DEPRECATED;
@@ -727 +728 @@
 __extern void *caca_export_memory(caca_canvas_t const *, char const *,
                                   size_t *) CACA_DEPRECATED;
+#endif
 __extern int cucul_rotate(caca_canvas_t *) CACA_DEPRECATED;
 __extern int cucul_set_dither_invert(caca_dither_t *, int) CACA_DEPRECATED;