diff options
| author | jonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2009-09-04 08:16:39 +0000 |
|---|---|---|
| committer | jonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2009-09-04 08:16:39 +0000 |
| commit | 95f5a41d5e5415efca761bd17686421d1637aef9 (patch) | |
| tree | 0eecb7ab16abe5f802586d86de51f70fc8699f41 /packages/cairo | |
| parent | 3b846d02e5755e1803ef97406c88ae06f7dc833d (diff) | |
| download | fpc-95f5a41d5e5415efca761bd17686421d1637aef9.tar.gz | |
* freetype and cairo building for BeOS and Haiku (patch from Olivier,
mantis #14490)
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@13643 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'packages/cairo')
| -rw-r--r-- | packages/cairo/Makefile | 8 | ||||
| -rw-r--r-- | packages/cairo/Makefile.fpc | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/packages/cairo/Makefile b/packages/cairo/Makefile index ddb3901148..def319f180 100644 --- a/packages/cairo/Makefile +++ b/packages/cairo/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2009/08/02] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2009/08/20] # default: all MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded @@ -282,10 +282,10 @@ ifeq ($(FULL_TARGET),i386-freebsd) override TARGET_UNITS+=cairo cairoft cairoxlib endif ifeq ($(FULL_TARGET),i386-beos) -override TARGET_UNITS+=cairo cairoft +override TARGET_UNITS+=cairo cairoft cairoxlib endif ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=cairo cairoft +override TARGET_UNITS+=cairo cairoft cairoxlib endif ifeq ($(FULL_TARGET),i386-netbsd) override TARGET_UNITS+=cairo cairoft cairoxlib @@ -1638,6 +1638,7 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-IMAGE=1 +REQUIRE_PACKAGES_X11=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 @@ -1646,6 +1647,7 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-BASE=1 REQUIRE_PACKAGES_FCL-IMAGE=1 +REQUIRE_PACKAGES_X11=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 diff --git a/packages/cairo/Makefile.fpc b/packages/cairo/Makefile.fpc index 409ef357c3..0a2c4e2e43 100644 --- a/packages/cairo/Makefile.fpc +++ b/packages/cairo/Makefile.fpc @@ -4,6 +4,8 @@ [require] packages=fcl-image #packages_win32= +packages_beos=x11 +packages_haiku=x11 packages_linux=x11 packages_freebsd=x11 packages_netbsd=x11 @@ -18,6 +20,8 @@ version=2.5.1 [target] units=cairo cairoft units_win32=cairowin32 +units_beos=cairoxlib +units_haiku=cairoxlib units_linux=cairoxlib units_freebsd=cairoxlib units_netbsd=cairoxlib |