From 0d29519e8d859a518310e76f3b315cc01fab5cb8 Mon Sep 17 00:00:00 2001
From: vincents <vincents@lazarus-ide.org>
Date: Thu, 8 Feb 2007 20:55:51 +0000
Subject: [PATCH] tools: add library paths for darwin to the makefile

git-svn-id: trunk@10613 -
---
 tools/Makefile                          | 120 ++++++++++++++++--------
 tools/Makefile.fpc                      |   8 +-
 tools/apiwizz/Makefile                  | 113 ++++++++++++++--------
 tools/apiwizz/Makefile.fpc              |   7 +-
 tools/install/macosx/makefpcsnapshot.sh |   2 +-
 5 files changed, 164 insertions(+), 86 deletions(-)

diff --git a/tools/Makefile b/tools/Makefile
index f070f7b63e..9fdc46f524 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,8 +1,8 @@
 #
-#  Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/04/28]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/06/29]
 #
 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-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 powerpc64-linux
+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-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
 BSDs = freebsd netbsd openbsd darwin
 UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
@@ -240,6 +240,9 @@ LCL_PLATFORM=gtk
 endif
 endif
 export LCL_PLATFORM
+ifeq ($(OS_TARGET),darwin)
+LAZARUS_LIBPATHS=-Fl/usr/X11R6/lib -Fl/sw/lib
+endif
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_DIRS+=apiwizz
 endif
@@ -354,6 +357,9 @@ endif
 ifeq ($(FULL_TARGET),arm-wince)
 override TARGET_DIRS+=apiwizz
 endif
+ifeq ($(FULL_TARGET),arm-gba)
+override TARGET_DIRS+=apiwizz
+endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 override TARGET_DIRS+=apiwizz
 endif
@@ -471,125 +477,131 @@ endif
 ifeq ($(FULL_TARGET),arm-wince)
 override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles
 endif
+ifeq ($(FULL_TARGET),arm-gba)
+override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles
+endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles
 endif
 ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
+endif
+ifeq ($(FULL_TARGET),arm-gba)
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),i386-linux)
 override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
@@ -705,6 +717,9 @@ endif
 ifeq ($(FULL_TARGET),arm-wince)
 override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
 endif
+ifeq ($(FULL_TARGET),arm-gba)
+override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
 endif
@@ -822,6 +837,9 @@ endif
 ifeq ($(FULL_TARGET),arm-wince)
 override COMPILER_TARGETDIR+=.
 endif
+ifeq ($(FULL_TARGET),arm-gba)
+override COMPILER_TARGETDIR+=.
+endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 override COMPILER_TARGETDIR+=.
 endif
@@ -939,6 +957,9 @@ endif
 ifeq ($(FULL_TARGET),arm-wince)
 override COMPILER_UNITTARGETDIR+=.
 endif
+ifeq ($(FULL_TARGET),arm-gba)
+override COMPILER_UNITTARGETDIR+=.
+endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 override COMPILER_UNITTARGETDIR+=.
 endif
@@ -1294,6 +1315,11 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
+ifeq ($(OS_TARGET),gba)
+EXEEXT=.gba
+SHAREDLIBEXT=.so
+SHORTSUFFIX=gba
+endif
 else
 ifeq ($(OS_TARGET),go32v1)
 PPUEXT=.pp1
@@ -2162,6 +2188,14 @@ REQUIRE_PACKAGES_IBASE=1
 REQUIRE_PACKAGES_POSTGRES=1
 REQUIRE_PACKAGES_SQLITE=1
 endif
+ifeq ($(FULL_TARGET),arm-gba)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL=1
+REQUIRE_PACKAGES_PASJPEG=1
+REQUIRE_PACKAGES_NETDB=1
+endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_HASH=1
@@ -3223,6 +3257,9 @@ endif
 ifeq ($(FULL_TARGET),arm-wince)
 TARGET_DIRS_APIWIZZ=1
 endif
+ifeq ($(FULL_TARGET),arm-gba)
+TARGET_DIRS_APIWIZZ=1
+endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 TARGET_DIRS_APIWIZZ=1
 endif
@@ -3296,6 +3333,7 @@ include fpcmake.loc
 endif
 .PHONY: all
 all: apiwizz_all
+	echo $(LAZARUS_LIBPATHS)
 	$(MAKE) --assume-new=lazres.pp lazres$(EXEEXT)
 	$(MAKE) --assume-new=svn2revisioninc.pas svn2revisioninc$(EXEEXT)
 	$(MAKE) --assume-new=updatepofiles.pas updatepofiles$(EXEEXT)
diff --git a/tools/Makefile.fpc b/tools/Makefile.fpc
index 3ce6274f77..30c2904ebe 100644
--- a/tools/Makefile.fpc
+++ b/tools/Makefile.fpc
@@ -15,7 +15,7 @@ programs=lazres svn2revisioninc updatepofiles
 packages=rtl fcl
 
 [compiler]
-options=-gl
+options=-gl $(LAZARUS_LIBPATHS)
 unitdir=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) \
           $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
 unittargetdir=.
@@ -24,7 +24,6 @@ targetdir=.
 [prerules]
 LAZDIR=..
 
-[prerules]
 # LCL Platform
 ifndef LCL_PLATFORM
 ifeq ($(OS_TARGET),win32)
