Mercurial > dwindows

diff configure.in @ 662:d7badd5606ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed the Carbon source file, and changes to configure to build the Cocoa version. Mac GTK version should still work. Carbon was unfinished, Cocoa version is more complete.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Fri, 25 Feb 2011 15:25:54 +0000
parents 903a8f7bcb7c
children 39d848c20c05
line wrap: on
line diff
--- a/configure.in	Fri Feb 25 03:45:44 2011 +0000
+++ b/configure.in	Fri Feb 25 15:25:54 2011 +0000
@@ -10,7 +10,8 @@
 AC_SUBST(TARGET)
 AC_SUBST(TARGET2)
 
-DW_SRC=gtk
+DW_DIR=gtk
+DW_SRC=dw.c
 DW_DEFINE=__UNIX__
 SHAREDFLAG=-shared
 SOSUFFIX=so
@@ -138,13 +139,15 @@
    SHAREDFLAG="-dynamiclib -flat_namespace -undefined suppress"
    SOSUFFIX=dylib
    if test $with_gtk = yes; then
-      DW_SRC=gtk
+      DW_DIR=gtk
+      DW_SRC=dw.c
       LIBS="$LIBS -framework Gtk -framework Glib -framework Cairo"
       GTK_CFLAGS="-I/Library/Frameworks/Gtk.framework/Headers -I/Library/Frameworks/Glib.framework/Headers -I/Library/Frameworks/Cairo.framework/Headers"
    else
-      DW_SRC=mac
+      DW_DIR=mac
+      DW_SRC=dw.m
       DW_DEFINE=__MAC__
-      LIBS="$LIBS -framework Carbon"
+      LIBS="$LIBS -framework Cocoa -framework WebKit"
    fi
 else
    AC_CHECK_PROG(PKG_CFG, pkg-config, pkg-config)
@@ -253,6 +256,7 @@
 AC_SUBST(SONAME)
 
 AC_SUBST(DW_SRC)
+AC_SUBST(DW_DIR)
 AC_SUBST(DW_DEFINE)
 AC_SUBST(BROWSER_OBJECT)
 AC_SUBST(COMPAT_OBJECT)