2
0
Эх сурвалжийг харах

*FV not compiled for wince

git-svn-id: trunk@2049 -
oro06 19 жил өмнө
parent
commit
e87ce2c74d
2 өөрчлөгдсөн 31 нэмэгдсэн , 2 устгасан
  1. 15 1
      Makefile
  2. 16 1
      Makefile.fpc

+ 15 - 1
Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/12/10]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/12/25]
 #
 default: help
 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-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-wince powerpc64-linux
@@ -321,6 +321,12 @@ endif
 CLEANOPTS=FPC=$(PPNEW)
 BUILDOPTS=FPC=$(PPNEW) RELEASE=1
 INSTALLOPTS=FPC=$(PPNEW) ZIPDESTDIR=$(BASEDIR) FPCMAKE=$(FPCMAKENEW)
+ifneq ($(wildcard fv),)
+NOFVTARGETS=wince
+ifeq ($(findstring $(OS_TARGET),$(NOFVTARGETS)),)
+FV=1
+endif
+endif
 ifndef CROSSCOMPILE
 ifneq ($(wildcard ide),)
 ifneq ($(wildcard fv),)
@@ -2424,7 +2430,9 @@ $(BUILDSTAMP):
 	$(MAKE) rtl_clean $(CLEANOPTS)
 	$(MAKE) packages_clean $(CLEANOPTS)
 	$(MAKE) fcl_clean $(CLEANOPTS)
+ifdef FV
 	$(MAKE) fv_clean $(CLEANOPTS)
+endif
 	$(MAKE) utils_clean $(CLEANOPTS)
 ifdef IDE
 	$(MAKE) ide_clean $(CLEANOPTS)
@@ -2432,7 +2440,9 @@ endif
 	$(MAKE) rtl_$(ALLTARGET) $(BUILDOPTS)
 	$(MAKE) packages_base_$(ALLTARGET) $(BUILDOPTS)
 	$(MAKE) fcl_$(ALLTARGET) $(BUILDOPTS)
+ifdef FV
 	$(MAKE) fv_$(ALLTARGET) $(BUILDOPTS)
+endif
 	$(MAKE) packages_extra_$(ALLTARGET) $(BUILDOPTS)
 	$(MAKE) utils_all $(BUILDOPTS)
 ifdef IDE
@@ -2448,7 +2458,9 @@ installbase:
 installother:
 	$(MAKE) packages_$(INSTALLTARGET) $(INSTALLOPTS)
 	$(MAKE) fcl_$(INSTALLTARGET) $(INSTALLOPTS)
+ifdef FV
 	$(MAKE) fv_$(INSTALLTARGET) $(INSTALLOPTS)
+endif
 	$(MAKE) utils_$(INSTALLTARGET) $(INSTALLOPTS)
 ifdef IDE
 	$(MAKE) ide_$(INSTALLTARGET) $(BUILDOPTS)
@@ -2458,7 +2470,9 @@ zipinstallbase:
 zipinstallother:
 	$(MAKE) packages_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPPREFIX=$(PKGUNITSPRE)
 	$(MAKE) fcl_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPPREFIX=$(PKGUNITSPRE)
+ifdef FV
 	$(MAKE) fv_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPPREFIX=$(PKGUNITSPRE)
+endif
 	$(MAKE) utils_zip$(INSTALLTARGET) $(INSTALLOPTS)
 ifdef IDE
 	$(MAKE) ide_zip$(INSTALLTARGET) $(INSTALLOPTS)

+ 16 - 1
Makefile.fpc

@@ -139,6 +139,14 @@ CLEANOPTS=FPC=$(PPNEW)
 BUILDOPTS=FPC=$(PPNEW) RELEASE=1
 INSTALLOPTS=FPC=$(PPNEW) ZIPDESTDIR=$(BASEDIR) FPCMAKE=$(FPCMAKENEW)
 
+# Not compile FV for following target(s)
+ifneq ($(wildcard fv),)
+NOFVTARGETS=wince
+ifeq ($(findstring $(OS_TARGET),$(NOFVTARGETS)),)
+FV=1
+endif
+endif
+
 # Compile also IDE (check for ide and fv dir)
 # Skipped by default for cross compiles, because it depends on libc
 ifndef CROSSCOMPILE
@@ -152,7 +160,6 @@ endif
 endif
 endif
 
-
 [rules]
 # These values can change
 unexport FPC_VERSION FPC_COMPILERINFO OS_SOURCE
@@ -235,7 +242,9 @@ $(BUILDSTAMP):
         $(MAKE) rtl_clean $(CLEANOPTS)
         $(MAKE) packages_clean $(CLEANOPTS)
         $(MAKE) fcl_clean $(CLEANOPTS)
+ifdef FV
         $(MAKE) fv_clean $(CLEANOPTS)
+endif
         $(MAKE) utils_clean $(CLEANOPTS)
 ifdef IDE
         $(MAKE) ide_clean $(CLEANOPTS)
@@ -244,7 +253,9 @@ endif
         $(MAKE) rtl_$(ALLTARGET) $(BUILDOPTS)
         $(MAKE) packages_base_$(ALLTARGET) $(BUILDOPTS)
         $(MAKE) fcl_$(ALLTARGET) $(BUILDOPTS)
+ifdef FV
         $(MAKE) fv_$(ALLTARGET) $(BUILDOPTS)
+endif
         $(MAKE) packages_extra_$(ALLTARGET) $(BUILDOPTS)
         $(MAKE) utils_all $(BUILDOPTS)
 ifdef IDE
@@ -264,7 +275,9 @@ installbase:
 installother:
         $(MAKE) packages_$(INSTALLTARGET) $(INSTALLOPTS)
         $(MAKE) fcl_$(INSTALLTARGET) $(INSTALLOPTS)
+ifdef FV
         $(MAKE) fv_$(INSTALLTARGET) $(INSTALLOPTS)
+endif
         $(MAKE) utils_$(INSTALLTARGET) $(INSTALLOPTS)
 ifdef IDE
         $(MAKE) ide_$(INSTALLTARGET) $(BUILDOPTS)
@@ -276,7 +289,9 @@ zipinstallbase:
 zipinstallother:
         $(MAKE) packages_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPPREFIX=$(PKGUNITSPRE)
         $(MAKE) fcl_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPPREFIX=$(PKGUNITSPRE)
+ifdef FV
         $(MAKE) fv_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPPREFIX=$(PKGUNITSPRE)
+endif
         $(MAKE) utils_zip$(INSTALLTARGET) $(INSTALLOPTS)
 ifdef IDE
         $(MAKE) ide_zip$(INSTALLTARGET) $(INSTALLOPTS)