summaryrefslogtreecommitdiff
path: root/packages/gtk2
diff options
context:
space:
mode:
authorflorian <florian@3ad0048d-3df7-0310-abae-a5850022a9f2>2008-05-31 11:33:02 +0000
committerflorian <florian@3ad0048d-3df7-0310-abae-a5850022a9f2>2008-05-31 11:33:02 +0000
commit64b5f3f2d9cebb634a3447ffb6e6867eab841c42 (patch)
tree0b14b3adae1d657f526db09c8370cbd112fa9818 /packages/gtk2
parent3364dc6f8cf3001306bd55b9c79addacecfef8c0 (diff)
downloadfpc-64b5f3f2d9cebb634a3447ffb6e6867eab841c42.tar.gz
* Haiku patch by Olivier Coursiere
- a little more native rtl: it use a native haiku library for select function instead of relying on a compatibility symlink - haiku in the list of target that support the ide - some more fix in some packages git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@11135 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'packages/gtk2')
-rw-r--r--packages/gtk2/Makefile5
-rw-r--r--packages/gtk2/Makefile.fpc3
2 files changed, 5 insertions, 3 deletions
diff --git a/packages/gtk2/Makefile b/packages/gtk2/Makefile
index 79d2973474..43fddebd96 100644
--- a/packages/gtk2/Makefile
+++ b/packages/gtk2/Makefile
@@ -1,5 +1,5 @@
#
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/28]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/31]
#
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
@@ -259,7 +259,7 @@ endif
PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
override PACKAGE_NAME=gtk2
override PACKAGE_VERSION=2.0.0
-ifneq ($(findstring $(OS_TARGET),linux freebsd netbsd openbsd solaris darwin beos ),)
+ifneq ($(findstring $(OS_TARGET),linux freebsd netbsd openbsd solaris darwin beos haiku ),)
GDK2X=gdk2x
GTK2X11=gtk2x11
GTK2X11INCLUDE=src/gtk2x11/include
@@ -1945,6 +1945,7 @@ REQUIRE_PACKAGES_X11=1
endif
ifeq ($(FULL_TARGET),i386-haiku)
REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_X11=1
endif
ifeq ($(FULL_TARGET),i386-netbsd)
REQUIRE_PACKAGES_RTL=1
diff --git a/packages/gtk2/Makefile.fpc b/packages/gtk2/Makefile.fpc
index 0e270097ba..5f4eb4c1c6 100644
--- a/packages/gtk2/Makefile.fpc
+++ b/packages/gtk2/Makefile.fpc
@@ -9,6 +9,7 @@ version=2.0.0
[require]
libc=y
packages_beos=x11
+packages_haiku=x11
packages_linux=x11
packages_freebsd=x11
packages_solaris=x11
@@ -36,7 +37,7 @@ build=n
fpcdir=../..
[prerules]
-ifneq ($(findstring $(OS_TARGET),linux freebsd netbsd openbsd solaris darwin beos ),)
+ifneq ($(findstring $(OS_TARGET),linux freebsd netbsd openbsd solaris darwin beos haiku ),)
GDK2X=gdk2x
GTK2X11=gtk2x11
GTK2X11INCLUDE=src/gtk2x11/include