Changeset 866


Ignore:
Timestamp:
Apr 24, 2006, 11:45:26 PM (14 years ago)
Author:
Sam Hocevar
Message:
  • Brought the Win32 build back on its wheels.
Location:
libcaca/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • libcaca/trunk/build-win32

    r628 r866  
    1515
    1616# Build for win32
    17 ./configure --host=i586-mingw32msvc --prefix=/ --bindir=/bin --libdir=/lib --disable-imlib2 --disable-doc
     17./configure --host=i586-mingw32msvc --prefix=/ --bindir=/bin --libdir=/lib --disable-imlib2 --disable-doc --disable-pangoft2
    1818make pkglibdir=/lib pkgdatadir=/data bindir=/bin
    1919
    2020# Install into our private directory
    2121make install DESTDIR="${DESTDIR}" pkglibdir=/lib/ pkgdatadir=/ bindir=/bin/
    22 cp COPYING COPYING.LGPL "${DESTDIR}/share/doc/libcaca-dev/"
    2322
    2423mv "${DESTDIR}/bin/"* "${DESTDIR}/"
     
    3029
    3130mkdir "${DESTDIR}/doc"
    32 for f in `ls "${DESTDIR}/share/doc/libcaca-dev/"`; do
     31for f in COPYING COPYING.LGPL COPYING.GPL README AUTHORS NEWS NOTES THANKS TODO; do
    3332   sed -e 's/$/
    34 /' < "${DESTDIR}/share/doc/libcaca-dev/${f}" > "${DESTDIR}/doc/${f}.txt"
     33/' < "${f}" > "${DESTDIR}/doc/${f}.txt"
    3534done
    3635rm -Rf "${DESTDIR}/share"
  • libcaca/trunk/configure.ac

    r865 r866  
    6161AC_ARG_ENABLE(doc,
    6262  [  --enable-doc            build documentation (needs doxygen and LaTeX)])
     63AC_ARG_ENABLE(pangoft2,
     64  [  --enable-pangoft2       build font generator tool (autodetected)])
    6365
    6466AC_CHECK_HEADERS(stdio.h stdarg.h signal.h sys/ioctl.h sys/time.h inttypes.h endian.h unistd.h arpa/inet.h netinet/in.h winsock2.h)
     
    250252AM_CONDITIONAL(USE_CPP, test "${ac_cv_my_have_cpp}" = "yes")
    251253
     254# Build cacaserver?
     255ac_cv_my_have_fcntl="no"
     256AC_CHECK_FUNC(fcntl,
     257 [ac_cv_my_have_fcntl="yes"])
     258AM_CONDITIONAL(USE_FCNTL, test "${ac_cv_my_have_fcntl}" = "yes")
     259
    252260# Use Imlib2?
    253261ac_cv_my_have_imlib2="no"
     
    268276# Build development tools?
    269277PANGOFT2="no"
    270 PKG_CHECK_MODULES(pangoft2, pangoft2, [PANGOFT2="yes"], [AC_MSG_RESULT(no)])
     278if test "${enable_pangoft2}" != "no"; then
     279  PKG_CHECK_MODULES(pangoft2, pangoft2, [PANGOFT2="yes"], [AC_MSG_RESULT(no)])
     280fi
    271281AM_CONDITIONAL(USE_PANGO, test "${PANGOFT2}" != "no")
    272282
  • libcaca/trunk/src/Makefile.am

    r741 r866  
    66AM_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca -DLIBCACA=1 -DX_DISPLAY_MISSING=1
    77
    8 bin_PROGRAMS = cacafire cacaball cacaplas cacaserver cacamoir cacaplay cacaview img2irc
     8bin_PROGRAMS = cacafire cacaball cacaplas cacamoir cacaplay cacaview img2irc $(fcntl_programs)
    99
    1010cacafire_SOURCES = aafire.c
     
    4444endif
    4545
     46if USE_FCNTL
     47fcntl_programs = cacaserver
     48else
     49fcntl_programs =
     50endif
     51
  • libcaca/trunk/src/cacaserver.c

    r865 r866  
    2525#elif defined(HAVE_WINSOCK2_H)
    2626#   include <winsock2.h>
     27#   include <ws2tcpip.h>
    2728#endif
    2829#include <sys/types.h>
Note: See TracChangeset for help on using the changeset viewer.