* fixed and enabled gtk2 for Darwin/Mac OS X (Lazarus built for gtk2 works

    with fink installed gtk+2-dev package; note that first startup of gtk2
    program takes very long because of font conversions of all installed fonts)

git-svn-id: trunk@1905 -

packages/extra/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/12/04]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/10/20]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -285,7 +285,7 @@ ifeq ($(FULL_TARGET),powerpc-netbsd)
 override TARGET_DIRS+=unzip zlib x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1
+override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
 override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk unixutil newt uuid
@@ -1156,14 +1156,6 @@ override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
 endif
-override AFULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)
-override AFULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)
-ifneq ($(AFULL_TARGET),$(AFULL_SOURCE))
-override ACROSSCOMPILE=1
-endif
-ifdef ACROSSCOMPILE
-override FPCOPT+=$(CROSSOPT)
-endif
 override COMPILER:=$(FPC) $(FPCOPT)
 ifeq (,$(findstring -s ,$(COMPILER)))
 EXECPPAS=
@@ -1641,6 +1633,7 @@ TARGET_DIRS_FFTW=1
 TARGET_DIRS_X11=1
 TARGET_DIRS_OPENGL=1
 TARGET_DIRS_GTK=1
+TARGET_DIRS_GTK2=1
 TARGET_DIRS_SYSLOG=1
 TARGET_DIRS_FORMS=1
 TARGET_DIRS_SVGALIB=1

packages/extra/Makefile.fpc

@@ -40,7 +40,7 @@ dirs_palmos=palmunits
 dirs_netware=unzip zlib
 dirs_netwlibc=unzip zlib
 dirs_darwin= unzip zlib fftw \
-             x11 opengl gtk syslog \
+             x11 opengl gtk gtk2 syslog \
              forms svgalib ggi libpng libgd \
              utmp bfd gdbm ncurses fpgtk tcl imlib gnome1
 

packages/extra/gtk2/gtk+/gdk-pixbuf/gdk2pixbuf.pas

@@ -43,10 +43,21 @@ const
   {$smartlink on}
   {$ENDIF}
 {$else}
-  {$ifdef UseCustomLibs}
-  gdkpixbuflib = '';
+  {$ifdef darwin}
+    gdkpixbuflib = 'gdk_pixbuf-2.0.0';
+    {$linklib gtk-x11-2.0}
+    {$linklib gdk-x11-2.0}
+    {$linklib pango-1.0.0}
+    {$linklib glib-2.0.0}
+    {$linklib gobject-2.0.0} 
+    {$linklib gdk_pixbuf-2.0.0} 
+    {$linklib atk-1.0.0}
   {$else}
-  gdkpixbuflib = 'libgdk_pixbuf-2.0.so';
+    {$ifdef UseCustomLibs}
+    gdkpixbuflib = '';
+    {$else}
+    gdkpixbuflib = 'libgdk_pixbuf-2.0.so';
+    {$endif}
   {$endif}
 {$endif}
 

packages/extra/gtk2/gtk+/gdk/gdk2.pas

@@ -42,10 +42,21 @@ const
   GDK_HAVE_WCHAR_H=1;
   GDK_HAVE_WCTYPE_H=1;
 {$else}
-  {$ifdef UseCustomLibs}
-  gdklib = '';
+  {$ifdef darwin}
+    gdklib = 'gdk-x11-2.0';
+    {$linklib gtk-x11-2.0}
+    {$linklib gdk-x11-2.0}
+    {$linklib pango-1.0.0}
+    {$linklib glib-2.0.0}
+    {$linklib gobject-2.0.0}
+    {$linklib gdk_pixbuf-2.0.0}
+    {$linklib atk-1.0.0}
   {$else}
-  gdklib = 'libgdk-x11-2.0.so';
+    {$ifdef UseCustomLibs}
+    gdklib = '';
+    {$else}
+    gdklib = 'libgdk-x11-2.0.so';
+    {$endif}
   {$endif}
 {$endif}
 

packages/extra/gtk2/gtk+/gtk/gtk2.pas

@@ -71,10 +71,21 @@ const
   {$IFDEF KYLIX}
     gtklib = 'libgtk-x11-2.0.so';
   {$ELSE}
-    {$ifdef UseCustomLibs}
-    gtklib = '';
+    {$ifdef darwin}
+      gtklib = 'gtk-x11-2.0';
+      {$linklib gtk-x11-2.0}
+      {$linklib gdk-x11-2.0}
+      {$linklib pango-1.0.0}
+      {$linklib glib-2.0.0}
+      {$linklib gobject-2.0.0} 
+      {$linklib gdk_pixbuf-2.0.0} 
+      {$linklib atk-1.0.0}
     {$else}
-    gtklib = 'libgtk-x11-2.0.so';
+      {$ifdef UseCustomLibs}
+      gtklib = '';
+      {$else}
+      gtklib = 'libgtk-x11-2.0.so';
+      {$endif}
     {$endif}
   {$ENDIF}
 {$endif}