From 3aa9e60885e95e441dafcb81bc034147b66b404b Mon Sep 17 00:00:00 2001 From: vincents Date: Tue, 14 Nov 2006 20:18:54 +0000 Subject: [PATCH] ide: lowercase {$I %fpctargetos%}, so it can be used for directories git-svn-id: trunk@10200 - --- components/cgi/ide/Makefile | 33 +++++++++++++++++++++--- components/cgi/ide/Makefile.fpc | 4 +++ components/fpcunit/Makefile | 8 ++++-- components/fpcunit/Makefile.fpc | 4 +++ components/fpcunit/ide/Makefile | 33 +++++++++++++++++++++--- components/fpcunit/ide/Makefile.fpc | 4 +++ components/memds/Makefile | 33 +++++++++++++++++++++--- components/memds/Makefile.fpc | 4 +++ components/projecttemplates/Makefile | 33 +++++++++++++++++++++--- components/projecttemplates/Makefile.fpc | 4 +++ components/tdbf/Makefile | 33 +++++++++++++++++++++--- components/tdbf/Makefile.fpc | 4 +++ ide/buildlazdialog.pas | 4 +-- ide/lazconf.pp | 4 +-- 14 files changed, 184 insertions(+), 21 deletions(-) diff --git a/components/cgi/ide/Makefile b/components/cgi/ide/Makefile index ad7384614e..fe1cd59c83 100644 --- a/components/cgi/ide/Makefile +++ b/components/cgi/ide/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/04/28] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/07/18] # 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 m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-palmos arm-wince powerpc64-linux +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 m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-palmos arm-wince arm-gba powerpc64-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom @@ -235,9 +235,13 @@ ifndef LCL_PLATFORM ifeq ($(OS_TARGET),win32) LCL_PLATFORM=win32 else +ifeq ($(OS_TARGET),win64) +LCL_PLATFORM=win32 +else LCL_PLATFORM=gtk endif endif +endif export LCL_PLATFORM ifeq ($(FULL_TARGET),i386-linux) override TARGET_UNITS+=cgilazide.pas @@ -353,6 +357,9 @@ endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=cgilazide.pas endif +ifeq ($(FULL_TARGET),arm-gba) +override TARGET_UNITS+=cgilazide.pas +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=cgilazide.pas endif @@ -470,6 +477,9 @@ endif ifeq ($(FULL_TARGET),arm-wince) override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) endif +ifeq ($(FULL_TARGET),arm-gba) +override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) endif @@ -587,6 +597,9 @@ endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl endif +ifeq ($(FULL_TARGET),arm-gba) +override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl endif @@ -704,6 +717,9 @@ endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ endif +ifeq ($(FULL_TARGET),arm-gba) +override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_UNITDIR+=../lib/$(CPU_TARGET)-$(OS_TARGET)/ ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ endif @@ -821,6 +837,9 @@ endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) endif +ifeq ($(FULL_TARGET),arm-gba) +override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) endif @@ -1145,6 +1164,11 @@ EXEEXT= HASSHAREDLIB=1 SHORTSUFFIX=dwn endif +ifeq ($(OS_TARGET),gba) +EXEEXT=.gba +SHAREDLIBEXT=.so +SHORTSUFFIX=gba +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1677,6 +1701,9 @@ endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),arm-gba) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1757,7 +1784,7 @@ ifeq ($(CPU_TARGET),powerpc) FPCCPUOPT:=-O1r endif else -FPCCPUOPT:=-O2 +FPCCPUOPT:=-O1r endif override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n override FPCOPTDEF+=RELEASE diff --git a/components/cgi/ide/Makefile.fpc b/components/cgi/ide/Makefile.fpc index 485b808b4d..d8f0290282 100644 --- a/components/cgi/ide/Makefile.fpc +++ b/components/cgi/ide/Makefile.fpc @@ -24,9 +24,13 @@ ifndef LCL_PLATFORM ifeq ($(OS_TARGET),win32) LCL_PLATFORM=win32 else +ifeq ($(OS_TARGET),win64) +LCL_PLATFORM=win32 +else LCL_PLATFORM=gtk endif endif +endif export LCL_PLATFORM [rules] diff --git a/components/fpcunit/Makefile b/components/fpcunit/Makefile index 3b3e4d6900..0c2e2b7a83 100644 --- a/components/fpcunit/Makefile +++ b/components/fpcunit/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/06/29] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/07/18] # 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 m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-palmos arm-wince arm-gba powerpc64-linux @@ -235,9 +235,13 @@ ifndef LCL_PLATFORM ifeq ($(OS_TARGET),win32) LCL_PLATFORM=win32 else +ifeq ($(OS_TARGET),win64) +LCL_PLATFORM=win32 +else LCL_PLATFORM=gtk endif endif +endif export LCL_PLATFORM ifeq ($(FULL_TARGET),i386-linux) override TARGET_UNITS+=fpcunittestrunner.pas @@ -1780,7 +1784,7 @@ ifeq ($(CPU_TARGET),powerpc) FPCCPUOPT:=-O1r endif else -FPCCPUOPT:=-O2 +FPCCPUOPT:=-O1r endif override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n override FPCOPTDEF+=RELEASE diff --git a/components/fpcunit/Makefile.fpc b/components/fpcunit/Makefile.fpc index 84a56439e0..82876f8b1a 100644 --- a/components/fpcunit/Makefile.fpc +++ b/components/fpcunit/Makefile.fpc @@ -24,9 +24,13 @@ ifndef LCL_PLATFORM ifeq ($(OS_TARGET),win32) LCL_PLATFORM=win32 else +ifeq ($(OS_TARGET),win64) +LCL_PLATFORM=win32 +else LCL_PLATFORM=gtk endif endif +endif export LCL_PLATFORM [rules] diff --git a/components/fpcunit/ide/Makefile b/components/fpcunit/ide/Makefile index e522b6bb28..f8d3ca75d4 100644 --- a/components/fpcunit/ide/Makefile +++ b/components/fpcunit/ide/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/04/28] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/07/18] # 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 m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-palmos arm-wince powerpc64-linux +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 m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-palmos arm-wince arm-gba powerpc64-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom @@ -235,9 +235,13 @@ ifndef LCL_PLATFORM ifeq ($(OS_TARGET),win32) LCL_PLATFORM=win32 else +ifeq ($(OS_TARGET),win64) +LCL_PLATFORM=win32 +else LCL_PLATFORM=gtk endif endif +endif export LCL_PLATFORM ifeq ($(FULL_TARGET),i386-linux) override TARGET_UNITS+=fpcunitide.pas @@ -353,6 +357,9 @@ endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=fpcunitide.pas endif +ifeq ($(FULL_TARGET),arm-gba) +override TARGET_UNITS+=fpcunitide.pas +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=fpcunitide.pas endif @@ -470,6 +477,9 @@ endif ifeq ($(FULL_TARGET),arm-wince) override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) endif +ifeq ($(FULL_TARGET),arm-gba) +override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) endif @@ -587,6 +597,9 @@ endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl endif +ifeq ($(FULL_TARGET),arm-gba) +override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl endif @@ -704,6 +717,9 @@ endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_UNITDIR+=../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ endif +ifeq ($(FULL_TARGET),arm-gba) +override COMPILER_UNITDIR+=../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_UNITDIR+=../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ endif @@ -821,6 +837,9 @@ endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) endif +ifeq ($(FULL_TARGET),arm-gba) +override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) endif @@ -1145,6 +1164,11 @@ EXEEXT= HASSHAREDLIB=1 SHORTSUFFIX=dwn endif +ifeq ($(OS_TARGET),gba) +EXEEXT=.gba +SHAREDLIBEXT=.so +SHORTSUFFIX=gba +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1677,6 +1701,9 @@ endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),arm-gba) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1757,7 +1784,7 @@ ifeq ($(CPU_TARGET),powerpc) FPCCPUOPT:=-O1r endif else -FPCCPUOPT:=-O2 +FPCCPUOPT:=-O1r endif override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n override FPCOPTDEF+=RELEASE diff --git a/components/fpcunit/ide/Makefile.fpc b/components/fpcunit/ide/Makefile.fpc index f2713cb443..f23777d0fe 100644 --- a/components/fpcunit/ide/Makefile.fpc +++ b/components/fpcunit/ide/Makefile.fpc @@ -24,9 +24,13 @@ ifndef LCL_PLATFORM ifeq ($(OS_TARGET),win32) LCL_PLATFORM=win32 else +ifeq ($(OS_TARGET),win64) +LCL_PLATFORM=win32 +else LCL_PLATFORM=gtk endif endif +endif export LCL_PLATFORM [rules] diff --git a/components/memds/Makefile b/components/memds/Makefile index 666af2362a..37e90fbffa 100644 --- a/components/memds/Makefile +++ b/components/memds/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/04/28] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/07/18] # 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 m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-palmos arm-wince powerpc64-linux +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 m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-palmos arm-wince arm-gba powerpc64-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom @@ -235,9 +235,13 @@ ifndef LCL_PLATFORM ifeq ($(OS_TARGET),win32) LCL_PLATFORM=win32 else +ifeq ($(OS_TARGET),win64) +LCL_PLATFORM=win32 +else LCL_PLATFORM=gtk endif endif +endif export LCL_PLATFORM ifeq ($(FULL_TARGET),i386-linux) override TARGET_UNITS+=memdslaz.pas @@ -353,6 +357,9 @@ endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=memdslaz.pas endif +ifeq ($(FULL_TARGET),arm-gba) +override TARGET_UNITS+=memdslaz.pas +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=memdslaz.pas endif @@ -470,6 +477,9 @@ endif ifeq ($(FULL_TARGET),arm-wince) override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) endif +ifeq ($(FULL_TARGET),arm-gba) +override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) endif @@ -587,6 +597,9 @@ endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl endif +ifeq ($(FULL_TARGET),arm-gba) +override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl endif @@ -704,6 +717,9 @@ endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_UNITDIR+=../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ endif +ifeq ($(FULL_TARGET),arm-gba) +override COMPILER_UNITDIR+=../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_UNITDIR+=../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ endif @@ -821,6 +837,9 @@ endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) endif +ifeq ($(FULL_TARGET),arm-gba) +override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) endif @@ -1145,6 +1164,11 @@ EXEEXT= HASSHAREDLIB=1 SHORTSUFFIX=dwn endif +ifeq ($(OS_TARGET),gba) +EXEEXT=.gba +SHAREDLIBEXT=.so +SHORTSUFFIX=gba +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1677,6 +1701,9 @@ endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),arm-gba) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1757,7 +1784,7 @@ ifeq ($(CPU_TARGET),powerpc) FPCCPUOPT:=-O1r endif else -FPCCPUOPT:=-O2 +FPCCPUOPT:=-O1r endif override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n override FPCOPTDEF+=RELEASE diff --git a/components/memds/Makefile.fpc b/components/memds/Makefile.fpc index 5b49ed42e7..d4604d50a8 100644 --- a/components/memds/Makefile.fpc +++ b/components/memds/Makefile.fpc @@ -24,9 +24,13 @@ ifndef LCL_PLATFORM ifeq ($(OS_TARGET),win32) LCL_PLATFORM=win32 else +ifeq ($(OS_TARGET),win64) +LCL_PLATFORM=win32 +else LCL_PLATFORM=gtk endif endif +endif export LCL_PLATFORM [rules] diff --git a/components/projecttemplates/Makefile b/components/projecttemplates/Makefile index 3dcc9a3fef..ada031c1e1 100644 --- a/components/projecttemplates/Makefile +++ b/components/projecttemplates/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/04/28] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/07/18] # 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 m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-palmos arm-wince powerpc64-linux +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 m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-palmos arm-wince arm-gba powerpc64-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom @@ -235,9 +235,13 @@ ifndef LCL_PLATFORM ifeq ($(OS_TARGET),win32) LCL_PLATFORM=win32 else +ifeq ($(OS_TARGET),win64) +LCL_PLATFORM=win32 +else LCL_PLATFORM=gtk endif endif +endif export LCL_PLATFORM ifeq ($(FULL_TARGET),i386-linux) override TARGET_UNITS+=projtemplates.pas @@ -353,6 +357,9 @@ endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=projtemplates.pas endif +ifeq ($(FULL_TARGET),arm-gba) +override TARGET_UNITS+=projtemplates.pas +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=projtemplates.pas endif @@ -470,6 +477,9 @@ endif ifeq ($(FULL_TARGET),arm-wince) override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) endif +ifeq ($(FULL_TARGET),arm-gba) +override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) endif @@ -587,6 +597,9 @@ endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl endif +ifeq ($(FULL_TARGET),arm-gba) +override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl endif @@ -704,6 +717,9 @@ endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_UNITDIR+=../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ endif +ifeq ($(FULL_TARGET),arm-gba) +override COMPILER_UNITDIR+=../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_UNITDIR+=../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ endif @@ -821,6 +837,9 @@ endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) endif +ifeq ($(FULL_TARGET),arm-gba) +override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) endif @@ -1145,6 +1164,11 @@ EXEEXT= HASSHAREDLIB=1 SHORTSUFFIX=dwn endif +ifeq ($(OS_TARGET),gba) +EXEEXT=.gba +SHAREDLIBEXT=.so +SHORTSUFFIX=gba +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1677,6 +1701,9 @@ endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),arm-gba) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1757,7 +1784,7 @@ ifeq ($(CPU_TARGET),powerpc) FPCCPUOPT:=-O1r endif else -FPCCPUOPT:=-O2 +FPCCPUOPT:=-O1r endif override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n override FPCOPTDEF+=RELEASE diff --git a/components/projecttemplates/Makefile.fpc b/components/projecttemplates/Makefile.fpc index 723e489a99..cc4d8d5105 100644 --- a/components/projecttemplates/Makefile.fpc +++ b/components/projecttemplates/Makefile.fpc @@ -24,9 +24,13 @@ ifndef LCL_PLATFORM ifeq ($(OS_TARGET),win32) LCL_PLATFORM=win32 else +ifeq ($(OS_TARGET),win64) +LCL_PLATFORM=win32 +else LCL_PLATFORM=gtk endif endif +endif export LCL_PLATFORM [rules] diff --git a/components/tdbf/Makefile b/components/tdbf/Makefile index 1b39346f98..8f86029fad 100644 --- a/components/tdbf/Makefile +++ b/components/tdbf/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/04/28] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/07/18] # 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 m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-palmos arm-wince powerpc64-linux +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 m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-palmos arm-wince arm-gba powerpc64-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom @@ -235,9 +235,13 @@ ifndef LCL_PLATFORM ifeq ($(OS_TARGET),win32) LCL_PLATFORM=win32 else +ifeq ($(OS_TARGET),win64) +LCL_PLATFORM=win32 +else LCL_PLATFORM=gtk endif endif +endif export LCL_PLATFORM ifeq ($(FULL_TARGET),i386-linux) override TARGET_UNITS+=dbflaz.pas @@ -353,6 +357,9 @@ endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=dbflaz.pas endif +ifeq ($(FULL_TARGET),arm-gba) +override TARGET_UNITS+=dbflaz.pas +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=dbflaz.pas endif @@ -470,6 +477,9 @@ endif ifeq ($(FULL_TARGET),arm-wince) override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) endif +ifeq ($(FULL_TARGET),arm-gba) +override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) endif @@ -587,6 +597,9 @@ endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl endif +ifeq ($(FULL_TARGET),arm-gba) +override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl endif @@ -704,6 +717,9 @@ endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_UNITDIR+=../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ endif +ifeq ($(FULL_TARGET),arm-gba) +override COMPILER_UNITDIR+=../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_UNITDIR+=../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ endif @@ -821,6 +837,9 @@ endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) endif +ifeq ($(FULL_TARGET),arm-gba) +override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) endif @@ -1145,6 +1164,11 @@ EXEEXT= HASSHAREDLIB=1 SHORTSUFFIX=dwn endif +ifeq ($(OS_TARGET),gba) +EXEEXT=.gba +SHAREDLIBEXT=.so +SHORTSUFFIX=gba +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -1677,6 +1701,9 @@ endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),arm-gba) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -1757,7 +1784,7 @@ ifeq ($(CPU_TARGET),powerpc) FPCCPUOPT:=-O1r endif else -FPCCPUOPT:=-O2 +FPCCPUOPT:=-O1r endif override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n override FPCOPTDEF+=RELEASE diff --git a/components/tdbf/Makefile.fpc b/components/tdbf/Makefile.fpc index 855f6ecf1d..f6018d8002 100644 --- a/components/tdbf/Makefile.fpc +++ b/components/tdbf/Makefile.fpc @@ -24,9 +24,13 @@ ifndef LCL_PLATFORM ifeq ($(OS_TARGET),win32) LCL_PLATFORM=win32 else +ifeq ($(OS_TARGET),win64) +LCL_PLATFORM=win32 +else LCL_PLATFORM=gtk endif endif +endif export LCL_PLATFORM [rules] diff --git a/ide/buildlazdialog.pas b/ide/buildlazdialog.pas index 544a1d981a..2aed3e9891 100644 --- a/ide/buildlazdialog.pas +++ b/ide/buildlazdialog.pas @@ -492,8 +492,8 @@ begin // no user defined target directory // => find it automatically - DefaultTargetOS:={$I %FPCTARGETOS%}; - DefaultTargetCPU:={$I %FPCTARGETCPU%}; + DefaultTargetOS:=GetDefaultTargetOS; + DefaultTargetCPU:=GetDefaultTargetCPU; if ((Options.TargetOS<>'') and (CompareText(Options.TargetOS,DefaultTargetOS)<>0)) or ((Options.TargetCPU<>'') diff --git a/ide/lazconf.pp b/ide/lazconf.pp index 93772733b3..dbd84ec492 100644 --- a/ide/lazconf.pp +++ b/ide/lazconf.pp @@ -217,12 +217,12 @@ end; function GetDefaultTargetOS: string; begin - Result:={$I %FPCTARGETOS%}; + Result:=lowerCase({$I %FPCTARGETOS%}); end; function GetDefaultTargetCPU: string; begin - Result:={$I %FPCTARGETCPU%}; + Result:=lowerCase({$I %FPCTARGETCPU%}); end; function GetDefaultCompilerFilename: string;