* correction for r12204 and r12224

git-svn-id: trunk@12225 -
This commit is contained in:
Tomas Hajny 2008-11-24 22:11:18 +00:00
parent 856ee3f7c1
commit ff119421dd
2 changed files with 59 additions and 60 deletions

View File

@ -800,178 +800,178 @@ ifeq ($(FULL_TARGET),armeb-embedded)
override COMPILER_OPTIONS+=-S2h
endif
ifeq ($(FULL_TARGET),i386-linux)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix src/dummy
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy src/unix
endif
ifeq ($(FULL_TARGET),i386-go32v2)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy
endif
ifeq ($(FULL_TARGET),i386-win32)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/win
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy src/win
endif
ifeq ($(FULL_TARGET),i386-os2)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy
endif
ifeq ($(FULL_TARGET),i386-freebsd)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy src/unix
endif
ifeq ($(FULL_TARGET),i386-beos)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy src/unix
endif
ifeq ($(FULL_TARGET),i386-haiku)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy src/unix
endif
ifeq ($(FULL_TARGET),i386-netbsd)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy src/unix
endif
ifeq ($(FULL_TARGET),i386-solaris)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy src/unix
endif
ifeq ($(FULL_TARGET),i386-qnx)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy src/unix
endif
ifeq ($(FULL_TARGET),i386-netware)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy
endif
ifeq ($(FULL_TARGET),i386-openbsd)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy src/unix
endif
ifeq ($(FULL_TARGET),i386-wdosx)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy
endif
ifeq ($(FULL_TARGET),i386-darwin)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy src/unix
endif
ifeq ($(FULL_TARGET),i386-emx)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/os2
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy src/os2
endif
ifeq ($(FULL_TARGET),i386-watcom)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy
endif
ifeq ($(FULL_TARGET),i386-netwlibc)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy
endif
ifeq ($(FULL_TARGET),i386-wince)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/win
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy src/win
endif
ifeq ($(FULL_TARGET),i386-embedded)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy
endif
ifeq ($(FULL_TARGET),i386-symbian)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy
endif
ifeq ($(FULL_TARGET),m68k-linux)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix src/dummy
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy src/unix
endif
ifeq ($(FULL_TARGET),m68k-freebsd)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy src/unix
endif
ifeq ($(FULL_TARGET),m68k-netbsd)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy src/unix
endif
ifeq ($(FULL_TARGET),m68k-amiga)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy
endif
ifeq ($(FULL_TARGET),m68k-atari)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy
endif
ifeq ($(FULL_TARGET),m68k-openbsd)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy src/unix
endif
ifeq ($(FULL_TARGET),m68k-palmos)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy
endif
ifeq ($(FULL_TARGET),m68k-embedded)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy
endif
ifeq ($(FULL_TARGET),powerpc-linux)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix src/dummy
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy src/unix
endif
ifeq ($(FULL_TARGET),powerpc-netbsd)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy src/unix
endif
ifeq ($(FULL_TARGET),powerpc-amiga)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy
endif
ifeq ($(FULL_TARGET),powerpc-macos)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy
endif
ifeq ($(FULL_TARGET),powerpc-darwin)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy src/unix
endif
ifeq ($(FULL_TARGET),powerpc-morphos)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy
endif
ifeq ($(FULL_TARGET),powerpc-embedded)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy
endif
ifeq ($(FULL_TARGET),sparc-linux)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix src/dummy
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy src/unix
endif
ifeq ($(FULL_TARGET),sparc-netbsd)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy src/unix
endif
ifeq ($(FULL_TARGET),sparc-solaris)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy src/unix
endif
ifeq ($(FULL_TARGET),sparc-embedded)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy
endif
ifeq ($(FULL_TARGET),x86_64-linux)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix src/dummy
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy src/unix
endif
ifeq ($(FULL_TARGET),x86_64-freebsd)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy src/unix
endif
ifeq ($(FULL_TARGET),x86_64-darwin)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy src/unix
endif
ifeq ($(FULL_TARGET),x86_64-win64)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/win
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy src/win
endif
ifeq ($(FULL_TARGET),x86_64-embedded)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy
endif
ifeq ($(FULL_TARGET),arm-linux)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix src/dummy
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy src/unix
endif
ifeq ($(FULL_TARGET),arm-palmos)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy
endif
ifeq ($(FULL_TARGET),arm-darwin)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy src/unix
endif
ifeq ($(FULL_TARGET),arm-wince)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/win
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy src/win
endif
ifeq ($(FULL_TARGET),arm-gba)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy
endif
ifeq ($(FULL_TARGET),arm-nds)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy
endif
ifeq ($(FULL_TARGET),arm-embedded)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy
endif
ifeq ($(FULL_TARGET),arm-symbian)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy
endif
ifeq ($(FULL_TARGET),powerpc64-linux)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix src/dummy
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy src/unix
endif
ifeq ($(FULL_TARGET),powerpc64-darwin)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy src/unix
endif
ifeq ($(FULL_TARGET),powerpc64-embedded)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy
endif
ifeq ($(FULL_TARGET),avr-embedded)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy
endif
ifeq ($(FULL_TARGET),armeb-linux)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix src/dummy
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy src/unix
endif
ifeq ($(FULL_TARGET),armeb-embedded)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src dummy
endif
ifeq ($(FULL_TARGET),i386-linux)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src

View File

@ -34,7 +34,7 @@ rsts=cachecls custapp cgiapp eventlog registry streamcoll inicol
[compiler]
options=-S2h
includedir=src/$(OS_TARGET) src
includedir=src/$(OS_TARGET) src dummy
includedir_linux=src/unix
includedir_freebsd=src/unix
includedir_darwin=src/unix
@ -49,7 +49,6 @@ includedir_win32=src/win
includedir_win64=src/win
includedir_wince=src/win
sourcedir=src/$(OS_TARGET) src
includedir_linux=src/dummy
[prerules]
ifeq ($(OS_TARGET),win32)