From 730d3f84683be058f69955e130d8744cd4dcec15 Mon Sep 17 00:00:00 2001
From: Jonas Maebe <jonas@freepascal.org>
Date: Sun, 12 Nov 2006 10:45:58 +0000
Subject: [PATCH]   * don't compile svgalib/ggi for darwin since those
 libraries don't     exist for it

git-svn-id: trunk@5337 -
---
 packages/extra/Makefile     | 12 ++++--------
 packages/extra/Makefile.fpc |  2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/packages/extra/Makefile b/packages/extra/Makefile
index 89a022f2be..a959bfcba2 100644
--- a/packages/extra/Makefile
+++ b/packages/extra/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/08/20]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/10/31]
 #
 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-darwin 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-amiga powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-palmos arm-wince arm-gba powerpc64-linux
@@ -258,7 +258,7 @@ ifeq ($(FULL_TARGET),i386-openbsd)
 override TARGET_DIRS+=unzip zlib x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 openssl libcurl
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 univint openssl libcurl
+override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 univint openssl libcurl
 endif
 ifeq ($(FULL_TARGET),i386-emx)
 override TARGET_DIRS+=os2units rexx unzip zlib x11 gtk libpng tcl imlib fpgtk
@@ -297,7 +297,7 @@ ifeq ($(FULL_TARGET),powerpc-amiga)
 override TARGET_DIRS+=amunits
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 univint openssl libcurl
+override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 univint openssl libcurl
 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 newt uuid ldap openal mad oggvorbis a52 modplug dts openssl libcurl
@@ -1125,7 +1125,7 @@ ifeq ($(CPU_TARGET),powerpc)
 FPCCPUOPT:=-O1r
 endif
 else
-FPCCPUOPT:=-O1r
+FPCCPUOPT:=-O2
 endif
 override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
@@ -1573,8 +1573,6 @@ TARGET_DIRS_GTK=1
 TARGET_DIRS_GTK2=1
 TARGET_DIRS_SYSLOG=1
 TARGET_DIRS_FORMS=1
-TARGET_DIRS_SVGALIB=1
-TARGET_DIRS_GGI=1
 TARGET_DIRS_LIBPNG=1
 TARGET_DIRS_LIBGD=1
 TARGET_DIRS_UTMP=1
@@ -1795,8 +1793,6 @@ TARGET_DIRS_GTK=1
 TARGET_DIRS_GTK2=1
 TARGET_DIRS_SYSLOG=1
 TARGET_DIRS_FORMS=1
-TARGET_DIRS_SVGALIB=1
-TARGET_DIRS_GGI=1
 TARGET_DIRS_LIBPNG=1
 TARGET_DIRS_LIBGD=1
 TARGET_DIRS_UTMP=1
diff --git a/packages/extra/Makefile.fpc b/packages/extra/Makefile.fpc
index 1d96875aec..e652bf3921 100644
--- a/packages/extra/Makefile.fpc
+++ b/packages/extra/Makefile.fpc
@@ -52,7 +52,7 @@ dirs_netware=unzip zlib openssl
 dirs_netwlibc=unzip zlib openssl
 dirs_darwin= unzip zlib fftw \
              x11 opengl gtk gtk2 syslog \
-             forms svgalib ggi libpng libgd \
+             forms libpng libgd \
              utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 \
              univint openssl libcurl
 dirs_solaris= unzip zlib fftw \