- removed 1.0.x-specific checks

git-svn-id: trunk@13570 -
This commit is contained in:
Jonas Maebe 2009-08-20 20:33:15 +00:00
parent a7ed599879
commit d11764fe8c
2 changed files with 1 additions and 32 deletions

View File

@ -1,5 +1,5 @@
#
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2009/08/20]
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2009/08/14]
#
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
@ -348,16 +348,6 @@ CPUSUF=arm
endif
NOCPUDEF=1
MSGFILE=msg/error$(FPCLANG).msg
ifeq ($(OS_TARGET),linux)
ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
override LOCALOPT+=-dUNIX
endif
endif
ifeq ($(OS_TARGET),freebsd)
ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
override LOCALOPT+=-dUNIX
endif
endif
REVINC:=$(wildcard revision.inc)
ifneq ($(REVINC),)
override LOCALOPT+=-dREVINC
@ -3256,9 +3246,6 @@ override DIFF:=$(CMP) -i218
endif
endif
override COMPILER+=$(LOCALOPT)
ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
override COMPILER:=$(patsubst -O%,,$(COMPILER))
endif
PASDOC:=$(strip $(wildcard $(addsuffix /pasdoc.exe,$(SEARCHPATH))))
ifeq ($(PASDOC),)
PASDOC:=$(strip $(wildcard $(addsuffix /pasdoc,$(SEARCHPATH))))

View File

@ -150,19 +150,6 @@ NOCPUDEF=1
# Default message file
MSGFILE=msg/error$(FPCLANG).msg
# Define Unix also for Linux
ifeq ($(OS_TARGET),linux)
ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
override LOCALOPT+=-dUNIX
endif
endif
ifeq ($(OS_TARGET),freebsd)
ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
override LOCALOPT+=-dUNIX
endif
endif
REVINC:=$(wildcard revision.inc)
ifneq ($(REVINC),)
override LOCALOPT+=-dREVINC
@ -246,11 +233,6 @@ endif
# Add Local options
override COMPILER+=$(LOCALOPT)
# Disable optimizer when compiled with 1.0.x
ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
override COMPILER:=$(patsubst -O%,,$(COMPILER))
endif
#####################################################################
# PASDoc