* avoid dependency from gtk1 to opengl on os2

git-svn-id: trunk@11097 -
This commit is contained in:
Tomas Hajny 2008-05-27 19:58:45 +00:00
parent 13365b0dfd
commit 59557a22ce
4 changed files with 72 additions and 180 deletions

View File

@ -8005,12 +8005,14 @@ gtk2_smart: x11_smart
gtk2_debug: x11_debug gtk2_debug: x11_debug
gtk2_release: x11_release gtk2_release: x11_release
else else
ifeq ($(findstring $(OS_TARGET),os2 emx),)
gtk1_all: opengl_all gtk1_all: opengl_all
gtk1_debug: opengl_debug gtk1_debug: opengl_debug
gtk1_smart: opengl_smart gtk1_smart: opengl_smart
gtk1_release: opengl_release gtk1_release: opengl_release
gtk1_shared: opengl_shared gtk1_shared: opengl_shared
endif endif
endif
imlib_all: gtk1_all x11_all imlib_all: gtk1_all x11_all
imlib_shared: gtk1_shared x11_shared imlib_shared: gtk1_shared x11_shared
imlib_smart: gtk1_smart x11_smart imlib_smart: gtk1_smart x11_smart

View File

@ -215,12 +215,14 @@ gtk2_smart: x11_smart
gtk2_debug: x11_debug gtk2_debug: x11_debug
gtk2_release: x11_release gtk2_release: x11_release
else else
ifeq ($(findstring $(OS_TARGET),os2 emx),)
gtk1_all: opengl_all gtk1_all: opengl_all
gtk1_debug: opengl_debug gtk1_debug: opengl_debug
gtk1_smart: opengl_smart gtk1_smart: opengl_smart
gtk1_release: opengl_release gtk1_release: opengl_release
gtk1_shared: opengl_shared gtk1_shared: opengl_shared
endif endif
endif
imlib_all: gtk1_all x11_all imlib_all: gtk1_all x11_all
imlib_shared: gtk1_shared x11_shared imlib_shared: gtk1_shared x11_shared

View File

