Bladeren bron

* only build fpmcgtk for win32 if the gtk dll is found

git-svn-id: trunk@2300 -
peter 19 jaren geleden
bovenliggende
commit
b668f08d4c
2 gewijzigde bestanden met toevoegingen van 21 en 3 verwijderingen
  1. 10 2
      utils/fpmc/Makefile
  2. 11 1
      utils/fpmc/Makefile.fpc

+ 10 - 2
utils/fpmc/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/01/13]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/01/15]
 #
 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-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
@@ -230,6 +230,14 @@ ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
+ifeq ($(OS_TARGET),win32)
+GTKDLL:=$(strip $(wildcard $(addsuffix /libgtk-0.dll,$(SEARCHPATH))))
+ifneq ($(GTKDLL),)
+FPMCGTK=fpmcgtk
+else
+$(warning GTK DLLs not found, skipping build of fpmcgtk)
+endif
+endif
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_PROGRAMS+=fpmc  fpmcgtk
 endif
@@ -237,7 +245,7 @@ ifeq ($(FULL_TARGET),i386-go32v2)
 override TARGET_PROGRAMS+=fpmc
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_PROGRAMS+=fpmc  fpmcgtk
+override TARGET_PROGRAMS+=fpmc  $(FPMCGTK)
 endif
 ifeq ($(FULL_TARGET),i386-os2)
 override TARGET_PROGRAMS+=fpmc

+ 11 - 1
utils/fpmc/Makefile.fpc

@@ -5,7 +5,7 @@
 [target]
 programs=fpmc
 programs_linux=fpmcgtk
-programs_win32=fpmcgtk
+programs_win32=$(FPMCGTK)
 rsts=frmabout frmmain frmoptions msgcomp
 
 [clean]
@@ -22,6 +22,16 @@ fpcpackage=y
 [default]
 fpcdir=../..
 
+[prerules]
+ifeq ($(OS_TARGET),win32)
+GTKDLL:=$(strip $(wildcard $(addsuffix /libgtk-0.dll,$(SEARCHPATH))))
+ifneq ($(GTKDLL),)
+FPMCGTK=fpmcgtk
+else
+$(warning GTK DLLs not found, skipping build of fpmcgtk)
+endif
+endif
+
 [rules]
 fpmc$(EXEEXT): msgcomp.pp fpmc.pp