paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-08 04:56:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

cocoa intf: using -dcocoa instead of -dcocoa1

Browse Source 
git-svn-id: trunk@27513 -
This commit is contained in:
mattias 2010-09-28 17:20:14 +00:00
parent bd2a961e4e
commit 945d84525b
3 changed files with 159 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

221
lcl/interfaces/cocoa/Makefile
View File

@ -1,10 +1,10 @@
# #
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/19] # Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/12]
# #
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-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 i386-nativent 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-solaris 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 mipsel-linux
BSDs = freebsd netbsd openbsd darwin BSDs = freebsd netbsd openbsd darwin
UNIXs = linux $(BSDs) solaris qnx UNIXs = linux $(BSDs) solaris qnx haiku
LIMIT83fs = go32v2 os2 emx watcom LIMIT83fs = go32v2 os2 emx watcom
OSNeedsComspecToRunBatch = go32v2 watcom OSNeedsComspecToRunBatch = go32v2 watcom
FORCE: FORCE:
@ -59,9 +59,11 @@ endif
endif endif
ifdef COMSPEC ifdef COMSPEC
ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),) ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),)
ifndef RUNBATCH
RUNBATCH=$(COMSPEC) /C RUNBATCH=$(COMSPEC) /C
endif endif
endif endif
endif
ifdef inUnix ifdef inUnix
PATHSEP=/ PATHSEP=/
else else
@ -114,6 +116,10 @@ FPC:=$(shell $(FPCPROG) -PB)
endif endif
ifneq ($(findstring Error,$(FPC)),) ifneq ($(findstring Error,$(FPC)),)
override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
else
ifeq ($(strip $(wildcard $(FPC))),)
FPC:=$(firstword $(FPCPROG))
endif
endif endif
else else
override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
@ -319,6 +325,9 @@ endif
ifeq ($(FULL_TARGET),i386-symbian) ifeq ($(FULL_TARGET),i386-symbian)
override TARGET_UNITS+=interfaces override TARGET_UNITS+=interfaces
endif endif
ifeq ($(FULL_TARGET),i386-nativent)
override TARGET_UNITS+=interfaces
endif
ifeq ($(FULL_TARGET),m68k-linux) ifeq ($(FULL_TARGET),m68k-linux)
override TARGET_UNITS+=interfaces override TARGET_UNITS+=interfaces
endif endif
@ -382,6 +391,9 @@ endif
ifeq ($(FULL_TARGET),x86_64-freebsd) ifeq ($(FULL_TARGET),x86_64-freebsd)
override TARGET_UNITS+=interfaces override TARGET_UNITS+=interfaces
endif endif
ifeq ($(FULL_TARGET),x86_64-solaris)
override TARGET_UNITS+=interfaces
endif
ifeq ($(FULL_TARGET),x86_64-darwin) ifeq ($(FULL_TARGET),x86_64-darwin)
override TARGET_UNITS+=interfaces override TARGET_UNITS+=interfaces
endif endif
@ -433,6 +445,9 @@ endif
ifeq ($(FULL_TARGET),armeb-embedded) ifeq ($(FULL_TARGET),armeb-embedded)
override TARGET_UNITS+=interfaces override TARGET_UNITS+=interfaces
endif endif
ifeq ($(FULL_TARGET),mipsel-linux)
override TARGET_UNITS+=interfaces
endif
ifeq ($(FULL_TARGET),i386-linux) ifeq ($(FULL_TARGET),i386-linux)
override TARGET_IMPLICITUNITS+=cocoaint override TARGET_IMPLICITUNITS+=cocoaint
endif endif
@ -493,6 +508,9 @@ endif
ifeq ($(FULL_TARGET),i386-symbian) ifeq ($(FULL_TARGET),i386-symbian)
override TARGET_IMPLICITUNITS+=cocoaint override TARGET_IMPLICITUNITS+=cocoaint
endif endif
ifeq ($(FULL_TARGET),i386-nativent)
override TARGET_IMPLICITUNITS+=cocoaint
endif
ifeq ($(FULL_TARGET),m68k-linux) ifeq ($(FULL_TARGET),m68k-linux)
override TARGET_IMPLICITUNITS+=cocoaint override TARGET_IMPLICITUNITS+=cocoaint
endif endif
@ -556,6 +574,9 @@ endif
ifeq ($(FULL_TARGET),x86_64-freebsd) ifeq ($(FULL_TARGET),x86_64-freebsd)
override TARGET_IMPLICITUNITS+=cocoaint override TARGET_IMPLICITUNITS+=cocoaint
endif endif
ifeq ($(FULL_TARGET),x86_64-solaris)
override TARGET_IMPLICITUNITS+=cocoaint
endif
ifeq ($(FULL_TARGET),x86_64-darwin) ifeq ($(FULL_TARGET),x86_64-darwin)
override TARGET_IMPLICITUNITS+=cocoaint override TARGET_IMPLICITUNITS+=cocoaint
endif endif
@ -607,6 +628,9 @@ endif
ifeq ($(FULL_TARGET),armeb-embedded) ifeq ($(FULL_TARGET),armeb-embedded)
override TARGET_IMPLICITUNITS+=cocoaint override TARGET_IMPLICITUNITS+=cocoaint
endif endif
ifeq ($(FULL_TARGET),mipsel-linux)
override TARGET_IMPLICITUNITS+=cocoaint
endif
ifeq ($(FULL_TARGET),i386-linux) ifeq ($(FULL_TARGET),i386-linux)
override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
endif endif
@ -667,6 +691,9 @@ endif
ifeq ($(FULL_TARGET),i386-symbian) ifeq ($(FULL_TARGET),i386-symbian)
override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
endif endif
ifeq ($(FULL_TARGET),i386-nativent)
override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
endif
ifeq ($(FULL_TARGET),m68k-linux) ifeq ($(FULL_TARGET),m68k-linux)
override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
endif endif
@ -730,6 +757,9 @@ endif
ifeq ($(FULL_TARGET),x86_64-freebsd) ifeq ($(FULL_TARGET),x86_64-freebsd)
override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
endif endif
ifeq ($(FULL_TARGET),x86_64-solaris)
override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
endif
ifeq ($(FULL_TARGET),x86_64-darwin) ifeq ($(FULL_TARGET),x86_64-darwin)
override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
endif endif
@ -781,179 +811,191 @@ endif
ifeq ($(FULL_TARGET),armeb-embedded) ifeq ($(FULL_TARGET),armeb-embedded)
override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
endif endif
ifeq ($(FULL_TARGET),mipsel-linux)
override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
endif
ifeq ($(FULL_TARGET),i386-linux) ifeq ($(FULL_TARGET),i386-linux)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),i386-go32v2) ifeq ($(FULL_TARGET),i386-go32v2)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),i386-win32) ifeq ($(FULL_TARGET),i386-win32)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),i386-os2) ifeq ($(FULL_TARGET),i386-os2)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),i386-freebsd) ifeq ($(FULL_TARGET),i386-freebsd)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),i386-beos) ifeq ($(FULL_TARGET),i386-beos)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),i386-haiku) ifeq ($(FULL_TARGET),i386-haiku)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),i386-netbsd) ifeq ($(FULL_TARGET),i386-netbsd)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),i386-solaris) ifeq ($(FULL_TARGET),i386-solaris)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),i386-qnx) ifeq ($(FULL_TARGET),i386-qnx)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),i386-netware) ifeq ($(FULL_TARGET),i386-netware)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),i386-openbsd) ifeq ($(FULL_TARGET),i386-openbsd)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),i386-wdosx) ifeq ($(FULL_TARGET),i386-wdosx)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),i386-darwin) ifeq ($(FULL_TARGET),i386-darwin)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),i386-emx) ifeq ($(FULL_TARGET),i386-emx)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),i386-watcom) ifeq ($(FULL_TARGET),i386-watcom)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),i386-netwlibc) ifeq ($(FULL_TARGET),i386-netwlibc)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),i386-wince) ifeq ($(FULL_TARGET),i386-wince)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),i386-embedded) ifeq ($(FULL_TARGET),i386-embedded)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),i386-symbian) ifeq ($(FULL_TARGET),i386-symbian)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif
ifeq ($(FULL_TARGET),i386-nativent)
override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),m68k-linux) ifeq ($(FULL_TARGET),m68k-linux)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),m68k-freebsd) ifeq ($(FULL_TARGET),m68k-freebsd)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),m68k-netbsd) ifeq ($(FULL_TARGET),m68k-netbsd)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),m68k-amiga) ifeq ($(FULL_TARGET),m68k-amiga)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),m68k-atari) ifeq ($(FULL_TARGET),m68k-atari)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),m68k-openbsd) ifeq ($(FULL_TARGET),m68k-openbsd)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),m68k-palmos) ifeq ($(FULL_TARGET),m68k-palmos)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),m68k-embedded) ifeq ($(FULL_TARGET),m68k-embedded)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),powerpc-linux) ifeq ($(FULL_TARGET),powerpc-linux)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),powerpc-netbsd) ifeq ($(FULL_TARGET),powerpc-netbsd)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),powerpc-amiga) ifeq ($(FULL_TARGET),powerpc-amiga)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),powerpc-macos) ifeq ($(FULL_TARGET),powerpc-macos)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),powerpc-darwin) ifeq ($(FULL_TARGET),powerpc-darwin)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),powerpc-morphos) ifeq ($(FULL_TARGET),powerpc-morphos)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),powerpc-embedded) ifeq ($(FULL_TARGET),powerpc-embedded)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),sparc-linux) ifeq ($(FULL_TARGET),sparc-linux)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),sparc-netbsd) ifeq ($(FULL_TARGET),sparc-netbsd)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),sparc-solaris) ifeq ($(FULL_TARGET),sparc-solaris)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),sparc-embedded) ifeq ($(FULL_TARGET),sparc-embedded)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),x86_64-linux) ifeq ($(FULL_TARGET),x86_64-linux)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),x86_64-freebsd) ifeq ($(FULL_TARGET),x86_64-freebsd)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif
ifeq ($(FULL_TARGET),x86_64-solaris)
override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),x86_64-darwin) ifeq ($(FULL_TARGET),x86_64-darwin)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),x86_64-win64) ifeq ($(FULL_TARGET),x86_64-win64)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),x86_64-embedded) ifeq ($(FULL_TARGET),x86_64-embedded)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),arm-linux) ifeq ($(FULL_TARGET),arm-linux)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),arm-palmos) ifeq ($(FULL_TARGET),arm-palmos)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),arm-darwin) ifeq ($(FULL_TARGET),arm-darwin)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),arm-wince) ifeq ($(FULL_TARGET),arm-wince)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),arm-gba) ifeq ($(FULL_TARGET),arm-gba)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),arm-nds) ifeq ($(FULL_TARGET),arm-nds)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),arm-embedded) ifeq ($(FULL_TARGET),arm-embedded)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),arm-symbian) ifeq ($(FULL_TARGET),arm-symbian)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),powerpc64-linux) ifeq ($(FULL_TARGET),powerpc64-linux)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),powerpc64-darwin) ifeq ($(FULL_TARGET),powerpc64-darwin)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),powerpc64-embedded) ifeq ($(FULL_TARGET),powerpc64-embedded)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),avr-embedded) ifeq ($(FULL_TARGET),avr-embedded)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),armeb-linux) ifeq ($(FULL_TARGET),armeb-linux)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),armeb-embedded) ifeq ($(FULL_TARGET),armeb-embedded)
override COMPILER_OPTIONS+=-gl -dcocoa1 override COMPILER_OPTIONS+=-gl -dcocoa
endif
ifeq ($(FULL_TARGET),mipsel-linux)
override COMPILER_OPTIONS+=-gl -dcocoa
endif endif
ifeq ($(FULL_TARGET),i386-linux) ifeq ($(FULL_TARGET),i386-linux)
override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
@ -1015,6 +1057,9 @@ endif
ifeq ($(FULL_TARGET),i386-symbian) ifeq ($(FULL_TARGET),i386-symbian)
override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
endif endif
ifeq ($(FULL_TARGET),i386-nativent)
override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
endif
ifeq ($(FULL_TARGET),m68k-linux) ifeq ($(FULL_TARGET),m68k-linux)
override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
endif endif
@ -1078,6 +1123,9 @@ endif
ifeq ($(FULL_TARGET),x86_64-freebsd) ifeq ($(FULL_TARGET),x86_64-freebsd)
override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
endif endif
ifeq ($(FULL_TARGET),x86_64-solaris)
override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
endif
ifeq ($(FULL_TARGET),x86_64-darwin) ifeq ($(FULL_TARGET),x86_64-darwin)
override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
endif endif
@ -1129,6 +1177,9 @@ endif
ifeq ($(FULL_TARGET),armeb-embedded) ifeq ($(FULL_TARGET),armeb-embedded)
override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) . override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
endif endif
ifeq ($(FULL_TARGET),mipsel-linux)
override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
endif
ifeq ($(FULL_TARGET),i386-linux) ifeq ($(FULL_TARGET),i386-linux)
override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa
endif endif
@ -1189,6 +1240,9 @@ endif
ifeq ($(FULL_TARGET),i386-symbian) ifeq ($(FULL_TARGET),i386-symbian)
override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa
endif endif
ifeq ($(FULL_TARGET),i386-nativent)
override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa
endif
ifeq ($(FULL_TARGET),m68k-linux) ifeq ($(FULL_TARGET),m68k-linux)
override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa
endif endif
@ -1252,6 +1306,9 @@ endif
ifeq ($(FULL_TARGET),x86_64-freebsd) ifeq ($(FULL_TARGET),x86_64-freebsd)
override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa
endif endif
ifeq ($(FULL_TARGET),x86_64-solaris)
override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa
endif
ifeq ($(FULL_TARGET),x86_64-darwin) ifeq ($(FULL_TARGET),x86_64-darwin)
override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa
endif endif
@ -1303,6 +1360,9 @@ endif
ifeq ($(FULL_TARGET),armeb-embedded) ifeq ($(FULL_TARGET),armeb-embedded)
override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa
endif endif
ifeq ($(FULL_TARGET),mipsel-linux)
override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa
endif
ifdef REQUIRE_UNITSDIR ifdef REQUIRE_UNITSDIR
override UNITSDIR+=$(REQUIRE_UNITSDIR) override UNITSDIR+=$(REQUIRE_UNITSDIR)
endif endif
@ -1521,6 +1581,7 @@ endif
ifeq ($(OS_TARGET),go32v2) ifeq ($(OS_TARGET),go32v2)
STATICLIBPREFIX= STATICLIBPREFIX=
SHORTSUFFIX=dos SHORTSUFFIX=dos
IMPORTLIBPREFIX=
endif endif
ifeq ($(OS_TARGET),watcom) ifeq ($(OS_TARGET),watcom)
STATICLIBPREFIX= STATICLIBPREFIX=
@ -1528,6 +1589,7 @@ OEXT=.obj
ASMEXT=.asm ASMEXT=.asm
SHAREDLIBEXT=.dll SHAREDLIBEXT=.dll
SHORTSUFFIX=wat SHORTSUFFIX=wat
IMPORTLIBPREFIX=
endif endif
ifeq ($(OS_TARGET),linux) ifeq ($(OS_TARGET),linux)
BATCHEXT=.sh BATCHEXT=.sh
@ -1564,6 +1626,7 @@ STATICLIBPREFIX=
SHAREDLIBEXT=.dll SHAREDLIBEXT=.dll
SHORTSUFFIX=os2 SHORTSUFFIX=os2
ECHO=echo ECHO=echo
IMPORTLIBPREFIX=
endif endif
ifeq ($(OS_TARGET),emx) ifeq ($(OS_TARGET),emx)
BATCHEXT=.cmd BATCHEXT=.cmd
@ -1572,6 +1635,7 @@ STATICLIBPREFIX=
SHAREDLIBEXT=.dll SHAREDLIBEXT=.dll
SHORTSUFFIX=emx SHORTSUFFIX=emx
ECHO=echo ECHO=echo
IMPORTLIBPREFIX=
endif endif
ifeq ($(OS_TARGET),amiga) ifeq ($(OS_TARGET),amiga)
EXEEXT= EXEEXT=
@ -1611,17 +1675,20 @@ ifeq ($(OS_TARGET),netware)
EXEEXT=.nlm EXEEXT=.nlm
STATICLIBPREFIX= STATICLIBPREFIX=
SHORTSUFFIX=nw SHORTSUFFIX=nw
IMPORTLIBPREFIX=imp
endif endif
ifeq ($(OS_TARGET),netwlibc) ifeq ($(OS_TARGET),netwlibc)
EXEEXT=.nlm EXEEXT=.nlm
STATICLIBPREFIX= STATICLIBPREFIX=
SHORTSUFFIX=nwl SHORTSUFFIX=nwl
IMPORTLIBPREFIX=imp
endif endif
ifeq ($(OS_TARGET),macos) ifeq ($(OS_TARGET),macos)
BATCHEXT= BATCHEXT=
EXEEXT= EXEEXT=
DEBUGSYMEXT=.xcoff DEBUGSYMEXT=.xcoff
SHORTSUFFIX=mac SHORTSUFFIX=mac
IMPORTLIBPREFIX=imp
endif endif
ifeq ($(OS_TARGET),darwin) ifeq ($(OS_TARGET),darwin)
BATCHEXT=.sh BATCHEXT=.sh
@ -1638,6 +1705,10 @@ ifeq ($(OS_TARGET),symbian)
SHAREDLIBEXT=.dll SHAREDLIBEXT=.dll
SHORTSUFFIX=symbian SHORTSUFFIX=symbian
endif endif
ifeq ($(OS_TARGET),NativeNT)
SHAREDLIBEXT=.dll
SHORTSUFFIX=nativent
endif
else else
ifeq ($(OS_TARGET),go32v1) ifeq ($(OS_TARGET),go32v1)
PPUEXT=.pp1 PPUEXT=.pp1
@ -1648,14 +1719,17 @@ STATICLIBEXT=.a1
SHAREDLIBEXT=.so1 SHAREDLIBEXT=.so1
STATICLIBPREFIX= STATICLIBPREFIX=
SHORTSUFFIX=v1 SHORTSUFFIX=v1
IMPORTLIBPREFIX=
endif endif
ifeq ($(OS_TARGET),go32v2) ifeq ($(OS_TARGET),go32v2)
STATICLIBPREFIX= STATICLIBPREFIX=
SHORTSUFFIX=dos SHORTSUFFIX=dos
IMPORTLIBPREFIX=
endif endif
ifeq ($(OS_TARGET),watcom) ifeq ($(OS_TARGET),watcom)
STATICLIBPREFIX= STATICLIBPREFIX=
SHORTSUFFIX=wat SHORTSUFFIX=wat
IMPORTLIBPREFIX=
endif endif
ifeq ($(OS_TARGET),linux) ifeq ($(OS_TARGET),linux)
BATCHEXT=.sh BATCHEXT=.sh
@ -1702,6 +1776,7 @@ STATICLIBEXT=.ao2
SHAREDLIBEXT=.dll SHAREDLIBEXT=.dll
SHORTSUFFIX=os2 SHORTSUFFIX=os2
ECHO=echo ECHO=echo
IMPORTLIBPREFIX=
endif endif
ifeq ($(OS_TARGET),amiga) ifeq ($(OS_TARGET),amiga)
EXEEXT= EXEEXT=
@ -1762,6 +1837,7 @@ STATICLIBEXT=.a
SHAREDLIBEXT=.nlm SHAREDLIBEXT=.nlm
EXEEXT=.nlm EXEEXT=.nlm
SHORTSUFFIX=nw SHORTSUFFIX=nw
IMPORTLIBPREFIX=imp
endif endif
ifeq ($(OS_TARGET),netwlibc) ifeq ($(OS_TARGET),netwlibc)
STATICLIBPREFIX= STATICLIBPREFIX=
@ -1773,6 +1849,7 @@ STATICLIBEXT=.a
SHAREDLIBEXT=.nlm SHAREDLIBEXT=.nlm
EXEEXT=.nlm EXEEXT=.nlm
SHORTSUFFIX=nwl SHORTSUFFIX=nwl
IMPORTLIBPREFIX=imp
endif endif
ifeq ($(OS_TARGET),macos) ifeq ($(OS_TARGET),macos)
BATCHEXT= BATCHEXT=
@ -1784,6 +1861,7 @@ STATICLIBEXT=.a
EXEEXT= EXEEXT=
DEBUGSYMEXT=.xcoff DEBUGSYMEXT=.xcoff
SHORTSUFFIX=mac SHORTSUFFIX=mac
IMPORTLIBPREFIX=imp
endif endif
endif endif
ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
@ -2116,6 +2194,9 @@ endif
ifeq ($(FULL_TARGET),i386-symbian) ifeq ($(FULL_TARGET),i386-symbian)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
endif endif
ifeq ($(FULL_TARGET),i386-nativent)
REQUIRE_PACKAGES_RTL=1
endif
ifeq ($(FULL_TARGET),m68k-linux) ifeq ($(FULL_TARGET),m68k-linux)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
endif endif
@ -2179,6 +2260,9 @@ endif
ifeq ($(FULL_TARGET),x86_64-freebsd) ifeq ($(FULL_TARGET),x86_64-freebsd)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
endif endif
ifeq ($(FULL_TARGET),x86_64-solaris)
REQUIRE_PACKAGES_RTL=1
endif
ifeq ($(FULL_TARGET),x86_64-darwin) ifeq ($(FULL_TARGET),x86_64-darwin)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
endif endif
@ -2230,6 +2314,9 @@ endif
ifeq ($(FULL_TARGET),armeb-embedded) ifeq ($(FULL_TARGET),armeb-embedded)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
endif endif
ifeq ($(FULL_TARGET),mipsel-linux)
REQUIRE_PACKAGES_RTL=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),)
@ -2239,9 +2326,9 @@ else
UNITDIR_RTL=$(PACKAGEDIR_RTL) UNITDIR_RTL=$(PACKAGEDIR_RTL)
endif endif
ifdef CHECKDEPEND ifdef CHECKDEPEND
$(PACKAGEDIR_RTL)/$(FPCMADE): $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE):
$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE) $(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE)
override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE) override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE)
endif endif
else else
PACKAGEDIR_RTL= PACKAGEDIR_RTL=
@ -2570,6 +2657,9 @@ endif
ifdef EXEFILES ifdef EXEFILES
override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES)) override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
endif endif
ifdef CLEAN_PROGRAMS
override CLEANEXEFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(EXEEXT), $(CLEAN_PROGRAMS)))
endif
ifdef CLEAN_UNITS ifdef CLEAN_UNITS
override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS)) override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))
endif endif
@ -2616,6 +2706,9 @@ endif
ifdef CLEANRSTFILES ifdef CLEANRSTFILES
-$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES)) -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))
endif endif
endif
ifdef CLEAN_FILES
-$(DEL) $(CLEAN_FILES)
endif endif
-$(DELTREE) units -$(DELTREE) units
-$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)

2
lcl/interfaces/cocoa/Makefile.fpc
View File

@ -14,7 +14,7 @@ units=interfaces
implicitunits=cocoaint implicitunits=cocoaint
[compiler] [compiler]
options=-gl -dcocoa1 options=-gl -dcocoa
unitdir=../../units/$(CPU_TARGET)-$(OS_TARGET) . unitdir=../../units/$(CPU_TARGET)-$(OS_TARGET) .
unittargetdir=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa unittargetdir=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa

2
lcl/interfaces/cocoa/interfaces.pas
View File

@ -25,7 +25,7 @@ unit Interfaces;
{$mode objfpc}{$H+} {$mode objfpc}{$H+}
{$IFNDEF COCOA1} {$IFNDEF COCOA}
{$ERROR wrong interfaces source} {$ERROR wrong interfaces source}
{$ENDIF} {$ENDIF}