Browse Source

* fixed solaris compilation after r12591/12594/12595

git-svn-id: trunk@12600 -
Jonas Maebe 16 years ago
parent
commit
8adbb96141
2 changed files with 4 additions and 4 deletions
  1. 2 2
      packages/Makefile
  2. 2 2
      packages/Makefile.fpc

+ 2 - 2
packages/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/11/14]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/12/11]
 #
 #
 default: all
 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 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
 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 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
@@ -8501,7 +8501,7 @@ librsvg_shared: gtk2_shared
 librsvg_smart: gtk2_smart
 librsvg_smart: gtk2_smart
 librsvg_debug: gtk2_debug
 librsvg_debug: gtk2_debug
 librsvg_release: gtk2_release
 librsvg_release: gtk2_release
-ifeq ($(findstring $(OS_TARGET),win32 win64),)
+ifeq ($(findstring $(OS_TARGET),win32 win64 solaris),)
 fcl-xml_all: iconvenc_all
 fcl-xml_all: iconvenc_all
 fcl-xml_shared: iconvenc_shared
 fcl-xml_shared: iconvenc_shared
 fcl-xml_smart: iconvenc_smart
 fcl-xml_smart: iconvenc_smart

+ 2 - 2
packages/Makefile.fpc

@@ -311,10 +311,10 @@ librsvg_smart: gtk2_smart
 librsvg_debug: gtk2_debug
 librsvg_debug: gtk2_debug
 librsvg_release: gtk2_release
 librsvg_release: gtk2_release
 
 
-ifeq ($(findstring $(OS_TARGET),win32 win64),)
+ifeq ($(findstring $(OS_TARGET),win32 win64 solaris),)
 fcl-xml_all: iconvenc_all
 fcl-xml_all: iconvenc_all
 fcl-xml_shared: iconvenc_shared
 fcl-xml_shared: iconvenc_shared
 fcl-xml_smart: iconvenc_smart
 fcl-xml_smart: iconvenc_smart
 fcl-xml_debug: iconvenc_debug
 fcl-xml_debug: iconvenc_debug
 fcl-xml_release: iconvenc_release
 fcl-xml_release: iconvenc_release
-endif
+endif