* added -dI386_ASSEMBLER for the platforms, which have the i386 loaders enabled

git-svn-id: trunk@16025 -

packages/hermes/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/17]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/19]
 #
 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 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-solaris 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 mipsel-linux
@@ -456,7 +456,7 @@ ifeq ($(FULL_TARGET),i386-go32v2)
 override TARGET_LOADERS+=mmx_clr mmx_main mmxp2_32 mmxp_32 x8616lut x86_clr x86_main x86p_16 x86p_32 x86p_cpy x86p_i8 x86p_s32 x86pscpy
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_LOADERS+=mmx_clr mmx_main mmxp2_32 mmxp_32 x8616lut x86_clr x86_main x86p_16 x86p_32 x86p_cpy x86p_i8 x86p_s32 x86pscpy mmx_clr mmx_main mmxp2_32 mmxp_32 x8616lut x86_clr x86_main x86p_16 x86p_32 x86p_cpy x86p_i8 x86p_s32 x86pscpy
+override TARGET_LOADERS+=mmx_clr mmx_main mmxp2_32 mmxp_32 x8616lut x86_clr x86_main x86p_16 x86p_32 x86p_cpy x86p_i8 x86p_s32 x86pscpy
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
 override TARGET_LOADERS+=mmx_clr mmx_main mmxp2_32 mmxp_32 x8616lut x86_clr x86_main x86p_16 x86p_32 x86p_cpy x86p_i8 x86p_s32 x86pscpy
@@ -465,10 +465,28 @@ ifeq ($(FULL_TARGET),i386-beos)
 override TARGET_LOADERS+=mmx_clr mmx_main mmxp2_32 mmxp_32 x8616lut x86_clr x86_main x86p_16 x86p_32 x86p_cpy x86p_i8 x86p_s32 x86pscpy
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_LOADERS+=mmx_clr mmx_main mmxp2_32 mmxp_32 x8616lut x86_clr x86_main x86p_16 x86p_32 x86p_cpy x86p_i8 x86p_s32 x86pscpy mmx_clr mmx_main mmxp2_32 mmxp_32 x8616lut x86_clr x86_main x86p_16 x86p_32 x86p_cpy x86p_i8 x86p_s32 x86pscpy
+override TARGET_LOADERS+=mmx_clr mmx_main mmxp2_32 mmxp_32 x8616lut x86_clr x86_main x86p_16 x86p_32 x86p_cpy x86p_i8 x86p_s32 x86pscpy
 endif
 override INSTALL_FPCPACKAGE=y
 ifeq ($(FULL_TARGET),i386-linux)
+override COMPILER_OPTIONS+=-dI386_ASSEMBLER
+endif
+ifeq ($(FULL_TARGET),i386-go32v2)
+override COMPILER_OPTIONS+=-dI386_ASSEMBLER
+endif
+ifeq ($(FULL_TARGET),i386-win32)
+override COMPILER_OPTIONS+=-dI386_ASSEMBLER
+endif
+ifeq ($(FULL_TARGET),i386-freebsd)
+override COMPILER_OPTIONS+=-dI386_ASSEMBLER
+endif
+ifeq ($(FULL_TARGET),i386-beos)
+override COMPILER_OPTIONS+=-dI386_ASSEMBLER
+endif
+ifeq ($(FULL_TARGET),i386-haiku)
+override COMPILER_OPTIONS+=-dI386_ASSEMBLER
+endif
+ifeq ($(FULL_TARGET),i386-linux)
 override COMPILER_INCLUDEDIR+=src
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)

packages/hermes/Makefile.fpc

@@ -8,9 +8,6 @@ version=2.5.1
 
 [target]
 units=hermes
-loaders_i386_win32=mmx_clr mmx_main mmxp2_32 mmxp_32 \
-             x8616lut x86_clr x86_main x86p_16 x86p_32 x86p_cpy \
-             x86p_i8 x86p_s32 x86pscpy
 loaders_i386_linux=mmx_clr mmx_main mmxp2_32 mmxp_32 \
              x8616lut x86_clr x86_main x86p_16 x86p_32 x86p_cpy \
              x86p_i8 x86p_s32 x86pscpy
@@ -29,11 +26,15 @@ loaders_i386_haiku=mmx_clr mmx_main mmxp2_32 mmxp_32 \
 loaders_i386_beos=mmx_clr mmx_main mmxp2_32 mmxp_32 \
              x8616lut x86_clr x86_main x86p_16 x86p_32 x86p_cpy \
              x86p_i8 x86p_s32 x86pscpy
-loaders_i386_haiku=mmx_clr mmx_main mmxp2_32 mmxp_32 \
-             x8616lut x86_clr x86_main x86p_16 x86p_32 x86p_cpy \
-             x86p_i8 x86p_s32 x86pscpy
 
 [compiler]
+options_i386_linux=-dI386_ASSEMBLER
+options_i386_win32=-dI386_ASSEMBLER
+options_i386_go32v2=-dI386_ASSEMBLER
+options_i386_freebsd=-dI386_ASSEMBLER
+options_i386_haiku=-dI386_ASSEMBLER
+options_i386_beos=-dI386_ASSEMBLER
+
 unitdir=
 targetdir=.
 includedir=src