@@ -35,11 +34,16 @@ endif
 endif
 export LCL_PLATFORM
 
+ifeq ($(OS_TARGET),darwin)
+LAZARUS_LIBPATHS=-Fl/usr/X11R6/lib -Fl/sw/lib
+endif
+
 
 [rules]
 .PHONY: all
 
 all: apiwizz_all
+        echo $(LAZARUS_LIBPATHS)
         $(MAKE) --assume-new=lazres.pp lazres$(EXEEXT)
         $(MAKE) --assume-new=svn2revisioninc.pas svn2revisioninc$(EXEEXT)
         $(MAKE) --assume-new=updatepofiles.pas updatepofiles$(EXEEXT)
diff --git a/tools/apiwizz/Makefile b/tools/apiwizz/Makefile
index c6de783d44..b5c44a5c8c 100644
--- a/tools/apiwizz/Makefile
+++ b/tools/apiwizz/Makefile
@@ -1,8 +1,8 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/04/28]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/06/29]
 #
 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-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 powerpc64-linux
+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-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
 BSDs = freebsd netbsd openbsd darwin
 UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
@@ -240,6 +240,9 @@ LCL_PLATFORM=gtk
 endif
 endif
 export LCL_PLATFORM
+ifeq ($(OS_TARGET),darwin)
+LAZARUS_LIBPATHS=-Fl/usr/X11R6/lib -Fl/sw/lib
+endif
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_PROGRAMS+=apiwizz
 endif
@@ -354,125 +357,131 @@ endif
 ifeq ($(FULL_TARGET),arm-wince)
 override TARGET_PROGRAMS+=apiwizz
 endif
+ifeq ($(FULL_TARGET),arm-gba)
+override TARGET_PROGRAMS+=apiwizz
+endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 override TARGET_PROGRAMS+=apiwizz
 endif
 ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
+endif
+ifeq ($(FULL_TARGET),arm-gba)
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_OPTIONS+=-gl
+override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
 endif
 ifeq ($(FULL_TARGET),i386-linux)
 override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
@@ -588,6 +597,9 @@ endif
 ifeq ($(FULL_TARGET),arm-wince)
 override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
 endif
+ifeq ($(FULL_TARGET),arm-gba)
+override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
 endif
@@ -705,6 +717,9 @@ endif
 ifeq ($(FULL_TARGET),arm-wince)
 override COMPILER_TARGETDIR+=.
 endif
+ifeq ($(FULL_TARGET),arm-gba)
+override COMPILER_TARGETDIR+=.
+endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 override COMPILER_TARGETDIR+=.
 endif
@@ -822,6 +837,9 @@ endif
 ifeq ($(FULL_TARGET),arm-wince)
 override COMPILER_UNITTARGETDIR+=.
 endif
+ifeq ($(FULL_TARGET),arm-gba)
+override COMPILER_UNITTARGETDIR+=.
+endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 override COMPILER_UNITTARGETDIR+=.
 endif
@@ -1177,6 +1195,11 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
+ifeq ($(OS_TARGET),gba)
+EXEEXT=.gba
+SHAREDLIBEXT=.so
+SHORTSUFFIX=gba
+endif
 else
 ifeq ($(OS_TARGET),go32v1)
 PPUEXT=.pp1
@@ -2045,6 +2068,14 @@ REQUIRE_PACKAGES_IBASE=1
 REQUIRE_PACKAGES_POSTGRES=1
 REQUIRE_PACKAGES_SQLITE=1
 endif
+ifeq ($(FULL_TARGET),arm-gba)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL=1
+REQUIRE_PACKAGES_PASJPEG=1
+REQUIRE_PACKAGES_NETDB=1
+endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_HASH=1
diff --git a/tools/apiwizz/Makefile.fpc b/tools/apiwizz/Makefile.fpc
index d4bb88bb2a..3b1fb0d6fe 100644
--- a/tools/apiwizz/Makefile.fpc
+++ b/tools/apiwizz/Makefile.fpc
@@ -16,7 +16,7 @@ packages=rtl fcl
 #units=apiwizard
 
 [compiler]
-options=-gl
+options=-gl $(LAZARUS_LIBPATHS)
 unitdir=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) \
           $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
 unittargetdir=.
@@ -34,6 +34,11 @@ endif
 endif
 export LCL_PLATFORM
 
+ifeq ($(OS_TARGET),darwin)
+LAZARUS_LIBPATHS=-Fl/usr/X11R6/lib -Fl/sw/lib
+endif
+
+
 [rules]
 .PHONY: all
 
diff --git a/tools/install/macosx/makefpcsnapshot.sh b/tools/install/macosx/makefpcsnapshot.sh
index 89082309fb..b249121f5c 100755
--- a/tools/install/macosx/makefpcsnapshot.sh
+++ b/tools/install/macosx/makefpcsnapshot.sh
@@ -126,5 +126,5 @@ $HDIUTIL create -anyowners -volname fpc-$FPCVERSION -imagekey zlib-level=9 -form
 
 if [ -e $DMGFILE ]; then
 #update lazarus snapshot web page
-  echo "$DMGFILE fpc-*-*-$FPCARCH-macosx.dmg" >> $UPDATELIST
+  echo "$DMGFILE fpc-$FPCVERSION-*-$FPCARCH-macosx.dmg" >> $UPDATELIST
 fi