mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-04-26 09:59:10 +02:00
IDE: prefer ' over " in Makefile and make commands, " is not handled well on windows 98
git-svn-id: trunk@15274 -
This commit is contained in:
vincents
parent
90fb54104d
commit
feea28fc55
46
ide/Makefile
46
ide/Makefile
@ -1,8 +1,8 @@
|
||||
#
|
||||
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/06]
|
||||
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/29]
|
||||
#
|
||||
default: all
|
||||
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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
|
||||
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
|
||||
BSDs = freebsd netbsd openbsd darwin
|
||||
UNIXs = linux $(BSDs) solaris qnx
|
||||
LIMIT83fs = go32v2 os2 emx watcom
|
||||
@ -184,9 +184,15 @@ else
|
||||
TARGETSUFFIX=$(FULL_TARGET)
|
||||
SOURCESUFFIX=$(FULL_SOURCE)
|
||||
endif
|
||||
ifeq ($(OS_TARGET),darwin)
|
||||
ifneq ($(OS_SOURCE),darwin)
|
||||
CROSSCOMPILE=1
|
||||
endif
|
||||
else
|
||||
ifneq ($(FULL_TARGET),$(FULL_SOURCE))
|
||||
CROSSCOMPILE=1
|
||||
endif
|
||||
endif
|
||||
ifeq ($(findstring makefile,$(MAKECMDGOALS)),)
|
||||
ifeq ($(findstring $(FULL_TARGET),$(MAKEFILETARGETS)),)
|
||||
$(error The Makefile doesn't support target $(FULL_TARGET), please run fpcmake first)
|
||||
@ -313,6 +319,9 @@ endif
|
||||
ifeq ($(FULL_TARGET),i386-beos)
|
||||
override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-haiku)
|
||||
override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-netbsd)
|
||||
override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
|
||||
endif
|
||||
@ -484,6 +493,9 @@ endif
|
||||
ifeq ($(FULL_TARGET),i386-beos)
|
||||
override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard ../designer/*$(OEXT)) $(wildcard ../designer/*$(PPUEXT)) $(wildcard ../debugger/*$(OEXT)) $(wildcard ../debugger/*$(PPUEXT)) $(wildcard ../converter/*$(OEXT)) $(wildcard ../converter/*$(PPUEXT)) $(wildcard ../packager/*$(OEXT)) $(wildcard ../packager/*$(PPUEXT)) $(wildcard ../*$(OEXT)) $(wildcard ../*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-haiku)
|
||||
override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard ../designer/*$(OEXT)) $(wildcard ../designer/*$(PPUEXT)) $(wildcard ../debugger/*$(OEXT)) $(wildcard ../debugger/*$(PPUEXT)) $(wildcard ../converter/*$(OEXT)) $(wildcard ../converter/*$(PPUEXT)) $(wildcard ../packager/*$(OEXT)) $(wildcard ../packager/*$(PPUEXT)) $(wildcard ../*$(OEXT)) $(wildcard ../*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-netbsd)
|
||||
override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard ../designer/*$(OEXT)) $(wildcard ../designer/*$(PPUEXT)) $(wildcard ../debugger/*$(OEXT)) $(wildcard ../debugger/*$(PPUEXT)) $(wildcard ../converter/*$(OEXT)) $(wildcard ../converter/*$(PPUEXT)) $(wildcard ../packager/*$(OEXT)) $(wildcard ../packager/*$(PPUEXT)) $(wildcard ../*$(OEXT)) $(wildcard ../*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
|
||||
endif
|
||||
@ -658,6 +670,9 @@ endif
|
||||
ifeq ($(FULL_TARGET),i386-beos)
|
||||
override COMPILER_OPTIONS+=-gl
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-haiku)
|
||||
override COMPILER_OPTIONS+=-gl
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-netbsd)
|
||||
override COMPILER_OPTIONS+=-gl
|
||||
endif
|
||||
@ -829,6 +844,9 @@ endif
|
||||
ifeq ($(FULL_TARGET),i386-beos)
|
||||
override COMPILER_INCLUDEDIR+=include include/$(OS_TARGET) ../images
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-haiku)
|
||||
override COMPILER_INCLUDEDIR+=include include/$(OS_TARGET) ../images
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-netbsd)
|
||||
override COMPILER_INCLUDEDIR+=include include/$(OS_TARGET) ../images
|
||||
endif
|
||||
@ -1000,6 +1018,9 @@ endif
|
||||
ifeq ($(FULL_TARGET),i386-beos)
|
||||
override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/custom ../components/mpaslex ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../designer ../designer/jitform/units/$(CPU_TARGET)-$(OS_TARGET) ../debugger ../converter ../packager ../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-haiku)
|
||||
override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/custom ../components/mpaslex ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../designer ../designer/jitform/units/$(CPU_TARGET)-$(OS_TARGET) ../debugger ../converter ../packager ../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-netbsd)
|
||||
override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/custom ../components/mpaslex ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../designer ../designer/jitform/units/$(CPU_TARGET)-$(OS_TARGET) ../debugger ../converter ../packager ../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../units/$(CPU_TARGET)-$(OS_TARGET) .
|
||||
endif
|
||||
@ -1171,6 +1192,9 @@ endif
|
||||
ifeq ($(FULL_TARGET),i386-beos)
|
||||
override COMPILER_TARGETDIR+=..
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-haiku)
|
||||
override COMPILER_TARGETDIR+=..
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-netbsd)
|
||||
override COMPILER_TARGETDIR+=..
|
||||
endif
|
||||
@ -1342,6 +1366,9 @@ endif
|
||||
ifeq ($(FULL_TARGET),i386-beos)
|
||||
override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-haiku)
|
||||
override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-netbsd)
|
||||
override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
|
||||
endif
|
||||
@ -1815,6 +1842,11 @@ BATCHEXT=.sh
|
||||
EXEEXT=
|
||||
SHORTSUFFIX=be
|
||||
endif
|
||||
ifeq ($(OS_TARGET),haiku)
|
||||
BATCHEXT=.sh
|
||||
EXEEXT=
|
||||
SHORTSUFFIX=hai
|
||||
endif
|
||||
ifeq ($(OS_TARGET),solaris)
|
||||
BATCHEXT=.sh
|
||||
EXEEXT=
|
||||
@ -2298,6 +2330,10 @@ ifeq ($(FULL_TARGET),i386-beos)
|
||||
REQUIRE_PACKAGES_RTL=1
|
||||
REQUIRE_PACKAGES_REGEXPR=1
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-haiku)
|
||||
REQUIRE_PACKAGES_RTL=1
|
||||
REQUIRE_PACKAGES_REGEXPR=1
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-netbsd)
|
||||
REQUIRE_PACKAGES_RTL=1
|
||||
REQUIRE_PACKAGES_REGEXPR=1
|
||||
@ -3178,13 +3214,13 @@ ide: $(COMPILER_UNITTARGETDIR) revisioninc codepage
|
||||
ifeq ($(LAZARUS_OPT),)
|
||||
$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT)
|
||||
else
|
||||
$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT="$(LAZARUS_OPT) $(OPT)"
|
||||
$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(LAZARUS_OPT) $(OPT)'
|
||||
endif
|
||||
idepkg: $(COMPILER_UNITTARGETDIR)
|
||||
$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT="$(LAZARUS_OPT) $(OPT) @$(LAZARUS_IDE_CONFIG)"
|
||||
$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(LAZARUS_OPT) $(OPT) @$(LAZARUS_IDE_CONFIG)'
|
||||
bigide: $(COMPILER_UNITTARGETDIR) revisioninc
|
||||
-$(DEL) $(COMPILER_UNITTARGETDIR)/pkgmanager$(PPUEXT)
|
||||
$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT="$(OPT) $(BIG_IDE_OPTIONS)"
|
||||
$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(OPT) $(BIG_IDE_OPTIONS)'
|
||||
starter: $(COMPILER_UNITTARGETDIR)
|
||||
ifeq ($(LAZARUS_OPT),)
|
||||
$(MAKE) --assume-new=startlazarus.lpr startlazarus$(EXEEXT)
|
||||
|
||||
@ -141,17 +141,17 @@ ide: $(COMPILER_UNITTARGETDIR) revisioninc codepage
|
||||
ifeq ($(LAZARUS_OPT),)
|
||||
$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT)
|
||||
else
|
||||
$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT="$(LAZARUS_OPT) $(OPT)"
|
||||
$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(LAZARUS_OPT) $(OPT)'
|
||||
endif
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
idepkg: $(COMPILER_UNITTARGETDIR)
|
||||
$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT="$(LAZARUS_OPT) $(OPT) @$(LAZARUS_IDE_CONFIG)"
|
||||
$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(LAZARUS_OPT) $(OPT) @$(LAZARUS_IDE_CONFIG)'
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
bigide: $(COMPILER_UNITTARGETDIR) revisioninc
|
||||
-$(DEL) $(COMPILER_UNITTARGETDIR)/pkgmanager$(PPUEXT)
|
||||
$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT="$(OPT) $(BIG_IDE_OPTIONS)"
|
||||
$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(OPT) $(BIG_IDE_OPTIONS)'
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
starter: $(COMPILER_UNITTARGETDIR)
|
||||
|
||||
@ -546,7 +546,7 @@ begin
|
||||
MakeIDECfgFilename:=GetMakeIDEConfigFilename;
|
||||
if (FileExists(MakeIDECfgFilename)) then begin
|
||||
if pos(' ', MakeIDECfgFilename)>0 then
|
||||
ExtraOptions:='@'''+MakeIDECfgFilename+''''
|
||||
ExtraOptions:='@"'+MakeIDECfgFilename+'"'
|
||||
else
|
||||
ExtraOptions:='@'+MakeIDECfgFilename;
|
||||
exit;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user