* fixed includedirs

git-svn-id: trunk@8989 -
This commit is contained in:
peter 2007-10-29 16:07:13 +00:00
parent 324b1732ab
commit ad1c9bf4e6
2 changed files with 223 additions and 54 deletions

View File

@ -1,5 +1,5 @@
# #
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/10/29] # Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/10/25]
# #
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 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 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
@ -672,160 +672,316 @@ ifeq ($(FULL_TARGET),powerpc64-embedded)
override COMPILER_OPTIONS+=-S2h override COMPILER_OPTIONS+=-S2h
endif endif
ifeq ($(FULL_TARGET),i386-linux) ifeq ($(FULL_TARGET),i386-linux)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix
endif endif
ifeq ($(FULL_TARGET),i386-go32v2) ifeq ($(FULL_TARGET),i386-go32v2)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET)
endif endif
ifeq ($(FULL_TARGET),i386-win32) ifeq ($(FULL_TARGET),i386-win32)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/win
endif endif
ifeq ($(FULL_TARGET),i386-os2) ifeq ($(FULL_TARGET),i386-os2)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET)
endif endif
ifeq ($(FULL_TARGET),i386-freebsd) ifeq ($(FULL_TARGET),i386-freebsd)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix
endif endif
ifeq ($(FULL_TARGET),i386-beos) ifeq ($(FULL_TARGET),i386-beos)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix
endif endif
ifeq ($(FULL_TARGET),i386-netbsd) ifeq ($(FULL_TARGET),i386-netbsd)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix
endif endif
ifeq ($(FULL_TARGET),i386-solaris) ifeq ($(FULL_TARGET),i386-solaris)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix
endif endif
ifeq ($(FULL_TARGET),i386-qnx) ifeq ($(FULL_TARGET),i386-qnx)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix
endif endif
ifeq ($(FULL_TARGET),i386-netware) ifeq ($(FULL_TARGET),i386-netware)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET)
endif endif
ifeq ($(FULL_TARGET),i386-openbsd) ifeq ($(FULL_TARGET),i386-openbsd)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix
endif endif
ifeq ($(FULL_TARGET),i386-wdosx) ifeq ($(FULL_TARGET),i386-wdosx)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET)
endif endif
ifeq ($(FULL_TARGET),i386-darwin) ifeq ($(FULL_TARGET),i386-darwin)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix
endif endif
ifeq ($(FULL_TARGET),i386-emx) ifeq ($(FULL_TARGET),i386-emx)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/os2
endif endif
ifeq ($(FULL_TARGET),i386-watcom) ifeq ($(FULL_TARGET),i386-watcom)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET)
endif endif
ifeq ($(FULL_TARGET),i386-netwlibc) ifeq ($(FULL_TARGET),i386-netwlibc)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET)
endif endif
ifeq ($(FULL_TARGET),i386-wince) ifeq ($(FULL_TARGET),i386-wince)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/win
endif endif
ifeq ($(FULL_TARGET),i386-embedded) ifeq ($(FULL_TARGET),i386-embedded)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET)
endif endif
ifeq ($(FULL_TARGET),i386-symbian) ifeq ($(FULL_TARGET),i386-symbian)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET)
endif endif
ifeq ($(FULL_TARGET),m68k-linux) ifeq ($(FULL_TARGET),m68k-linux)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix
endif endif
ifeq ($(FULL_TARGET),m68k-freebsd) ifeq ($(FULL_TARGET),m68k-freebsd)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix
endif endif
ifeq ($(FULL_TARGET),m68k-netbsd) ifeq ($(FULL_TARGET),m68k-netbsd)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix
endif endif
ifeq ($(FULL_TARGET),m68k-amiga) ifeq ($(FULL_TARGET),m68k-amiga)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET)
endif endif
ifeq ($(FULL_TARGET),m68k-atari) ifeq ($(FULL_TARGET),m68k-atari)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET)
endif endif
ifeq ($(FULL_TARGET),m68k-openbsd) ifeq ($(FULL_TARGET),m68k-openbsd)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix
endif endif
ifeq ($(FULL_TARGET),m68k-palmos) ifeq ($(FULL_TARGET),m68k-palmos)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET)
endif endif
ifeq ($(FULL_TARGET),m68k-embedded) ifeq ($(FULL_TARGET),m68k-embedded)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET)
endif endif
ifeq ($(FULL_TARGET),powerpc-linux) ifeq ($(FULL_TARGET),powerpc-linux)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix
endif endif
ifeq ($(FULL_TARGET),powerpc-netbsd) ifeq ($(FULL_TARGET),powerpc-netbsd)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix
endif endif
ifeq ($(FULL_TARGET),powerpc-amiga) ifeq ($(FULL_TARGET),powerpc-amiga)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET)
endif endif
ifeq ($(FULL_TARGET),powerpc-macos) ifeq ($(FULL_TARGET),powerpc-macos)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET)
endif endif
ifeq ($(FULL_TARGET),powerpc-darwin) ifeq ($(FULL_TARGET),powerpc-darwin)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix
endif endif
ifeq ($(FULL_TARGET),powerpc-morphos) ifeq ($(FULL_TARGET),powerpc-morphos)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET)
endif endif
ifeq ($(FULL_TARGET),powerpc-embedded) ifeq ($(FULL_TARGET),powerpc-embedded)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET)
endif endif
ifeq ($(FULL_TARGET),sparc-linux) ifeq ($(FULL_TARGET),sparc-linux)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix
endif endif
ifeq ($(FULL_TARGET),sparc-netbsd) ifeq ($(FULL_TARGET),sparc-netbsd)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix
endif endif
ifeq ($(FULL_TARGET),sparc-solaris) ifeq ($(FULL_TARGET),sparc-solaris)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix
endif endif
ifeq ($(FULL_TARGET),sparc-embedded) ifeq ($(FULL_TARGET),sparc-embedded)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET)
endif endif
ifeq ($(FULL_TARGET),x86_64-linux) ifeq ($(FULL_TARGET),x86_64-linux)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix
endif endif
ifeq ($(FULL_TARGET),x86_64-freebsd) ifeq ($(FULL_TARGET),x86_64-freebsd)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix
endif endif
ifeq ($(FULL_TARGET),x86_64-win64) ifeq ($(FULL_TARGET),x86_64-win64)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/win
endif endif
ifeq ($(FULL_TARGET),x86_64-embedded) ifeq ($(FULL_TARGET),x86_64-embedded)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET)
endif endif
ifeq ($(FULL_TARGET),arm-linux) ifeq ($(FULL_TARGET),arm-linux)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix
endif endif
ifeq ($(FULL_TARGET),arm-palmos) ifeq ($(FULL_TARGET),arm-palmos)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET)
endif endif
ifeq ($(FULL_TARGET),arm-wince) ifeq ($(FULL_TARGET),arm-wince)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/win
endif endif
ifeq ($(FULL_TARGET),arm-gba) ifeq ($(FULL_TARGET),arm-gba)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET)
endif endif
ifeq ($(FULL_TARGET),arm-nds) ifeq ($(FULL_TARGET),arm-nds)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET)
endif endif
ifeq ($(FULL_TARGET),arm-embedded) ifeq ($(FULL_TARGET),arm-embedded)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET)
endif endif
ifeq ($(FULL_TARGET),arm-symbian) ifeq ($(FULL_TARGET),arm-symbian)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET)
endif endif
ifeq ($(FULL_TARGET),powerpc64-linux) ifeq ($(FULL_TARGET),powerpc64-linux)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix
endif endif
ifeq ($(FULL_TARGET),powerpc64-darwin) ifeq ($(FULL_TARGET),powerpc64-darwin)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/unix
endif endif
ifeq ($(FULL_TARGET),powerpc64-embedded) ifeq ($(FULL_TARGET),powerpc64-embedded)
override COMPILER_SOURCEDIR+=src override COMPILER_INCLUDEDIR+=src/$(OS_TARGET)
endif
ifeq ($(FULL_TARGET),i386-linux)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),i386-go32v2)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),i386-win32)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),i386-os2)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),i386-freebsd)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),i386-beos)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),i386-netbsd)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),i386-solaris)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),i386-qnx)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),i386-netware)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),i386-openbsd)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),i386-wdosx)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),i386-darwin)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),i386-emx)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),i386-watcom)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),i386-netwlibc)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),i386-wince)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),i386-embedded)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),i386-symbian)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),m68k-linux)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),m68k-freebsd)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),m68k-netbsd)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),m68k-amiga)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),m68k-atari)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),m68k-openbsd)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),m68k-palmos)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),m68k-embedded)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),powerpc-linux)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),powerpc-netbsd)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),powerpc-amiga)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),powerpc-macos)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),powerpc-darwin)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),powerpc-morphos)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),powerpc-embedded)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),sparc-linux)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),sparc-netbsd)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),sparc-solaris)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),sparc-embedded)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),x86_64-linux)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),x86_64-freebsd)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),x86_64-win64)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),x86_64-embedded)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),arm-linux)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),arm-palmos)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),arm-wince)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),arm-gba)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),arm-nds)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),arm-embedded)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),arm-symbian)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),powerpc64-linux)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),powerpc64-darwin)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),powerpc64-embedded)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif endif
ifdef REQUIRE_UNITSDIR ifdef REQUIRE_UNITSDIR
override UNITSDIR+=$(REQUIRE_UNITSDIR) override UNITSDIR+=$(REQUIRE_UNITSDIR)

View File

@ -29,7 +29,20 @@ packages=netdb fcl-base fcl-xml fcl-passrc fcl-async
[compiler] [compiler]
options=-S2h options=-S2h
sourcedir=src includedir=src/$(OS_TARGET)
includedir_linux=src/unix
includedir_freebsd=src/unix
includedir_darwin=src/unix
includedir_netbsd=src/unix
includedir_openbsd=src/unix
includedir_solaris=src/unix
includedir_qnx=src/unix
includedir_beos=src/unix
includedir_emx=src/os2
includedir_win32=src/win
includedir_win64=src/win
includedir_wince=src/win
sourcedir=src/$(OS_TARGET) src
[install] [install]
fpcpackage=y fpcpackage=y