Changeset 2883Tweet

Timestamp:

Oct 6, 2008, 9:41:37 PM (14 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Added temporary autoconf support for OSX

Location:

libpipi/trunk

Files:

• configure.ac (modified) (3 diffs)
• pipi-sharp/pipi-sharp.dll.config (modified) (1 diff)
• pipi-sharp/pipi-sharp.dll.config.in (modified) (1 diff)

libpipi/trunk/configure.ac

@@ -21 +21 @@
 AM_PROG_CC_C_O
 AC_PROG_CPP
+AC_PROG_OBJC
+_AM_DEPENDENCIES([OBJC])
+OBJC="${CC}"
+AC_SUBST(OBJC)
+AC_SUBST(OBJCFLAGS)
 
 AC_LIBTOOL_WIN32_DLL
@@ -117 +122 @@
 AM_CONDITIONAL(USE_GDI, test "${ac_cv_my_have_gdi}" = "yes")
 
-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
-  AC_MSG_ERROR([[cannot find DevIL, OLE, SDL_Image, Imlib2 or OpenCV, please install one of them]])
+# Use Cocoa? 
+ac_cv_my_have_cocoa="no"
+AC_CHECK_HEADERS(/System/Library/Frameworks/Cocoa.framework/Headers/Cocoa.h,
+[
+ MACOSX_SDK_FRAMEWORKS="-F${MACOSX_SDK}/System/Library/Frameworks"
+ CPPFLAGS="${CPPFLAGS} ${ARCH} ${MACOSX_SDK_FRAMEWORKS}"
+ CFLAGS="${CFLAGS} ${MACOSX_SDK_CFLAGS}"
+ CXXFLAGS="${CXXFLAGS} ${MACOSX_SDK_CXXFLAGS}"
+ OBJCFLAGS="${OBJCFLAGS} ${MACOSX_SDK_CFLAGS}"
+ LDFLAGS="${ARCH} ${MACOSX_SDK_LDFLAGS} ${LDFLAGS}"
+ AC_DEFINE(USE_COCOA, 1, Define to 1 to activate the Cocoa backend driver)
+#    CACA_LIBS="${CACA_LIBS} -Wl,-syslibroot,${MACOSX_SDK},-framework,Cocoa"
+#    CACA_DRIVERS="${CACA_DRIVERS} cocoa"
+ ac_cv_my_have_cocoa="yes"],
+ [ac_cv_my_have_cocoa="no"]
+ )
+AM_CONDITIONAL(USE_COCOA, test "${ac_cv_my_have_cocoa}" = "yes")
+
+
+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" -a "${ac_cv_my_have_cocoa}" = "no"; then
+  AC_MSG_ERROR([[cannot find DevIL, OLE, SDL_Image, Imlib2, Cocoa, or OpenCV, please install one of them]])
 fi
 
@@ -127 +151 @@
 PKG_CHECK_MODULES([GTK_SHARP_20], [gtk-sharp-2.0], [:])
 AM_CONDITIONAL(USE_CSHARP, test "${gmcs}" != "no")
+
 
 AC_CONFIG_FILES([

libpipi/trunk/pipi-sharp/pipi-sharp.dll.config

@@ -1 +1 @@
 <configuration>
     <dllmap dll="libpipi.dll" target="../pipi/.libs/libpipi.so.0" />
+    <dllmap dll="libpipi.dll" target="../pipi/.libs/libpipi.0.dylib" />    
 </configuration>

libpipi/trunk/pipi-sharp/pipi-sharp.dll.config.in

@@ -1 +1 @@
 <configuration>
     <dllmap dll="libpipi.dll" target="../pipi/.libs/libpipi.so.@LT_MAJOR@" />
+    <dllmap dll="libpipi.dll" target="../pipi/.libs/libpipi.@LT_MAJOR@.dylib" />    
 </configuration>