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

* adapt to DEFAULT_TARGET_CPU/OS

Browse Source 
* try to handle cygwin shells
This commit is contained in:
pierre 2002-09-27 06:59:49 +00:00
parent a788bb6f3a
commit 4cadc22889
3 changed files with 1910 additions and 1805 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
utils/fpcm/Makefile
View File

@ -1,5 +1,5 @@
#
# Don't edit, this file is generated by FPCMake Version 1.1 [2002/08/01]
# Don't edit, this file is generated by FPCMake Version 1.1 [2002/09/10]
#
default: all
MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx
@ -58,6 +58,9 @@ ifdef inUnix
PATHSEP=/
else
PATHSEP:=$(subst /,\,/)
ifneq ($(findstring sh.exe,$(SHELL)),)
PATHSEP=/
endif
endif
ifdef PWD
BASEDIR:=$(subst \,/,$(shell $(PWD)))
@ -1326,6 +1329,7 @@ fpc_baseinfo:
@$(ECHO) Rm........ $(RMPROG)
@$(ECHO) GInstall.. $(GINSTALL)
@$(ECHO) Echo...... $(ECHO)
@$(ECHO) Shell..... $(SHELL)
@$(ECHO) Date...... $(DATE)
@$(ECHO) FPCMake... $(FPCMAKE)
@$(ECHO) PPUMove... $(PPUMOVE)

3689
utils/fpcm/fpcmake.inc
View File

File diff suppressed because it is too large Load Diff

20
utils/fpcm/fpcmake.ini
View File

@ -86,6 +86,10 @@ ifdef inUnix
PATHSEP=/
else
PATHSEP:=$(subst /,\,/)
# cygwin bash or sh can not handle backslashs
ifneq ($(findstring sh.exe,$(SHELL)),)
PATHSEP=/
endif
endif
# Base dir
@ -210,6 +214,21 @@ endif
endif
# Fall back to default values if needed
ifndef CPU_TARGET
ifdef CPU_TARGET_DEFAULT
CPU_TARGET=$(CPU_TARGET_DEFAULT)
endif
endif
ifndef OS_TARGET
ifdef OS_TARGET_DEFAULT
OS_TARGET=$(OS_TARGET_DEFAULT)
endif
endif
# Full name of the target, including CPU and OS
FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)
@ -1581,6 +1600,7 @@ fpc_baseinfo:
@$(ECHO) Rm........ $(RMPROG)
@$(ECHO) GInstall.. $(GINSTALL)
@$(ECHO) Echo...... $(ECHO)
@$(ECHO) Shell..... $(SHELL)
@$(ECHO) Date...... $(DATE)
@$(ECHO) FPCMake... $(FPCMAKE)
@$(ECHO) PPUMove... $(PPUMOVE)