tools: add library paths for darwin to the makefile

git-svn-id: trunk@10613 -
This commit is contained in:
vincents 2007-02-08 20:55:51 +00:00
parent cca097adbc
commit 0d29519e8d
5 changed files with 164 additions and 86 deletions

View File

@ -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 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 BSDs = freebsd netbsd openbsd darwin
UNIXs = linux $(BSDs) solaris qnx UNIXs = linux $(BSDs) solaris qnx
LIMIT83fs = go32v2 os2 emx watcom LIMIT83fs = go32v2 os2 emx watcom
@ -240,6 +240,9 @@ LCL_PLATFORM=gtk
endif endif
endif endif
export LCL_PLATFORM export LCL_PLATFORM
ifeq ($(OS_TARGET),darwin)
LAZARUS_LIBPATHS=-Fl/usr/X11R6/lib -Fl/sw/lib
endif
ifeq ($(FULL_TARGET),i386-linux) ifeq ($(FULL_TARGET),i386-linux)
override TARGET_DIRS+=apiwizz override TARGET_DIRS+=apiwizz
endif endif
@ -354,6 +357,9 @@ endif
ifeq ($(FULL_TARGET),arm-wince) ifeq ($(FULL_TARGET),arm-wince)
override TARGET_DIRS+=apiwizz override TARGET_DIRS+=apiwizz
endif endif
ifeq ($(FULL_TARGET),arm-gba)
override TARGET_DIRS+=apiwizz
endif
ifeq ($(FULL_TARGET),powerpc64-linux) ifeq ($(FULL_TARGET),powerpc64-linux)
override TARGET_DIRS+=apiwizz override TARGET_DIRS+=apiwizz
endif endif
@ -471,125 +477,131 @@ endif
ifeq ($(FULL_TARGET),arm-wince) ifeq ($(FULL_TARGET),arm-wince)
override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles
endif endif
ifeq ($(FULL_TARGET),arm-gba)
override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles
endif
ifeq ($(FULL_TARGET),powerpc64-linux) ifeq ($(FULL_TARGET),powerpc64-linux)
override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles
endif endif
ifeq ($(FULL_TARGET),i386-linux) ifeq ($(FULL_TARGET),i386-linux)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),i386-go32v2) ifeq ($(FULL_TARGET),i386-go32v2)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),i386-win32) ifeq ($(FULL_TARGET),i386-win32)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),i386-os2) ifeq ($(FULL_TARGET),i386-os2)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),i386-freebsd) ifeq ($(FULL_TARGET),i386-freebsd)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),i386-beos) ifeq ($(FULL_TARGET),i386-beos)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),i386-netbsd) ifeq ($(FULL_TARGET),i386-netbsd)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),i386-solaris) ifeq ($(FULL_TARGET),i386-solaris)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),i386-qnx) ifeq ($(FULL_TARGET),i386-qnx)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),i386-netware) ifeq ($(FULL_TARGET),i386-netware)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),i386-openbsd) ifeq ($(FULL_TARGET),i386-openbsd)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),i386-wdosx) ifeq ($(FULL_TARGET),i386-wdosx)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),i386-darwin) ifeq ($(FULL_TARGET),i386-darwin)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),i386-emx) ifeq ($(FULL_TARGET),i386-emx)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),i386-watcom) ifeq ($(FULL_TARGET),i386-watcom)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),i386-netwlibc) ifeq ($(FULL_TARGET),i386-netwlibc)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),i386-wince) ifeq ($(FULL_TARGET),i386-wince)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),m68k-linux) ifeq ($(FULL_TARGET),m68k-linux)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),m68k-freebsd) ifeq ($(FULL_TARGET),m68k-freebsd)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),m68k-netbsd) ifeq ($(FULL_TARGET),m68k-netbsd)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),m68k-amiga) ifeq ($(FULL_TARGET),m68k-amiga)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),m68k-atari) ifeq ($(FULL_TARGET),m68k-atari)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),m68k-openbsd) ifeq ($(FULL_TARGET),m68k-openbsd)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),m68k-palmos) ifeq ($(FULL_TARGET),m68k-palmos)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),powerpc-linux) ifeq ($(FULL_TARGET),powerpc-linux)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),powerpc-netbsd) ifeq ($(FULL_TARGET),powerpc-netbsd)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),powerpc-macos) ifeq ($(FULL_TARGET),powerpc-macos)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),powerpc-darwin) ifeq ($(FULL_TARGET),powerpc-darwin)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),powerpc-morphos) ifeq ($(FULL_TARGET),powerpc-morphos)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),sparc-linux) ifeq ($(FULL_TARGET),sparc-linux)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),sparc-netbsd) ifeq ($(FULL_TARGET),sparc-netbsd)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),sparc-solaris) ifeq ($(FULL_TARGET),sparc-solaris)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),x86_64-linux) ifeq ($(FULL_TARGET),x86_64-linux)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),x86_64-freebsd) ifeq ($(FULL_TARGET),x86_64-freebsd)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),x86_64-win64) ifeq ($(FULL_TARGET),x86_64-win64)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),arm-linux) ifeq ($(FULL_TARGET),arm-linux)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),arm-palmos) ifeq ($(FULL_TARGET),arm-palmos)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),arm-wince) 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 endif
ifeq ($(FULL_TARGET),powerpc64-linux) ifeq ($(FULL_TARGET),powerpc64-linux)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),i386-linux) ifeq ($(FULL_TARGET),i386-linux)
override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) 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) ifeq ($(FULL_TARGET),arm-wince)
override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
endif 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) ifeq ($(FULL_TARGET),powerpc64-linux)
override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
endif endif
@ -822,6 +837,9 @@ endif
ifeq ($(FULL_TARGET),arm-wince) ifeq ($(FULL_TARGET),arm-wince)
override COMPILER_TARGETDIR+=. override COMPILER_TARGETDIR+=.
endif endif
ifeq ($(FULL_TARGET),arm-gba)
override COMPILER_TARGETDIR+=.
endif
ifeq ($(FULL_TARGET),powerpc64-linux) ifeq ($(FULL_TARGET),powerpc64-linux)
override COMPILER_TARGETDIR+=. override COMPILER_TARGETDIR+=.
endif endif
@ -939,6 +957,9 @@ endif
ifeq ($(FULL_TARGET),arm-wince) ifeq ($(FULL_TARGET),arm-wince)
override COMPILER_UNITTARGETDIR+=. override COMPILER_UNITTARGETDIR+=.
endif endif
ifeq ($(FULL_TARGET),arm-gba)
override COMPILER_UNITTARGETDIR+=.
endif
ifeq ($(FULL_TARGET),powerpc64-linux) ifeq ($(FULL_TARGET),powerpc64-linux)
override COMPILER_UNITTARGETDIR+=. override COMPILER_UNITTARGETDIR+=.
endif endif
@ -1294,6 +1315,11 @@ EXEEXT=
HASSHAREDLIB=1 HASSHAREDLIB=1
SHORTSUFFIX=dwn SHORTSUFFIX=dwn
endif endif
ifeq ($(OS_TARGET),gba)
EXEEXT=.gba
SHAREDLIBEXT=.so
SHORTSUFFIX=gba
endif
else else
ifeq ($(OS_TARGET),go32v1) ifeq ($(OS_TARGET),go32v1)
PPUEXT=.pp1 PPUEXT=.pp1
@ -2162,6 +2188,14 @@ REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1 REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_SQLITE=1 REQUIRE_PACKAGES_SQLITE=1
endif 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) ifeq ($(FULL_TARGET),powerpc64-linux)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_HASH=1
@ -3223,6 +3257,9 @@ endif
ifeq ($(FULL_TARGET),arm-wince) ifeq ($(FULL_TARGET),arm-wince)
TARGET_DIRS_APIWIZZ=1 TARGET_DIRS_APIWIZZ=1
endif endif
ifeq ($(FULL_TARGET),arm-gba)
TARGET_DIRS_APIWIZZ=1
endif
ifeq ($(FULL_TARGET),powerpc64-linux) ifeq ($(FULL_TARGET),powerpc64-linux)
TARGET_DIRS_APIWIZZ=1 TARGET_DIRS_APIWIZZ=1
endif endif
@ -3296,6 +3333,7 @@ include fpcmake.loc
endif endif
.PHONY: all .PHONY: all
all: apiwizz_all all: apiwizz_all
echo $(LAZARUS_LIBPATHS)
$(MAKE) --assume-new=lazres.pp lazres$(EXEEXT) $(MAKE) --assume-new=lazres.pp lazres$(EXEEXT)
$(MAKE) --assume-new=svn2revisioninc.pas svn2revisioninc$(EXEEXT) $(MAKE) --assume-new=svn2revisioninc.pas svn2revisioninc$(EXEEXT)
$(MAKE) --assume-new=updatepofiles.pas updatepofiles$(EXEEXT) $(MAKE) --assume-new=updatepofiles.pas updatepofiles$(EXEEXT)

