mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-06-05 11:18:41 +02:00
* fixed dosbox_wrapper compilation under windows
git-svn-id: trunk@32628 -
This commit is contained in:
parent
db2a02fb63
commit
1d015b9620
@ -1,11 +1,11 @@
|
||||
#
|
||||
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2014/03/03]
|
||||
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015-09-05 rev 31523]
|
||||
#
|
||||
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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd 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
|
||||
UNIXs = linux $(BSDs) solaris qnx haiku
|
||||
LIMIT83fs = go32v2 os2 emx watcom
|
||||
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 i386-iphonesim i386-android i386-aros 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 powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos i8086-win16 aarch64-linux aarch64-darwin
|
||||
BSDs = freebsd netbsd openbsd darwin dragonfly
|
||||
UNIXs = linux $(BSDs) solaris qnx haiku aix
|
||||
LIMIT83fs = go32v2 os2 emx watcom msdos win16
|
||||
OSNeedsComspecToRunBatch = go32v2 watcom
|
||||
FORCE:
|
||||
.PHONY: FORCE
|
||||
@ -178,6 +178,24 @@ else
|
||||
ARCH=$(CPU_TARGET)
|
||||
endif
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),arm-embedded)
|
||||
ifeq ($(SUBARCH),)
|
||||
$(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t or SUBARCH=armv7m) must be defined)
|
||||
endif
|
||||
override FPCOPT+=-Cp$(SUBARCH)
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),avr-embedded)
|
||||
ifeq ($(SUBARCH),)
|
||||
$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined)
|
||||
endif
|
||||
override FPCOPT+=-Cp$(SUBARCH)
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),mipsel-embedded)
|
||||
ifeq ($(SUBARCH),)
|
||||
$(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined)
|
||||
endif
|
||||
override FPCOPT+=-Cp$(SUBARCH)
|
||||
endif
|
||||
ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
|
||||
TARGETSUFFIX=$(OS_TARGET)
|
||||
SOURCESUFFIX=$(OS_SOURCE)
|
||||
@ -203,6 +221,14 @@ endif
|
||||
ifeq ($(OS_TARGET),linux)
|
||||
linuxHier=1
|
||||
endif
|
||||
ifndef CROSSCOMPILE
|
||||
BUILDFULLNATIVE=1
|
||||
export BUILDFULLNATIVE
|
||||
endif
|
||||
ifdef BUILDFULLNATIVE
|
||||
BUILDNATIVE=1
|
||||
export BUILDNATIVE
|
||||
endif
|
||||
export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE
|
||||
ifdef FPCDIR
|
||||
override FPCDIR:=$(subst \,/,$(FPCDIR))
|
||||
@ -251,8 +277,27 @@ endif
|
||||
ifndef BINUTILSPREFIX
|
||||
ifndef CROSSBINDIR
|
||||
ifdef CROSSCOMPILE
|
||||
ifneq ($(OS_TARGET),msdos)
|
||||
ifndef DARWIN2DARWIN
|
||||
ifneq ($(CPU_TARGET),jvm)
|
||||
BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)-
|
||||
ifeq ($(OS_TARGET),android)
|
||||
ifeq ($(CPU_TARGET),arm)
|
||||
BINUTILSPREFIX=arm-linux-androideabi-
|
||||
else
|
||||
ifeq ($(CPU_TARGET),i386)
|
||||
BINUTILSPREFIX=i686-linux-android-
|
||||
else
|
||||
ifeq ($(CPU_TARGET),mipsel)
|
||||
BINUTILSPREFIX=mipsel-linux-android-
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
else
|
||||
BINUTILSPREFIX=$(OS_TARGET)-
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
@ -287,7 +332,7 @@ FPCFPMAKE=$(FPC)
|
||||
endif
|
||||
endif
|
||||
ifneq ($(findstring dosbox_wrapper,$(EMULATOR)),)
|
||||
MSDOSPROG=dosbox/dosbox_wrapper$(SRCEXEEXT)
|
||||
MSDOSPROG=dosbox/dosbox_wrapper
|
||||
else
|
||||
MSDOSPROG=
|
||||
endif
|
||||
@ -357,6 +402,12 @@ endif
|
||||
ifeq ($(FULL_TARGET),i386-iphonesim)
|
||||
override TARGET_PROGRAMS+=dotest fptime fail testfail digest concat $(DBDIGEST) $(MSDOSPROG)
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-android)
|
||||
override TARGET_PROGRAMS+=dotest fptime fail testfail digest concat $(DBDIGEST) $(MSDOSPROG)
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-aros)
|
||||
override TARGET_PROGRAMS+=dotest fptime fail testfail digest concat $(DBDIGEST) $(MSDOSPROG)
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),m68k-linux)
|
||||
override TARGET_PROGRAMS+=dotest fptime fail testfail digest concat $(DBDIGEST) $(MSDOSPROG)
|
||||
endif
|
||||
@ -405,6 +456,9 @@ endif
|
||||
ifeq ($(FULL_TARGET),powerpc-wii)
|
||||
override TARGET_PROGRAMS+=dotest fptime fail testfail digest concat $(DBDIGEST) $(MSDOSPROG)
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc-aix)
|
||||
override TARGET_PROGRAMS+=dotest fptime fail testfail digest concat $(DBDIGEST) $(MSDOSPROG)
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),sparc-linux)
|
||||
override TARGET_PROGRAMS+=dotest fptime fail testfail digest concat $(DBDIGEST) $(MSDOSPROG)
|
||||
endif
|
||||
@ -441,6 +495,15 @@ endif
|
||||
ifeq ($(FULL_TARGET),x86_64-embedded)
|
||||
override TARGET_PROGRAMS+=dotest fptime fail testfail digest concat $(DBDIGEST) $(MSDOSPROG)
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),x86_64-iphonesim)
|
||||
override TARGET_PROGRAMS+=dotest fptime fail testfail digest concat $(DBDIGEST) $(MSDOSPROG)
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),x86_64-aros)
|
||||
override TARGET_PROGRAMS+=dotest fptime fail testfail digest concat $(DBDIGEST) $(MSDOSPROG)
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),x86_64-dragonfly)
|
||||
override TARGET_PROGRAMS+=dotest fptime fail testfail digest concat $(DBDIGEST) $(MSDOSPROG)
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),arm-linux)
|
||||
override TARGET_PROGRAMS+=dotest fptime fail testfail digest concat $(DBDIGEST) $(MSDOSPROG)
|
||||
endif
|
||||
@ -465,6 +528,9 @@ endif
|
||||
ifeq ($(FULL_TARGET),arm-symbian)
|
||||
override TARGET_PROGRAMS+=dotest fptime fail testfail digest concat $(DBDIGEST) $(MSDOSPROG)
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),arm-android)
|
||||
override TARGET_PROGRAMS+=dotest fptime fail testfail digest concat $(DBDIGEST) $(MSDOSPROG)
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc64-linux)
|
||||
override TARGET_PROGRAMS+=dotest fptime fail testfail digest concat $(DBDIGEST) $(MSDOSPROG)
|
||||
endif
|
||||
@ -474,6 +540,9 @@ endif
|
||||
ifeq ($(FULL_TARGET),powerpc64-embedded)
|
||||
override TARGET_PROGRAMS+=dotest fptime fail testfail digest concat $(DBDIGEST) $(MSDOSPROG)
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc64-aix)
|
||||
override TARGET_PROGRAMS+=dotest fptime fail testfail digest concat $(DBDIGEST) $(MSDOSPROG)
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),avr-embedded)
|
||||
override TARGET_PROGRAMS+=dotest fptime fail testfail digest concat $(DBDIGEST) $(MSDOSPROG)
|
||||
endif
|
||||
@ -483,9 +552,36 @@ endif
|
||||
ifeq ($(FULL_TARGET),armeb-embedded)
|
||||
override TARGET_PROGRAMS+=dotest fptime fail testfail digest concat $(DBDIGEST) $(MSDOSPROG)
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),mips-linux)
|
||||
override TARGET_PROGRAMS+=dotest fptime fail testfail digest concat $(DBDIGEST) $(MSDOSPROG)
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),mipsel-linux)
|
||||
override TARGET_PROGRAMS+=dotest fptime fail testfail digest concat $(DBDIGEST) $(MSDOSPROG)
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),mipsel-embedded)
|
||||
override TARGET_PROGRAMS+=dotest fptime fail testfail digest concat $(DBDIGEST) $(MSDOSPROG)
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),mipsel-android)
|
||||
override TARGET_PROGRAMS+=dotest fptime fail testfail digest concat $(DBDIGEST) $(MSDOSPROG)
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),jvm-java)
|
||||
override TARGET_PROGRAMS+=dotest fptime fail testfail digest concat $(DBDIGEST) $(MSDOSPROG)
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),jvm-android)
|
||||
override TARGET_PROGRAMS+=dotest fptime fail testfail digest concat $(DBDIGEST) $(MSDOSPROG)
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i8086-msdos)
|
||||
override TARGET_PROGRAMS+=dotest fptime fail testfail digest concat $(DBDIGEST) $(MSDOSPROG)
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i8086-win16)
|
||||
override TARGET_PROGRAMS+=dotest fptime fail testfail digest concat $(DBDIGEST) $(MSDOSPROG)
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),aarch64-linux)
|
||||
override TARGET_PROGRAMS+=dotest fptime fail testfail digest concat $(DBDIGEST) $(MSDOSPROG)
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),aarch64-darwin)
|
||||
override TARGET_PROGRAMS+=dotest fptime fail testfail digest concat $(DBDIGEST) $(MSDOSPROG)
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-linux)
|
||||
override CLEAN_PROGRAMS+=dbdigest dbconfig
|
||||
endif
|
||||
@ -552,6 +648,12 @@ endif
|
||||
ifeq ($(FULL_TARGET),i386-iphonesim)
|
||||
override CLEAN_PROGRAMS+=dbdigest dbconfig
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-android)
|
||||
override CLEAN_PROGRAMS+=dbdigest dbconfig
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-aros)
|
||||
override CLEAN_PROGRAMS+=dbdigest dbconfig
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),m68k-linux)
|
||||
override CLEAN_PROGRAMS+=dbdigest dbconfig
|
||||
endif
|
||||
@ -600,6 +702,9 @@ endif
|
||||
ifeq ($(FULL_TARGET),powerpc-wii)
|
||||
override CLEAN_PROGRAMS+=dbdigest dbconfig
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc-aix)
|
||||
override CLEAN_PROGRAMS+=dbdigest dbconfig
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),sparc-linux)
|
||||
override CLEAN_PROGRAMS+=dbdigest dbconfig
|
||||
endif
|
||||
@ -636,6 +741,15 @@ endif
|
||||
ifeq ($(FULL_TARGET),x86_64-embedded)
|
||||
override CLEAN_PROGRAMS+=dbdigest dbconfig
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),x86_64-iphonesim)
|
||||
override CLEAN_PROGRAMS+=dbdigest dbconfig
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),x86_64-aros)
|
||||
override CLEAN_PROGRAMS+=dbdigest dbconfig
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),x86_64-dragonfly)
|
||||
override CLEAN_PROGRAMS+=dbdigest dbconfig
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),arm-linux)
|
||||
override CLEAN_PROGRAMS+=dbdigest dbconfig
|
||||
endif
|
||||
@ -660,6 +774,9 @@ endif
|
||||
ifeq ($(FULL_TARGET),arm-symbian)
|
||||
override CLEAN_PROGRAMS+=dbdigest dbconfig
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),arm-android)
|
||||
override CLEAN_PROGRAMS+=dbdigest dbconfig
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc64-linux)
|
||||
override CLEAN_PROGRAMS+=dbdigest dbconfig
|
||||
endif
|
||||
@ -669,6 +786,9 @@ endif
|
||||
ifeq ($(FULL_TARGET),powerpc64-embedded)
|
||||
override CLEAN_PROGRAMS+=dbdigest dbconfig
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc64-aix)
|
||||
override CLEAN_PROGRAMS+=dbdigest dbconfig
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),avr-embedded)
|
||||
override CLEAN_PROGRAMS+=dbdigest dbconfig
|
||||
endif
|
||||
@ -678,9 +798,36 @@ endif
|
||||
ifeq ($(FULL_TARGET),armeb-embedded)
|
||||
override CLEAN_PROGRAMS+=dbdigest dbconfig
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),mips-linux)
|
||||
override CLEAN_PROGRAMS+=dbdigest dbconfig
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),mipsel-linux)
|
||||
override CLEAN_PROGRAMS+=dbdigest dbconfig
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),mipsel-embedded)
|
||||
override CLEAN_PROGRAMS+=dbdigest dbconfig
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),mipsel-android)
|
||||
override CLEAN_PROGRAMS+=dbdigest dbconfig
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),jvm-java)
|
||||
override CLEAN_PROGRAMS+=dbdigest dbconfig
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),jvm-android)
|
||||
override CLEAN_PROGRAMS+=dbdigest dbconfig
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i8086-msdos)
|
||||
override CLEAN_PROGRAMS+=dbdigest dbconfig
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i8086-win16)
|
||||
override CLEAN_PROGRAMS+=dbdigest dbconfig
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),aarch64-linux)
|
||||
override CLEAN_PROGRAMS+=dbdigest dbconfig
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),aarch64-darwin)
|
||||
override CLEAN_PROGRAMS+=dbdigest dbconfig
|
||||
endif
|
||||
override INSTALL_FPCPACKAGE=y
|
||||
ifdef REQUIRE_UNITSDIR
|
||||
override UNITSDIR+=$(REQUIRE_UNITSDIR)
|
||||
@ -910,12 +1057,26 @@ SHAREDLIBEXT=.dll
|
||||
SHORTSUFFIX=wat
|
||||
IMPORTLIBPREFIX=
|
||||
endif
|
||||
ifneq ($(CPU_TARGET),jvm)
|
||||
ifeq ($(OS_TARGET),android)
|
||||
BATCHEXT=.sh
|
||||
EXEEXT=
|
||||
HASSHAREDLIB=1
|
||||
SHORTSUFFIX=lnx
|
||||
endif
|
||||
endif
|
||||
ifeq ($(OS_TARGET),linux)
|
||||
BATCHEXT=.sh
|
||||
EXEEXT=
|
||||
HASSHAREDLIB=1
|
||||
SHORTSUFFIX=lnx
|
||||
endif
|
||||
ifeq ($(OS_TARGET),dragonfly)
|
||||
BATCHEXT=.sh
|
||||
EXEEXT=
|
||||
HASSHAREDLIB=1
|
||||
SHORTSUFFIX=df
|
||||
endif
|
||||
ifeq ($(OS_TARGET),freebsd)
|
||||
BATCHEXT=.sh
|
||||
EXEEXT=
|
||||
@ -961,6 +1122,11 @@ EXEEXT=
|
||||
SHAREDLIBEXT=.library
|
||||
SHORTSUFFIX=amg
|
||||
endif
|
||||
ifeq ($(OS_TARGET),aros)
|
||||
EXEEXT=
|
||||
SHAREDLIBEXT=.library
|
||||
SHORTSUFFIX=aros
|
||||
endif
|
||||
ifeq ($(OS_TARGET),morphos)
|
||||
EXEEXT=
|
||||
SHAREDLIBEXT=.library
|
||||
@ -1034,6 +1200,40 @@ EXEEXT=.dol
|
||||
SHAREDLIBEXT=.so
|
||||
SHORTSUFFIX=wii
|
||||
endif
|
||||
ifeq ($(OS_TARGET),aix)
|
||||
BATCHEXT=.sh
|
||||
EXEEXT=
|
||||
SHORTSUFFIX=aix
|
||||
endif
|
||||
ifeq ($(OS_TARGET),java)
|
||||
OEXT=.class
|
||||
ASMEXT=.j
|
||||
SHAREDLIBEXT=.jar
|
||||
SHORTSUFFIX=java
|
||||
endif
|
||||
ifeq ($(CPU_TARGET),jvm)
|
||||
ifeq ($(OS_TARGET),android)
|
||||
OEXT=.class
|
||||
ASMEXT=.j
|
||||
SHAREDLIBEXT=.jar
|
||||
SHORTSUFFIX=android
|
||||
endif
|
||||
endif
|
||||
ifeq ($(OS_TARGET),msdos)
|
||||
STATICLIBPREFIX=
|
||||
STATICLIBEXT=.a
|
||||
SHORTSUFFIX=d16
|
||||
endif
|
||||
ifeq ($(OS_TARGET),embedded)
|
||||
EXEEXT=.bin
|
||||
SHORTSUFFIX=emb
|
||||
endif
|
||||
ifeq ($(OS_TARGET),win16)
|
||||
STATICLIBPREFIX=
|
||||
STATICLIBEXT=.a
|
||||
SHAREDLIBEXT=.dll
|
||||
SHORTSUFFIX=w16
|
||||
endif
|
||||
ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
|
||||
FPCMADE=fpcmade.$(SHORTSUFFIX)
|
||||
ZIPSUFFIX=$(SHORTSUFFIX)
|
||||
@ -1223,6 +1423,7 @@ ASNAME=$(BINUTILSPREFIX)as
|
||||
LDNAME=$(BINUTILSPREFIX)ld
|
||||
ARNAME=$(BINUTILSPREFIX)ar
|
||||
RCNAME=$(BINUTILSPREFIX)rc
|
||||
NASMNAME=$(BINUTILSPREFIX)nasm
|
||||
ifndef ASPROG
|
||||
ifdef CROSSBINDIR
|
||||
ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
|
||||
@ -1251,11 +1452,23 @@ else
|
||||
ARPROG=$(ARNAME)
|
||||
endif
|
||||
endif
|
||||
ifndef NASMPROG
|
||||
ifdef CROSSBINDIR
|
||||
NASMPROG=$(CROSSBINDIR)/$(NASMNAME)$(SRCEXEEXT)
|
||||
else
|
||||
NASMPROG=$(NASMNAME)
|
||||
endif
|
||||
endif
|
||||
AS=$(ASPROG)
|
||||
LD=$(LDPROG)
|
||||
RC=$(RCPROG)
|
||||
AR=$(ARPROG)
|
||||
NASM=$(NASMPROG)
|
||||
ifdef inUnix
|
||||
PPAS=./ppas$(SRCBATCHEXT)
|
||||
else
|
||||
PPAS=ppas$(SRCBATCHEXT)
|
||||
endif
|
||||
ifdef inUnix
|
||||
LDCONFIG=ldconfig
|
||||
else
|
||||
@ -1287,6 +1500,7 @@ endif
|
||||
ifeq ($(OS_SOURCE),openbsd)
|
||||
override FPCOPT+=-FD$(NEW_BINUTILS_PATH)
|
||||
override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH)
|
||||
override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH)
|
||||
endif
|
||||
ifndef CROSSBOOTSTRAP
|
||||
ifneq ($(BINUTILSPREFIX),)
|
||||
@ -1299,6 +1513,7 @@ endif
|
||||
ifndef CROSSCOMPILE
|
||||
ifneq ($(BINUTILSPREFIX),)
|
||||
override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)
|
||||
override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX)
|
||||
endif
|
||||
endif
|
||||
ifdef UNITDIR
|
||||
@ -1387,22 +1602,20 @@ endif
|
||||
endif
|
||||
ifdef CREATESHARED
|
||||
override FPCOPT+=-Cg
|
||||
ifeq ($(CPU_TARGET),i386)
|
||||
override FPCOPT+=-Aas
|
||||
endif
|
||||
endif
|
||||
ifeq ($(findstring 2.0.,$(FPC_VERSION)),)
|
||||
ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),)
|
||||
ifeq ($(CPU_TARGET),x86_64)
|
||||
ifneq ($(findstring $(OS_TARGET),dragonfly freebsd openbsd netbsd linux solaris),)
|
||||
ifneq ($(findstring $(CPU_TARGET),x86_64 mips mipsel),)
|
||||
override FPCOPT+=-Cg
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
ifdef LINKSHARED
|
||||
endif
|
||||
ifdef OPT
|
||||
override FPCOPT+=$(OPT)
|
||||
endif
|
||||
ifdef FPMAKEBUILDOPT
|
||||
override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT)
|
||||
endif
|
||||
ifdef FPCOPTDEF
|
||||
override FPCOPT+=$(addprefix -d,$(FPCOPTDEF))
|
||||
endif
|
||||
@ -1422,18 +1635,24 @@ endif
|
||||
ifdef ACROSSCOMPILE
|
||||
override FPCOPT+=$(CROSSOPT)
|
||||
endif
|
||||
override COMPILER:=$(FPC) $(FPCOPT)
|
||||
ifeq (,$(findstring -s ,$(COMPILER)))
|
||||
override COMPILER:=$(strip $(FPC) $(FPCOPT))
|
||||
ifneq (,$(findstring -sh ,$(COMPILER)))
|
||||
UseEXECPPAS=1
|
||||
endif
|
||||
ifneq (,$(findstring -s ,$(COMPILER)))
|
||||
ifeq ($(FULL_SOURCE),$(FULL_TARGET))
|
||||
UseEXECPPAS=1
|
||||
endif
|
||||
endif
|
||||
ifneq ($(UseEXECPPAS),1)
|
||||
EXECPPAS=
|
||||
else
|
||||
ifeq ($(FULL_SOURCE),$(FULL_TARGET))
|
||||
ifdef RUNBATCH
|
||||
EXECPPAS:=@$(RUNBATCH) $(PPAS)
|
||||
else
|
||||
EXECPPAS:=@$(PPAS)
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
.PHONY: fpc_exes
|
||||
ifndef CROSSINSTALL
|
||||
ifneq ($(TARGET_PROGRAMS),)
|
||||
@ -1588,7 +1807,7 @@ endif
|
||||
fpc_sourceinstall: distclean
|
||||
$(MKDIR) $(INSTALL_SOURCEDIR)
|
||||
$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
|
||||
fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
|
||||
fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
|
||||
ifdef HASEXAMPLES
|
||||
$(MKDIR) $(INSTALL_EXAMPLEDIR)
|
||||
endif
|
||||
@ -1674,6 +1893,10 @@ endif
|
||||
ifdef DEBUGSYMEXT
|
||||
-$(DEL) *$(DEBUGSYMEXT)
|
||||
endif
|
||||
ifdef LOCALFPMAKEBIN
|
||||
-$(DEL) $(LOCALFPMAKEBIN)
|
||||
-$(DEL) $(FPMAKEBINOBJ)
|
||||
endif
|
||||
fpc_distclean: cleanall
|
||||
.PHONY: fpc_baseinfo
|
||||
override INFORULES+=fpc_baseinfo
|
||||
|
@ -24,7 +24,7 @@ programs=dbdigest dbconfig
|
||||
[prerules]
|
||||
|
||||
ifneq ($(findstring dosbox_wrapper,$(EMULATOR)),)
|
||||
MSDOSPROG=dosbox/dosbox_wrapper$(SRCEXEEXT)
|
||||
MSDOSPROG=dosbox/dosbox_wrapper
|
||||
else
|
||||
MSDOSPROG=
|
||||
endif
|
||||
|
Loading…
Reference in New Issue
Block a user