Browse Source

* small bug fixes + newer fpcmake (11175 windows cairo)

git-svn-id: trunk@11006 -
marco 17 years ago
parent
commit
02de4a081c
2 changed files with 7 additions and 4 deletions
  1. 4 1
      packages/Makefile
  2. 3 3
      packages/Makefile.fpc

+ 4 - 1
packages/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/09]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/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 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
@@ -7925,16 +7925,19 @@ libpng_debug: zlib_debug
 libpng_smart: zlib_smart
 libpng_release: zlib_release
 libpng_shared: zlib_shared
+ifneq ($(findstring $(OS_TARGET),linux darwin freebsd openbsd netbsd solaris),)
 cairo_all: x11_all fcl-image_all
 cairo_debug: x11_debug fcl-image_debug
 cairo_smart: x11_smart fcl-image_smart
 cairo_release: x11_release fcl-image_release
 cairo_shared: x11_shared fcl-image_shared
+else
 cairo_all:  fcl-image_all
 cairo_debug:  fcl-image_debug
 cairo_smart:  fcl-image_smart
 cairo_release:  fcl-image_release
 cairo_shared:  fcl-image_shared
+endif
 chm_all:  fcl-xml_all
 chm_shared:  fcl-xml_shared
 chm_smart:  fcl-xml_smart

+ 3 - 3
packages/Makefile.fpc

@@ -168,19 +168,19 @@ libpng_smart: zlib_smart
 libpng_release: zlib_release
 libpng_shared: zlib_shared
 
-#ifneq ($(findstring $(OS_TARGET),linux darwin freebsd openbsd netbsd solaris),)
+ifneq ($(findstring $(OS_TARGET),linux darwin freebsd openbsd netbsd solaris),)
 cairo_all: x11_all fcl-image_all
 cairo_debug: x11_debug fcl-image_debug
 cairo_smart: x11_smart fcl-image_smart
 cairo_release: x11_release fcl-image_release
 cairo_shared: x11_shared fcl-image_shared
-#else
+else
 cairo_all:  fcl-image_all
 cairo_debug:  fcl-image_debug
 cairo_smart:  fcl-image_smart
 cairo_release:  fcl-image_release
 cairo_shared:  fcl-image_shared
-#endif
+endif
 
 chm_all:  fcl-xml_all
 chm_shared:  fcl-xml_shared