Changeset 2883 for libpipi/trunk


Ignore:
Timestamp:
Oct 6, 2008, 9:41:37 PM (12 years ago)
Author:
Jean-Yves Lamoureux
Message:
  • Added temporary autoconf support for OSX
Location:
libpipi/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • libpipi/trunk/configure.ac

    r2869 r2883  
    2121AM_PROG_CC_C_O
    2222AC_PROG_CPP
     23AC_PROG_OBJC
     24_AM_DEPENDENCIES([OBJC])
     25OBJC="${CC}"
     26AC_SUBST(OBJC)
     27AC_SUBST(OBJCFLAGS)
    2328
    2429AC_LIBTOOL_WIN32_DLL
     
    117122AM_CONDITIONAL(USE_GDI, test "${ac_cv_my_have_gdi}" = "yes")
    118123
    119 if test "${ac_cv_my_have_il}" = "no" -a "${ac_cv_my_have_ole}" = "no" -a "${ac_cv_my_have_sdl}" = "no" -a "${ac_cv_my_have_imlib2}" = "no" -a "${ac_cv_my_have_opencv}" = "no"; then
    120   AC_MSG_ERROR([[cannot find DevIL, OLE, SDL_Image, Imlib2 or OpenCV, please install one of them]])
     124# Use Cocoa?
     125ac_cv_my_have_cocoa="no"
     126AC_CHECK_HEADERS(/System/Library/Frameworks/Cocoa.framework/Headers/Cocoa.h,
     127[
     128 MACOSX_SDK_FRAMEWORKS="-F${MACOSX_SDK}/System/Library/Frameworks"
     129 CPPFLAGS="${CPPFLAGS} ${ARCH} ${MACOSX_SDK_FRAMEWORKS}"
     130 CFLAGS="${CFLAGS} ${MACOSX_SDK_CFLAGS}"
     131 CXXFLAGS="${CXXFLAGS} ${MACOSX_SDK_CXXFLAGS}"
     132 OBJCFLAGS="${OBJCFLAGS} ${MACOSX_SDK_CFLAGS}"
     133 LDFLAGS="${ARCH} ${MACOSX_SDK_LDFLAGS} ${LDFLAGS}"
     134 AC_DEFINE(USE_COCOA, 1, Define to 1 to activate the Cocoa backend driver)
     135#    CACA_LIBS="${CACA_LIBS} -Wl,-syslibroot,${MACOSX_SDK},-framework,Cocoa"
     136#    CACA_DRIVERS="${CACA_DRIVERS} cocoa"
     137 ac_cv_my_have_cocoa="yes"],
     138 [ac_cv_my_have_cocoa="no"]
     139 )
     140AM_CONDITIONAL(USE_COCOA, test "${ac_cv_my_have_cocoa}" = "yes")
     141
     142
     143if test "${ac_cv_my_have_il}" = "no" -a "${ac_cv_my_have_ole}" = "no" -a "${ac_cv_my_have_sdl}" = "no" -a "${ac_cv_my_have_imlib2}" = "no" -a "${ac_cv_my_have_opencv}" = "no" -a "${ac_cv_my_have_cocoa}" = "no"; then
     144  AC_MSG_ERROR([[cannot find DevIL, OLE, SDL_Image, Imlib2, Cocoa, or OpenCV, please install one of them]])
    121145fi
    122146
     
    127151PKG_CHECK_MODULES([GTK_SHARP_20], [gtk-sharp-2.0], [:])
    128152AM_CONDITIONAL(USE_CSHARP, test "${gmcs}" != "no")
     153
    129154
    130155AC_CONFIG_FILES([
  • libpipi/trunk/pipi-sharp/pipi-sharp.dll.config

    r2869 r2883  
    11<configuration>
    22    <dllmap dll="libpipi.dll" target="../pipi/.libs/libpipi.so.0" />
     3    <dllmap dll="libpipi.dll" target="../pipi/.libs/libpipi.0.dylib" />   
    34</configuration>
  • libpipi/trunk/pipi-sharp/pipi-sharp.dll.config.in

    r2869 r2883  
    11<configuration>
    22    <dllmap dll="libpipi.dll" target="../pipi/.libs/libpipi.so.@LT_MAJOR@" />
     3    <dllmap dll="libpipi.dll" target="../pipi/.libs/libpipi.@LT_MAJOR@.dylib" />   
    34</configuration>
Note: See TracChangeset for help on using the changeset viewer.