diff options
author | yury <yury@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2013-01-17 11:36:12 +0000 |
---|---|---|
committer | yury <yury@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2013-01-17 11:36:12 +0000 |
commit | 0fc4f9aa278aa497f281faf70b25c65d9209b8b5 (patch) | |
tree | 2fea6316af1094660cd443d0d9d464c4af7b83b4 /packages/gtk1 | |
parent | 844222d4baabff80b2c51c92dea67ac443fde59e (diff) | |
download | fpc-0fc4f9aa278aa497f281faf70b25c65d9209b8b5.tar.gz |
* Regenerated all makefiles.
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/targetandroid@23422 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'packages/gtk1')
-rw-r--r-- | packages/gtk1/Makefile | 120 | ||||
-rw-r--r-- | packages/gtk1/examples/Makefile | 123 | ||||
-rw-r--r-- | packages/gtk1/examples/tutorial/Makefile | 75 | ||||
-rw-r--r-- | packages/gtk1/src/gtkgl/Makefile | 99 |
4 files changed, 300 insertions, 117 deletions
diff --git a/packages/gtk1/Makefile b/packages/gtk1/Makefile index f38c13c219..a120daa0f5 100644 --- a/packages/gtk1/Makefile +++ b/packages/gtk1/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/11/11] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 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 arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android +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 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 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 jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -541,6 +541,14 @@ 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= @@ -676,12 +684,14 @@ 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 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1078,6 +1088,13 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1337,6 +1354,13 @@ REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2099,96 +2123,6 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifdef TARGET_DIRS_TARGET_DIRS -TARGET_DIRS_all: - $(MAKE) -C TARGET_DIRS all -TARGET_DIRS_debug: - $(MAKE) -C TARGET_DIRS debug -TARGET_DIRS_smart: - $(MAKE) -C TARGET_DIRS smart -TARGET_DIRS_release: - $(MAKE) -C TARGET_DIRS release -TARGET_DIRS_units: - $(MAKE) -C TARGET_DIRS units -TARGET_DIRS_examples: - $(MAKE) -C TARGET_DIRS examples -TARGET_DIRS_shared: - $(MAKE) -C TARGET_DIRS shared -TARGET_DIRS_install: - $(MAKE) -C TARGET_DIRS install -TARGET_DIRS_sourceinstall: - $(MAKE) -C TARGET_DIRS sourceinstall -TARGET_DIRS_exampleinstall: - $(MAKE) -C TARGET_DIRS exampleinstall -TARGET_DIRS_distinstall: - $(MAKE) -C TARGET_DIRS distinstall -TARGET_DIRS_zipinstall: - $(MAKE) -C TARGET_DIRS zipinstall -TARGET_DIRS_zipsourceinstall: - $(MAKE) -C TARGET_DIRS zipsourceinstall -TARGET_DIRS_zipexampleinstall: - $(MAKE) -C TARGET_DIRS zipexampleinstall -TARGET_DIRS_zipdistinstall: - $(MAKE) -C TARGET_DIRS zipdistinstall -TARGET_DIRS_clean: - $(MAKE) -C TARGET_DIRS clean -TARGET_DIRS_distclean: - $(MAKE) -C TARGET_DIRS distclean -TARGET_DIRS_cleanall: - $(MAKE) -C TARGET_DIRS cleanall -TARGET_DIRS_info: - $(MAKE) -C TARGET_DIRS info -TARGET_DIRS_makefiles: - $(MAKE) -C TARGET_DIRS makefiles -TARGET_DIRS: - $(MAKE) -C TARGET_DIRS all -.PHONY: TARGET_DIRS_all TARGET_DIRS_debug TARGET_DIRS_smart TARGET_DIRS_release TARGET_DIRS_units TARGET_DIRS_examples TARGET_DIRS_shared TARGET_DIRS_install TARGET_DIRS_sourceinstall TARGET_DIRS_exampleinstall TARGET_DIRS_distinstall TARGET_DIRS_zipinstall TARGET_DIRS_zipsourceinstall TARGET_DIRS_zipexampleinstall TARGET_DIRS_zipdistinstall TARGET_DIRS_clean TARGET_DIRS_distclean TARGET_DIRS_cleanall TARGET_DIRS_info TARGET_DIRS_makefiles TARGET_DIRS -endif -ifdef TARGET_EXAMPLEDIRS_TARGET_EXAMPLEDIRS -TARGET_EXAMPLEDIRS_all: - $(MAKE) -C TARGET_EXAMPLEDIRS all -TARGET_EXAMPLEDIRS_debug: - $(MAKE) -C TARGET_EXAMPLEDIRS debug -TARGET_EXAMPLEDIRS_smart: - $(MAKE) -C TARGET_EXAMPLEDIRS smart -TARGET_EXAMPLEDIRS_release: - $(MAKE) -C TARGET_EXAMPLEDIRS release -TARGET_EXAMPLEDIRS_units: - $(MAKE) -C TARGET_EXAMPLEDIRS units -TARGET_EXAMPLEDIRS_examples: - $(MAKE) -C TARGET_EXAMPLEDIRS examples -TARGET_EXAMPLEDIRS_shared: - $(MAKE) -C TARGET_EXAMPLEDIRS shared -TARGET_EXAMPLEDIRS_install: - $(MAKE) -C TARGET_EXAMPLEDIRS install -TARGET_EXAMPLEDIRS_sourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS sourceinstall -TARGET_EXAMPLEDIRS_exampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS exampleinstall -TARGET_EXAMPLEDIRS_distinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS distinstall -TARGET_EXAMPLEDIRS_zipinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipinstall -TARGET_EXAMPLEDIRS_zipsourceinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipsourceinstall -TARGET_EXAMPLEDIRS_zipexampleinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipexampleinstall -TARGET_EXAMPLEDIRS_zipdistinstall: - $(MAKE) -C TARGET_EXAMPLEDIRS zipdistinstall -TARGET_EXAMPLEDIRS_clean: - $(MAKE) -C TARGET_EXAMPLEDIRS clean -TARGET_EXAMPLEDIRS_distclean: - $(MAKE) -C TARGET_EXAMPLEDIRS distclean -TARGET_EXAMPLEDIRS_cleanall: - $(MAKE) -C TARGET_EXAMPLEDIRS cleanall -TARGET_EXAMPLEDIRS_info: - $(MAKE) -C TARGET_EXAMPLEDIRS info -TARGET_EXAMPLEDIRS_makefiles: - $(MAKE) -C TARGET_EXAMPLEDIRS makefiles -TARGET_EXAMPLEDIRS: - $(MAKE) -C TARGET_EXAMPLEDIRS all -.PHONY: TARGET_EXAMPLEDIRS_all TARGET_EXAMPLEDIRS_debug TARGET_EXAMPLEDIRS_smart TARGET_EXAMPLEDIRS_release TARGET_EXAMPLEDIRS_units TARGET_EXAMPLEDIRS_examples TARGET_EXAMPLEDIRS_shared TARGET_EXAMPLEDIRS_install TARGET_EXAMPLEDIRS_sourceinstall TARGET_EXAMPLEDIRS_exampleinstall TARGET_EXAMPLEDIRS_distinstall TARGET_EXAMPLEDIRS_zipinstall TARGET_EXAMPLEDIRS_zipsourceinstall TARGET_EXAMPLEDIRS_zipexampleinstall TARGET_EXAMPLEDIRS_zipdistinstall TARGET_EXAMPLEDIRS_clean TARGET_EXAMPLEDIRS_distclean TARGET_EXAMPLEDIRS_cleanall TARGET_EXAMPLEDIRS_info TARGET_EXAMPLEDIRS_makefiles TARGET_EXAMPLEDIRS -endif units: examples: shared: diff --git a/packages/gtk1/examples/Makefile b/packages/gtk1/examples/Makefile index e7e58f4fae..43001edcf0 100644 --- a/packages/gtk1/examples/Makefile +++ b/packages/gtk1/examples/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 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 arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux +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 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 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 jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -209,6 +209,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)) @@ -258,11 +266,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -358,6 +368,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_DIRS+=tutorial endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_DIRS+=tutorial +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_DIRS+=tutorial endif @@ -469,6 +482,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_DIRS+=tutorial endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_DIRS+=tutorial +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=tutorial endif @@ -496,6 +512,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_DIRS+=tutorial endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_DIRS+=tutorial +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_DIRS+=tutorial +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=entry notebook scribble clist ttt_test pixmap list progressbar filesel statusbar toolbar rulers spinbutton gtkgldemo endif @@ -562,6 +584,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_PROGRAMS+=entry notebook scribble clist ttt_test pixmap list progressbar filesel statusbar toolbar rulers spinbutton gtkgldemo endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_PROGRAMS+=entry notebook scribble clist ttt_test pixmap list progressbar filesel statusbar toolbar rulers spinbutton gtkgldemo +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_PROGRAMS+=entry notebook scribble clist ttt_test pixmap list progressbar filesel statusbar toolbar rulers spinbutton gtkgldemo endif @@ -673,6 +698,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_PROGRAMS+=entry notebook scribble clist ttt_test pixmap list progressbar filesel statusbar toolbar rulers spinbutton gtkgldemo endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_PROGRAMS+=entry notebook scribble clist ttt_test pixmap list progressbar filesel statusbar toolbar rulers spinbutton gtkgldemo +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=entry notebook scribble clist ttt_test pixmap list progressbar filesel statusbar toolbar rulers spinbutton gtkgldemo endif @@ -700,6 +728,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_PROGRAMS+=entry notebook scribble clist ttt_test pixmap list progressbar filesel statusbar toolbar rulers spinbutton gtkgldemo endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_PROGRAMS+=entry notebook scribble clist ttt_test pixmap list progressbar filesel statusbar toolbar rulers spinbutton gtkgldemo +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_PROGRAMS+=entry notebook scribble clist ttt_test pixmap list progressbar filesel statusbar toolbar rulers spinbutton gtkgldemo +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_UNITS+=tictactoe endif @@ -766,6 +800,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override CLEAN_UNITS+=tictactoe endif +ifeq ($(FULL_TARGET),i386-android) +override CLEAN_UNITS+=tictactoe +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_UNITS+=tictactoe endif @@ -877,6 +914,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override CLEAN_UNITS+=tictactoe endif +ifeq ($(FULL_TARGET),arm-android) +override CLEAN_UNITS+=tictactoe +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_UNITS+=tictactoe endif @@ -904,6 +944,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override CLEAN_UNITS+=tictactoe endif +ifeq ($(FULL_TARGET),jvm-java) +override CLEAN_UNITS+=tictactoe +endif +ifeq ($(FULL_TARGET),jvm-android) +override CLEAN_UNITS+=tictactoe +endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1133,6 +1179,14 @@ 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= @@ -1262,6 +1316,20 @@ 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 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1680,6 +1748,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_GTK1=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_GTK1=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1976,6 +2052,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_GTK1=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_GTK1=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -2048,6 +2132,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_GTK1=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_GTK1=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_GTK1=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2388,17 +2488,12 @@ 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) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT @@ -2849,6 +2944,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) TARGET_DIRS_TUTORIAL=1 endif +ifeq ($(FULL_TARGET),i386-android) +TARGET_DIRS_TUTORIAL=1 +endif ifeq ($(FULL_TARGET),m68k-linux) TARGET_DIRS_TUTORIAL=1 endif @@ -2960,6 +3058,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) TARGET_DIRS_TUTORIAL=1 endif +ifeq ($(FULL_TARGET),arm-android) +TARGET_DIRS_TUTORIAL=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_TUTORIAL=1 endif @@ -2987,6 +3088,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) TARGET_DIRS_TUTORIAL=1 endif +ifeq ($(FULL_TARGET),jvm-java) +TARGET_DIRS_TUTORIAL=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +TARGET_DIRS_TUTORIAL=1 +endif ifdef TARGET_DIRS_TUTORIAL tutorial_all: $(MAKE) -C tutorial all diff --git a/packages/gtk1/examples/tutorial/Makefile b/packages/gtk1/examples/tutorial/Makefile index ce1ea097b6..d046fc27d6 100644 --- a/packages/gtk1/examples/tutorial/Makefile +++ b/packages/gtk1/examples/tutorial/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 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 arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux +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 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 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 jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -209,6 +209,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)) @@ -258,11 +266,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -521,6 +531,14 @@ 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= @@ -650,6 +668,20 @@ 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 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1068,6 +1100,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_GTK1=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_GTK1=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1364,6 +1404,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_GTK1=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_GTK1=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1436,6 +1484,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_GTK1=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_GTK1=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_GTK1=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1776,17 +1840,12 @@ 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) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT diff --git a/packages/gtk1/src/gtkgl/Makefile b/packages/gtk1/src/gtkgl/Makefile index 3aa14aa6a0..9a510de2b8 100644 --- a/packages/gtk1/src/gtkgl/Makefile +++ b/packages/gtk1/src/gtkgl/Makefile @@ -1,10 +1,10 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16] # 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 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 arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux +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 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 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 jvm-java jvm-android BSDs = freebsd netbsd openbsd darwin -UNIXs = linux $(BSDs) solaris qnx haiku aix +UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom OSNeedsComspecToRunBatch = go32v2 watcom FORCE: @@ -209,6 +209,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)) @@ -258,11 +266,13 @@ ifndef BINUTILSPREFIX ifndef CROSSBINDIR ifdef CROSSCOMPILE ifndef DARWIN2DARWIN +ifneq ($(CPU_TARGET),jvm) BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- endif endif endif endif +endif UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX)) ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) @@ -360,6 +370,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_UNITS+=gtkglarea endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_UNITS+=gtkglarea +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_UNITS+=gtkglarea endif @@ -471,6 +484,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_UNITS+=gtkglarea endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_UNITS+=gtkglarea +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_UNITS+=gtkglarea endif @@ -498,6 +514,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_UNITS+=gtkglarea endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_UNITS+=gtkglarea +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_UNITS+=gtkglarea +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLES+=gtkgldemo endif @@ -564,6 +586,9 @@ endif ifeq ($(FULL_TARGET),i386-iphonesim) override TARGET_EXAMPLES+=gtkgldemo endif +ifeq ($(FULL_TARGET),i386-android) +override TARGET_EXAMPLES+=gtkgldemo +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_EXAMPLES+=gtkgldemo endif @@ -675,6 +700,9 @@ endif ifeq ($(FULL_TARGET),arm-symbian) override TARGET_EXAMPLES+=gtkgldemo endif +ifeq ($(FULL_TARGET),arm-android) +override TARGET_EXAMPLES+=gtkgldemo +endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_EXAMPLES+=gtkgldemo endif @@ -702,6 +730,12 @@ endif ifeq ($(FULL_TARGET),mipsel-linux) override TARGET_EXAMPLES+=gtkgldemo endif +ifeq ($(FULL_TARGET),jvm-java) +override TARGET_EXAMPLES+=gtkgldemo +endif +ifeq ($(FULL_TARGET),jvm-android) +override TARGET_EXAMPLES+=gtkgldemo +endif override INSTALL_FPCPACKAGE=y override SHARED_BUILD=n override SHARED_BUILD=n @@ -933,6 +967,14 @@ 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= @@ -1062,6 +1104,20 @@ 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 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1480,6 +1536,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_OPENGL=1 endif +ifeq ($(FULL_TARGET),i386-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_OPENGL=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1776,6 +1840,14 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_OPENGL=1 endif +ifeq ($(FULL_TARGET),arm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_OPENGL=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1848,6 +1920,22 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_FPMKUNIT=1 REQUIRE_PACKAGES_OPENGL=1 endif +ifeq ($(FULL_TARGET),jvm-java) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_OPENGL=1 +endif +ifeq ($(FULL_TARGET),jvm-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_OPENGL=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2188,17 +2276,12 @@ 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) override FPCOPT+=-Cg endif endif -endif ifdef LINKSHARED endif ifdef OPT |