@ -1,8 +1,8 @@
# #
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/24] # Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/11/03]
# #
default: all 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 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 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded
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
@ -167,17 +167,6 @@ OS_TARGET:=$(word 5,$(FPC_COMPILERINFO))
endif endif
FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)
FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)
ifeq ($(CPU_TARGET),armeb)
ARCH=arm
override FPCOPT+=-Cb
else
ifeq ($(CPU_TARGET),armel)
ARCH=arm
override FPCOPT+=-CaEABI
else
ARCH=$(CPU_TARGET)
endif
endif
ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
TARGETSUFFIX=$(OS_TARGET) TARGETSUFFIX=$(OS_TARGET)
SOURCESUFFIX=$(OS_SOURCE) SOURCESUFFIX=$(OS_SOURCE)
@ -185,15 +174,9 @@ else
TARGETSUFFIX=$(FULL_TARGET) TARGETSUFFIX=$(FULL_TARGET)
SOURCESUFFIX=$(FULL_SOURCE) SOURCESUFFIX=$(FULL_SOURCE)
endif endif
ifeq ($(OS_TARGET),darwin)
ifneq ($(OS_SOURCE),darwin)
CROSSCOMPILE=1
endif
else
ifneq ($(FULL_TARGET),$(FULL_SOURCE)) ifneq ($(FULL_TARGET),$(FULL_SOURCE))
CROSSCOMPILE=1 CROSSCOMPILE=1
endif endif
endif
ifeq ($(findstring makefile,$(MAKECMDGOALS)),) ifeq ($(findstring makefile,$(MAKECMDGOALS)),)
ifeq ($(findstring $(FULL_TARGET),$(MAKEFILETARGETS)),) ifeq ($(findstring $(FULL_TARGET),$(MAKEFILETARGETS)),)
$(error The Makefile doesn't support target $(FULL_TARGET), please run fpcmake first) $(error The Makefile doesn't support target $(FULL_TARGET), please run fpcmake first)
@ -205,7 +188,7 @@ endif
ifeq ($(OS_TARGET),linux) ifeq ($(OS_TARGET),linux)
linuxHier=1 linuxHier=1
endif endif
export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE
ifdef FPCDIR ifdef FPCDIR
override FPCDIR:=$(subst \,/,$(FPCDIR)) override FPCDIR:=$(subst \,/,$(FPCDIR))
ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
@ -260,178 +243,160 @@ PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(F
override PACKAGE_NAME=gtk1 override PACKAGE_NAME=gtk1
override PACKAGE_VERSION=2.0.0 override PACKAGE_VERSION=2.0.0
ifeq ($(FULL_TARGET),i386-linux) ifeq ($(FULL_TARGET),i386-linux)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
endif endif
ifeq ($(FULL_TARGET),i386-go32v2) ifeq ($(FULL_TARGET),i386-go32v2)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
endif endif
ifeq ($(FULL_TARGET),i386-win32) ifeq ($(FULL_TARGET),i386-win32)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
endif endif
ifeq ($(FULL_TARGET),i386-os2) ifeq ($(FULL_TARGET),i386-os2)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
endif endif
ifeq ($(FULL_TARGET),i386-freebsd) ifeq ($(FULL_TARGET),i386-freebsd)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
endif endif
ifeq ($(FULL_TARGET),i386-beos) ifeq ($(FULL_TARGET),i386-beos)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
endif
ifeq ($(FULL_TARGET),i386-haiku)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
endif endif
ifeq ($(FULL_TARGET),i386-netbsd) ifeq ($(FULL_TARGET),i386-netbsd)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
endif endif
ifeq ($(FULL_TARGET),i386-solaris) ifeq ($(FULL_TARGET),i386-solaris)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
endif endif
ifeq ($(FULL_TARGET),i386-qnx) ifeq ($(FULL_TARGET),i386-qnx)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
endif endif
ifeq ($(FULL_TARGET),i386-netware) ifeq ($(FULL_TARGET),i386-netware)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
endif endif
ifeq ($(FULL_TARGET),i386-openbsd) ifeq ($(FULL_TARGET),i386-openbsd)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
endif endif
ifeq ($(FULL_TARGET),i386-wdosx) ifeq ($(FULL_TARGET),i386-wdosx)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
endif endif
ifeq ($(FULL_TARGET),i386-darwin) ifeq ($(FULL_TARGET),i386-darwin)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
endif endif
ifeq ($(FULL_TARGET),i386-emx) ifeq ($(FULL_TARGET),i386-emx)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
endif endif
ifeq ($(FULL_TARGET),i386-watcom) ifeq ($(FULL_TARGET),i386-watcom)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
endif endif
ifeq ($(FULL_TARGET),i386-netwlibc) ifeq ($(FULL_TARGET),i386-netwlibc)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
endif endif
ifeq ($(FULL_TARGET),i386-wince) ifeq ($(FULL_TARGET),i386-wince)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
endif endif
ifeq ($(FULL_TARGET),i386-embedded) ifeq ($(FULL_TARGET),i386-embedded)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
endif endif
ifeq ($(FULL_TARGET),i386-symbian) ifeq ($(FULL_TARGET),i386-symbian)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
endif endif
ifeq ($(FULL_TARGET),m68k-linux) ifeq ($(FULL_TARGET),m68k-linux)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
endif endif
ifeq ($(FULL_TARGET),m68k-freebsd) ifeq ($(FULL_TARGET),m68k-freebsd)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
endif endif
ifeq ($(FULL_TARGET),m68k-netbsd) ifeq ($(FULL_TARGET),m68k-netbsd)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
endif endif
ifeq ($(FULL_TARGET),m68k-amiga) ifeq ($(FULL_TARGET),m68k-amiga)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
endif endif
ifeq ($(FULL_TARGET),m68k-atari) ifeq ($(FULL_TARGET),m68k-atari)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
endif endif
ifeq ($(FULL_TARGET),m68k-openbsd) ifeq ($(FULL_TARGET),m68k-openbsd)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
endif endif
ifeq ($(FULL_TARGET),m68k-palmos) ifeq ($(FULL_TARGET),m68k-palmos)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
endif endif
ifeq ($(FULL_TARGET),m68k-embedded) ifeq ($(FULL_TARGET),m68k-embedded)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
endif endif
ifeq ($(FULL_TARGET),powerpc-linux) ifeq ($(FULL_TARGET),powerpc-linux)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
endif endif
ifeq ($(FULL_TARGET),powerpc-netbsd) ifeq ($(FULL_TARGET),powerpc-netbsd)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
endif endif
ifeq ($(FULL_TARGET),powerpc-amiga) ifeq ($(FULL_TARGET),powerpc-amiga)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
endif endif
ifeq ($(FULL_TARGET),powerpc-macos) ifeq ($(FULL_TARGET),powerpc-macos)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
endif endif
ifeq ($(FULL_TARGET),powerpc-darwin) ifeq ($(FULL_TARGET),powerpc-darwin)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
endif endif
ifeq ($(FULL_TARGET),powerpc-morphos) ifeq ($(FULL_TARGET),powerpc-morphos)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
endif endif
ifeq ($(FULL_TARGET),powerpc-embedded) ifeq ($(FULL_TARGET),powerpc-embedded)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
endif endif
ifeq ($(FULL_TARGET),sparc-linux) ifeq ($(FULL_TARGET),sparc-linux)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
endif endif
ifeq ($(FULL_TARGET),sparc-netbsd) ifeq ($(FULL_TARGET),sparc-netbsd)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
endif endif
ifeq ($(FULL_TARGET),sparc-solaris) ifeq ($(FULL_TARGET),sparc-solaris)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
endif endif
ifeq ($(FULL_TARGET),sparc-embedded) ifeq ($(FULL_TARGET),sparc-embedded)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
endif endif
ifeq ($(FULL_TARGET),x86_64-linux) ifeq ($(FULL_TARGET),x86_64-linux)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
endif endif
ifeq ($(FULL_TARGET),x86_64-freebsd) ifeq ($(FULL_TARGET),x86_64-freebsd)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
endif
ifeq ($(FULL_TARGET),x86_64-darwin)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
endif endif
ifeq ($(FULL_TARGET),x86_64-win64) ifeq ($(FULL_TARGET),x86_64-win64)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
endif endif
ifeq ($(FULL_TARGET),x86_64-embedded) ifeq ($(FULL_TARGET),x86_64-embedded)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
endif endif
ifeq ($(FULL_TARGET),arm-linux) ifeq ($(FULL_TARGET),arm-linux)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
endif endif
ifeq ($(FULL_TARGET),arm-palmos) ifeq ($(FULL_TARGET),arm-palmos)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
endif
ifeq ($(FULL_TARGET),arm-darwin)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
endif endif
ifeq ($(FULL_TARGET),arm-wince) ifeq ($(FULL_TARGET),arm-wince)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
endif endif
ifeq ($(FULL_TARGET),arm-gba) ifeq ($(FULL_TARGET),arm-gba)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
endif endif
ifeq ($(FULL_TARGET),arm-nds) ifeq ($(FULL_TARGET),arm-nds)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
endif endif
ifeq ($(FULL_TARGET),arm-embedded) ifeq ($(FULL_TARGET),arm-embedded)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
endif endif
ifeq ($(FULL_TARGET),arm-symbian) ifeq ($(FULL_TARGET),arm-symbian)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
endif endif
ifeq ($(FULL_TARGET),powerpc64-linux) ifeq ($(FULL_TARGET),powerpc64-linux)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
endif endif
ifeq ($(FULL_TARGET),powerpc64-darwin) ifeq ($(FULL_TARGET),powerpc64-darwin)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
endif endif
ifeq ($(FULL_TARGET),powerpc64-embedded) ifeq ($(FULL_TARGET),powerpc64-embedded)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
endif
ifeq ($(FULL_TARGET),avr-embedded)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
endif
ifeq ($(FULL_TARGET),armeb-linux)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
endif
ifeq ($(FULL_TARGET),armeb-embedded)
override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
endif endif
ifeq ($(FULL_TARGET),i386-linux) ifeq ($(FULL_TARGET),i386-linux)
override TARGET_EXAMPLEDIRS+=examples override TARGET_EXAMPLEDIRS+=examples
@ -451,9 +416,6 @@ endif
ifeq ($(FULL_TARGET),i386-beos) ifeq ($(FULL_TARGET),i386-beos)
override TARGET_EXAMPLEDIRS+=examples override TARGET_EXAMPLEDIRS+=examples
endif endif
ifeq ($(FULL_TARGET),i386-haiku)
override TARGET_EXAMPLEDIRS+=examples
endif
ifeq ($(FULL_TARGET),i386-netbsd) ifeq ($(FULL_TARGET),i386-netbsd)
override TARGET_EXAMPLEDIRS+=examples override TARGET_EXAMPLEDIRS+=examples
endif endif
@ -556,9 +518,6 @@ endif
ifeq ($(FULL_TARGET),x86_64-freebsd) ifeq ($(FULL_TARGET),x86_64-freebsd)
override TARGET_EXAMPLEDIRS+=examples override TARGET_EXAMPLEDIRS+=examples
endif endif
ifeq ($(FULL_TARGET),x86_64-darwin)
override TARGET_EXAMPLEDIRS+=examples
endif
ifeq ($(FULL_TARGET),x86_64-win64) ifeq ($(FULL_TARGET),x86_64-win64)
override TARGET_EXAMPLEDIRS+=examples override TARGET_EXAMPLEDIRS+=examples
endif endif
@ -571,9 +530,6 @@ endif
ifeq ($(FULL_TARGET),arm-palmos) ifeq ($(FULL_TARGET),arm-palmos)
override TARGET_EXAMPLEDIRS+=examples override TARGET_EXAMPLEDIRS+=examples
endif endif
ifeq ($(FULL_TARGET),arm-darwin)
override TARGET_EXAMPLEDIRS+=examples
endif
ifeq ($(FULL_TARGET),arm-wince) ifeq ($(FULL_TARGET),arm-wince)
override TARGET_EXAMPLEDIRS+=examples override TARGET_EXAMPLEDIRS+=examples
endif endif
@ -598,15 +554,6 @@ endif
ifeq ($(FULL_TARGET),powerpc64-embedded) ifeq ($(FULL_TARGET),powerpc64-embedded)
override TARGET_EXAMPLEDIRS+=examples override TARGET_EXAMPLEDIRS+=examples
endif endif
ifeq ($(FULL_TARGET),avr-embedded)
override TARGET_EXAMPLEDIRS+=examples
endif
ifeq ($(FULL_TARGET),armeb-linux)
override TARGET_EXAMPLEDIRS+=examples
endif
ifeq ($(FULL_TARGET),armeb-embedded)
override TARGET_EXAMPLEDIRS+=examples
endif
override INSTALL_FPCPACKAGE=y override INSTALL_FPCPACKAGE=y
ifeq ($(FULL_TARGET),i386-linux) ifeq ($(FULL_TARGET),i386-linux)
override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
@ -626,9 +573,6 @@ endif
ifeq ($(FULL_TARGET),i386-beos) ifeq ($(FULL_TARGET),i386-beos)
override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
endif endif
ifeq ($(FULL_TARGET),i386-haiku)
override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
endif
ifeq ($(FULL_TARGET),i386-netbsd) ifeq ($(FULL_TARGET),i386-netbsd)
override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
endif endif
@ -731,9 +675,6 @@ endif
ifeq ($(FULL_TARGET),x86_64-freebsd) ifeq ($(FULL_TARGET),x86_64-freebsd)
override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
endif endif
ifeq ($(FULL_TARGET),x86_64-darwin)
override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
endif
ifeq ($(FULL_TARGET),x86_64-win64) ifeq ($(FULL_TARGET),x86_64-win64)
override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
endif endif
@ -746,9 +687,6 @@ endif
ifeq ($(FULL_TARGET),arm-palmos) ifeq ($(FULL_TARGET),arm-palmos)
override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
endif endif
ifeq ($(FULL_TARGET),arm-darwin)
override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
endif
ifeq ($(FULL_TARGET),arm-wince) ifeq ($(FULL_TARGET),arm-wince)
override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
endif endif
@ -773,15 +711,6 @@ endif
ifeq ($(FULL_TARGET),powerpc64-embedded) ifeq ($(FULL_TARGET),powerpc64-embedded)
override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
endif endif
ifeq ($(FULL_TARGET),avr-embedded)
override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
endif
ifeq ($(FULL_TARGET),armeb-linux)
override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
endif
ifeq ($(FULL_TARGET),armeb-embedded)
override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
endif
override SHARED_BUILD=n override SHARED_BUILD=n
override SHARED_BUILD=n override SHARED_BUILD=n
ifdef REQUIRE_UNITSDIR ifdef REQUIRE_UNITSDIR
@ -1104,11 +1033,6 @@ BATCHEXT=.sh
EXEEXT= EXEEXT=
SHORTSUFFIX=be SHORTSUFFIX=be
endif endif
ifeq ($(OS_TARGET),haiku)
BATCHEXT=.sh
EXEEXT=
SHORTSUFFIX=hai
endif
ifeq ($(OS_TARGET),solaris) ifeq ($(OS_TARGET),solaris)
BATCHEXT=.sh BATCHEXT=.sh
EXEEXT= EXEEXT=
@ -1594,10 +1518,6 @@ ifeq ($(FULL_TARGET),i386-beos)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_OPENGL=1
endif endif
ifeq ($(FULL_TARGET),i386-haiku)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),i386-netbsd) ifeq ($(FULL_TARGET),i386-netbsd)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_X11=1
@ -1748,11 +1668,6 @@ REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_X11=1 REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_OPENGL=1
endif endif
ifeq ($(FULL_TARGET),x86_64-darwin)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),x86_64-win64) ifeq ($(FULL_TARGET),x86_64-win64)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_OPENGL=1
@ -1770,11 +1685,6 @@ ifeq ($(FULL_TARGET),arm-palmos)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_OPENGL=1
endif endif
ifeq ($(FULL_TARGET),arm-darwin)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),arm-wince) ifeq ($(FULL_TARGET),arm-wince)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_OPENGL=1
@ -1809,19 +1719,6 @@ ifeq ($(FULL_TARGET),powerpc64-embedded)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_OPENGL=1
endif endif
ifeq ($(FULL_TARGET),avr-embedded)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),armeb-linux)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_X11=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifeq ($(FULL_TARGET),armeb-embedded)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_OPENGL=1
endif
ifdef REQUIRE_PACKAGES_RTL ifdef REQUIRE_PACKAGES_RTL
PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_RTL),) ifneq ($(PACKAGEDIR_RTL),)
@ -1901,13 +1798,13 @@ override COMPILER_UNITDIR+=$(UNITDIR_OPENGL)
endif endif
endif endif
ifndef NOCPUDEF ifndef NOCPUDEF
override FPCOPTDEF=$(ARCH) override FPCOPTDEF=$(CPU_TARGET)
endif endif
ifneq ($(OS_TARGET),$(OS_SOURCE)) ifneq ($(OS_TARGET),$(OS_SOURCE))
override FPCOPT+=-T$(OS_TARGET) override FPCOPT+=-T$(OS_TARGET)
endif endif
ifneq ($(CPU_TARGET),$(CPU_SOURCE)) ifneq ($(CPU_TARGET),$(CPU_SOURCE))
override FPCOPT+=-P$(ARCH) override FPCOPT+=-P$(CPU_TARGET)
endif endif
ifeq ($(OS_SOURCE),openbsd) ifeq ($(OS_SOURCE),openbsd)
override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCOPT+=-FD$(NEW_BINUTILS_PATH)
@ -2060,7 +1957,7 @@ endif
endif endif
endif endif
.PHONY: fpc_units .PHONY: fpc_units
ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) ifneq ($(TARGET_UNITS),)
override ALLTARGET+=fpc_units override ALLTARGET+=fpc_units
override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))
override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS))
@ -2511,9 +2408,6 @@ endif
ifeq ($(FULL_TARGET),i386-beos) ifeq ($(FULL_TARGET),i386-beos)
TARGET_EXAMPLEDIRS_EXAMPLES=1 TARGET_EXAMPLEDIRS_EXAMPLES=1
endif endif
ifeq ($(FULL_TARGET),i386-haiku)
TARGET_EXAMPLEDIRS_EXAMPLES=1
endif
ifeq ($(FULL_TARGET),i386-netbsd) ifeq ($(FULL_TARGET),i386-netbsd)
TARGET_EXAMPLEDIRS_EXAMPLES=1 TARGET_EXAMPLEDIRS_EXAMPLES=1
endif endif
@ -2616,9 +2510,6 @@ endif
ifeq ($(FULL_TARGET),x86_64-freebsd) ifeq ($(FULL_TARGET),x86_64-freebsd)
TARGET_EXAMPLEDIRS_EXAMPLES=1 TARGET_EXAMPLEDIRS_EXAMPLES=1
endif endif
ifeq ($(FULL_TARGET),x86_64-darwin)
TARGET_EXAMPLEDIRS_EXAMPLES=1
endif
ifeq ($(FULL_TARGET),x86_64-win64) ifeq ($(FULL_TARGET),x86_64-win64)
TARGET_EXAMPLEDIRS_EXAMPLES=1 TARGET_EXAMPLEDIRS_EXAMPLES=1
endif endif
@ -2631,9 +2522,6 @@ endif
ifeq ($(FULL_TARGET),arm-palmos) ifeq ($(FULL_TARGET),arm-palmos)
TARGET_EXAMPLEDIRS_EXAMPLES=1 TARGET_EXAMPLEDIRS_EXAMPLES=1
endif endif
ifeq ($(FULL_TARGET),arm-darwin)
TARGET_EXAMPLEDIRS_EXAMPLES=1
endif
ifeq ($(FULL_TARGET),arm-wince) ifeq ($(FULL_TARGET),arm-wince)
TARGET_EXAMPLEDIRS_EXAMPLES=1 TARGET_EXAMPLEDIRS_EXAMPLES=1
endif endif
@ -2658,15 +2546,6 @@ endif
ifeq ($(FULL_TARGET),powerpc64-embedded) ifeq ($(FULL_TARGET),powerpc64-embedded)
TARGET_EXAMPLEDIRS_EXAMPLES=1 TARGET_EXAMPLEDIRS_EXAMPLES=1
endif endif
ifeq ($(FULL_TARGET),avr-embedded)
TARGET_EXAMPLEDIRS_EXAMPLES=1
endif
ifeq ($(FULL_TARGET),armeb-linux)
TARGET_EXAMPLEDIRS_EXAMPLES=1
endif
ifeq ($(FULL_TARGET),armeb-embedded)
TARGET_EXAMPLEDIRS_EXAMPLES=1
endif
ifdef TARGET_EXAMPLEDIRS_EXAMPLES ifdef TARGET_EXAMPLEDIRS_EXAMPLES
examples_all: examples_all:
$(MAKE) -C examples all $(MAKE) -C examples all

View File

@ -11,7 +11,16 @@ libc=y
packages=opengl packages=opengl
[target] [target]
units=glib gmodule gdk gtk gdkpixbuf gtkglarea units=glib gmodule gdk gtk gdkpixbuf
units_beos=gtkglarea
units_freebsd=gtkglarea
units_darwin=gtkglarea
units_solaris=gtkglarea
units_netbsd=gtkglarea
units_openbsd=gtkglarea
units_linux=gtkglarea
units_win32=gtkglarea
units_win64=gtkglarea
exampledirs=examples exampledirs=examples
[compiler] [compiler]