View File

@ -15,7 +15,7 @@ programs=lazres svn2revisioninc updatepofiles
packages=rtl fcl packages=rtl fcl
[compiler] [compiler]
options=-gl options=-gl $(LAZARUS_LIBPATHS)
unitdir=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) \ unitdir=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) \
$(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
unittargetdir=. unittargetdir=.
@ -24,7 +24,6 @@ targetdir=.
[prerules] [prerules]
LAZDIR=.. LAZDIR=..
[prerules]
# LCL Platform # LCL Platform
ifndef LCL_PLATFORM ifndef LCL_PLATFORM
ifeq ($(OS_TARGET),win32) ifeq ($(OS_TARGET),win32)
@ -35,11 +34,16 @@ endif
endif endif
export LCL_PLATFORM export LCL_PLATFORM
ifeq ($(OS_TARGET),darwin)
LAZARUS_LIBPATHS=-Fl/usr/X11R6/lib -Fl/sw/lib
endif
[rules] [rules]
.PHONY: all .PHONY: all
all: apiwizz_all all: apiwizz_all
echo $(LAZARUS_LIBPATHS)
$(MAKE) --assume-new=lazres.pp lazres$(EXEEXT) $(MAKE) --assume-new=lazres.pp lazres$(EXEEXT)
$(MAKE) --assume-new=svn2revisioninc.pas svn2revisioninc$(EXEEXT) $(MAKE) --assume-new=svn2revisioninc.pas svn2revisioninc$(EXEEXT)
$(MAKE) --assume-new=updatepofiles.pas updatepofiles$(EXEEXT) $(MAKE) --assume-new=updatepofiles.pas updatepofiles$(EXEEXT)

View File

@ -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 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 BSDs = freebsd netbsd openbsd darwin
UNIXs = linux $(BSDs) solaris qnx UNIXs = linux $(BSDs) solaris qnx
LIMIT83fs = go32v2 os2 emx watcom LIMIT83fs = go32v2 os2 emx watcom
@ -240,6 +240,9 @@ LCL_PLATFORM=gtk
endif endif
endif endif
export LCL_PLATFORM export LCL_PLATFORM
ifeq ($(OS_TARGET),darwin)
LAZARUS_LIBPATHS=-Fl/usr/X11R6/lib -Fl/sw/lib
endif
ifeq ($(FULL_TARGET),i386-linux) ifeq ($(FULL_TARGET),i386-linux)
override TARGET_PROGRAMS+=apiwizz override TARGET_PROGRAMS+=apiwizz
endif endif
@ -354,125 +357,131 @@ endif
ifeq ($(FULL_TARGET),arm-wince) ifeq ($(FULL_TARGET),arm-wince)
override TARGET_PROGRAMS+=apiwizz override TARGET_PROGRAMS+=apiwizz
endif endif
ifeq ($(FULL_TARGET),arm-gba)
override TARGET_PROGRAMS+=apiwizz
endif
ifeq ($(FULL_TARGET),powerpc64-linux) ifeq ($(FULL_TARGET),powerpc64-linux)
override TARGET_PROGRAMS+=apiwizz override TARGET_PROGRAMS+=apiwizz
endif endif
ifeq ($(FULL_TARGET),i386-linux) ifeq ($(FULL_TARGET),i386-linux)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),i386-go32v2) ifeq ($(FULL_TARGET),i386-go32v2)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),i386-win32) ifeq ($(FULL_TARGET),i386-win32)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),i386-os2) ifeq ($(FULL_TARGET),i386-os2)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),i386-freebsd) ifeq ($(FULL_TARGET),i386-freebsd)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),i386-beos) ifeq ($(FULL_TARGET),i386-beos)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),i386-netbsd) ifeq ($(FULL_TARGET),i386-netbsd)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),i386-solaris) ifeq ($(FULL_TARGET),i386-solaris)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),i386-qnx) ifeq ($(FULL_TARGET),i386-qnx)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),i386-netware) ifeq ($(FULL_TARGET),i386-netware)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),i386-openbsd) ifeq ($(FULL_TARGET),i386-openbsd)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),i386-wdosx) ifeq ($(FULL_TARGET),i386-wdosx)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),i386-darwin) ifeq ($(FULL_TARGET),i386-darwin)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),i386-emx) ifeq ($(FULL_TARGET),i386-emx)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),i386-watcom) ifeq ($(FULL_TARGET),i386-watcom)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),i386-netwlibc) ifeq ($(FULL_TARGET),i386-netwlibc)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),i386-wince) ifeq ($(FULL_TARGET),i386-wince)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),m68k-linux) ifeq ($(FULL_TARGET),m68k-linux)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),m68k-freebsd) ifeq ($(FULL_TARGET),m68k-freebsd)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),m68k-netbsd) ifeq ($(FULL_TARGET),m68k-netbsd)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),m68k-amiga) ifeq ($(FULL_TARGET),m68k-amiga)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),m68k-atari) ifeq ($(FULL_TARGET),m68k-atari)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),m68k-openbsd) ifeq ($(FULL_TARGET),m68k-openbsd)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),m68k-palmos) ifeq ($(FULL_TARGET),m68k-palmos)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),powerpc-linux) ifeq ($(FULL_TARGET),powerpc-linux)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),powerpc-netbsd) ifeq ($(FULL_TARGET),powerpc-netbsd)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),powerpc-macos) ifeq ($(FULL_TARGET),powerpc-macos)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),powerpc-darwin) ifeq ($(FULL_TARGET),powerpc-darwin)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),powerpc-morphos) ifeq ($(FULL_TARGET),powerpc-morphos)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),sparc-linux) ifeq ($(FULL_TARGET),sparc-linux)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),sparc-netbsd) ifeq ($(FULL_TARGET),sparc-netbsd)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),sparc-solaris) ifeq ($(FULL_TARGET),sparc-solaris)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),x86_64-linux) ifeq ($(FULL_TARGET),x86_64-linux)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),x86_64-freebsd) ifeq ($(FULL_TARGET),x86_64-freebsd)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),x86_64-win64) ifeq ($(FULL_TARGET),x86_64-win64)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),arm-linux) ifeq ($(FULL_TARGET),arm-linux)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),arm-palmos) ifeq ($(FULL_TARGET),arm-palmos)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),arm-wince) 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 endif
ifeq ($(FULL_TARGET),powerpc64-linux) ifeq ($(FULL_TARGET),powerpc64-linux)
override COMPILER_OPTIONS+=-gl override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
endif endif
ifeq ($(FULL_TARGET),i386-linux) ifeq ($(FULL_TARGET),i386-linux)
override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) 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) ifeq ($(FULL_TARGET),arm-wince)
override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
endif 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) ifeq ($(FULL_TARGET),powerpc64-linux)
override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
endif endif
@ -705,6 +717,9 @@ endif
ifeq ($(FULL_TARGET),arm-wince) ifeq ($(FULL_TARGET),arm-wince)
override COMPILER_TARGETDIR+=. override COMPILER_TARGETDIR+=.
endif endif
ifeq ($(FULL_TARGET),arm-gba)
override COMPILER_TARGETDIR+=.
endif
ifeq ($(FULL_TARGET),powerpc64-linux) ifeq ($(FULL_TARGET),powerpc64-linux)
override COMPILER_TARGETDIR+=. override COMPILER_TARGETDIR+=.
endif endif
@ -822,6 +837,9 @@ endif
ifeq ($(FULL_TARGET),arm-wince) ifeq ($(FULL_TARGET),arm-wince)
override COMPILER_UNITTARGETDIR+=. override COMPILER_UNITTARGETDIR+=.
endif endif
ifeq ($(FULL_TARGET),arm-gba)
override COMPILER_UNITTARGETDIR+=.
endif
ifeq ($(FULL_TARGET),powerpc64-linux) ifeq ($(FULL_TARGET),powerpc64-linux)
override COMPILER_UNITTARGETDIR+=. override COMPILER_UNITTARGETDIR+=.
endif endif
@ -1177,6 +1195,11 @@ EXEEXT=
HASSHAREDLIB=1 HASSHAREDLIB=1
SHORTSUFFIX=dwn SHORTSUFFIX=dwn
endif endif
ifeq ($(OS_TARGET),gba)
EXEEXT=.gba
SHAREDLIBEXT=.so
SHORTSUFFIX=gba
endif
else else
ifeq ($(OS_TARGET),go32v1) ifeq ($(OS_TARGET),go32v1)
PPUEXT=.pp1 PPUEXT=.pp1
@ -2045,6 +2068,14 @@ REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_POSTGRES=1 REQUIRE_PACKAGES_POSTGRES=1
REQUIRE_PACKAGES_SQLITE=1 REQUIRE_PACKAGES_SQLITE=1
endif 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) ifeq ($(FULL_TARGET),powerpc64-linux)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_HASH=1

View File

@ -16,7 +16,7 @@ packages=rtl fcl
#units=apiwizard #units=apiwizard
[compiler] [compiler]
options=-gl options=-gl $(LAZARUS_LIBPATHS)
unitdir=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) \ unitdir=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) \
$(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
unittargetdir=. unittargetdir=.
@ -34,6 +34,11 @@ endif
endif endif
export LCL_PLATFORM export LCL_PLATFORM
ifeq ($(OS_TARGET),darwin)
LAZARUS_LIBPATHS=-Fl/usr/X11R6/lib -Fl/sw/lib
endif
[rules] [rules]
.PHONY: all .PHONY: all

View File

@ -126,5 +126,5 @@ $HDIUTIL create -anyowners -volname fpc-$FPCVERSION -imagekey zlib-level=9 -form
if [ -e $DMGFILE ]; then if [ -e $DMGFILE ]; then
#update lazarus snapshot web page #update lazarus snapshot web page
echo "$DMGFILE fpc-*-*-$FPCARCH-macosx.dmg" >> $UPDATELIST echo "$DMGFILE fpc-$FPCVERSION-*-$FPCARCH-macosx.dmg" >> $UPDATELIST
fi fi