paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-14 20:09:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

* os_source,os_target depends now on the compiler

Browse Source 
* cpu depends on the compiler
  * datestr y2k proof
This commit is contained in:
peter 1999-05-03 22:29:04 +00:00
parent d58b3fbdee
commit 5d32649b29
1 changed files with 25 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
base/makefile.fpc
View File

@ -35,11 +35,11 @@ ifeq ($(PWD),)
PWD=$(strip $(wildcard $(addsuffix /pwd,$(subst :, ,$(PATH))))) PWD=$(strip $(wildcard $(addsuffix /pwd,$(subst :, ,$(PATH)))))
ifeq ($(PWD),) ifeq ($(PWD),)
nopwd: nopwd:
@echo You need the GNU pwd,cp,mv,rm,install utils to use this makefile! @echo You need the GNU utils package to use this makefile!
@echo Get ftp://tflily.fys.kuleuven.ac.be/pub/fpc/dist/gnuutils.zip @echo Get ftp://tflily.fys.kuleuven.ac.be/pub/fpc/dist/go32v2/utilgo32.zip
@exit @exit
else else
inlinux=1 inlinux=1
endif endif
else else
PWD:=$(firstword $(PWD)) PWD:=$(firstword $(PWD))
@ -52,6 +52,13 @@ inWinNT=1
endif endif
endif endif
# The extension of executables
ifdef inlinux
EXEEXT=
else
EXEEXT=.exe
endif
##################################################################### #####################################################################
# Check for FPCDIR environment # Check for FPCDIR environment
@ -70,35 +77,24 @@ endif
# Targets # Targets
##################################################################### #####################################################################
# What compiler to use ?
ifndef PP
PP=ppc386$(EXEEXT)
endif
# Target OS # Target OS
ifndef OS_TARGET ifndef OS_TARGET
ifdef inlinux OS_TARGET=$(shell $(PP) -iTO)
OS_TARGET=linux
else
ifdef inWinNT
OS_TARGET=win32
else
OS_TARGET=go32v2
endif
endif
endif endif
# Source OS # Source OS
ifndef OS_SOURCE ifndef OS_SOURCE
ifdef inlinux OS_SOURCE=$(shell $(PP) -iSO)
OS_SOURCE=linux
else
ifndef inWinNT
OS_SOURCE=win32
else
OS_SOURCE=go32v2
endif
endif
endif endif
# CPU # CPU
ifndef CPU ifndef CPU
CPU=i386 CPU=$(shell $(PP) -TP)
endif endif
# Options # Options
@ -106,11 +102,6 @@ ifndef OPT
OPT= OPT=
endif endif
# What compiler to use ?
ifndef PP
PP=ppc386
endif
# assembler, redefine it if cross compiling # assembler, redefine it if cross compiling
ifndef AS ifndef AS
AS=as AS=as
@ -199,13 +190,6 @@ else
PPAS=ppas.bat PPAS=ppas.bat
endif endif
# The extension of executables
ifdef inlinux
EXEEXT=
else
EXEEXT=.exe
endif
# The path which is search separated by spaces # The path which is search separated by spaces
ifdef inlinux ifdef inlinux
SEARCHPATH=$(subst :, ,$(PATH)) SEARCHPATH=$(subst :, ,$(PATH))
@ -654,7 +638,7 @@ EXECPPAS=@$(PPAS)
endif endif
ifdef DATE ifdef DATE
DATESTR=$(shell $(DATE) +%y%m%d) DATESTR=$(shell $(DATE) +%Y%m%d)
else else
DATESTR= DATESTR=
endif endif
@ -1006,7 +990,12 @@ endif
# #
# $Log$ # $Log$
# Revision 1.19 1999-05-03 18:04:58 peter # Revision 1.20 1999-05-03 22:29:04 peter
# * os_source,os_target depends now on the compiler
# * cpu depends on the compiler
# * datestr y2k proof
#
# Revision 1.19 1999/05/03 18:04:58 peter
# + sourceinstalldir # + sourceinstalldir
# #
# Revision 1.18 1999/04/29 15:52:38 peter # Revision 1.18 1999/04/29 15:52:38 peter