* regenerated

demo/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -569,15 +569,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -753,7 +760,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

demo/graph/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -622,15 +622,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -835,7 +842,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

demo/linux/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -620,15 +620,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -825,7 +832,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

demo/modex/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -620,15 +620,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -825,7 +832,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

demo/os2/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -620,15 +620,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -825,7 +832,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

demo/text/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -618,15 +618,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -823,7 +830,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

demo/win32/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -620,15 +620,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -825,7 +832,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

fcl/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -777,15 +777,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -1078,7 +1085,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

fcl/db/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -702,15 +702,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -924,7 +931,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

fcl/db/dbase/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -623,15 +623,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -839,7 +846,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

fcl/db/interbase/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -668,15 +668,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -890,7 +897,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

fcl/db/mysql/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -668,15 +668,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -890,7 +897,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

fcl/db/tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -790,15 +790,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -1001,7 +1008,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

fcl/shedit/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -623,15 +623,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -839,7 +846,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

fcl/shedit/gtk/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -891,15 +891,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -1110,7 +1117,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

fcl/tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -796,15 +796,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -1007,7 +1014,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

fcl/xml/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -622,15 +622,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -823,7 +830,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

fv/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -625,15 +625,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -920,7 +927,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

fv/test/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -654,15 +654,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -859,7 +866,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

fvision/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -625,15 +625,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -920,7 +927,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

fvision/test/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -654,15 +654,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -859,7 +866,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

ide/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -754,15 +754,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -1044,7 +1051,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

ide/compiler/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -633,15 +633,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -834,7 +841,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

ide/fakegdb/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -618,15 +618,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -819,7 +826,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

install/fpinst/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -676,15 +676,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -960,7 +967,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

packages/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -578,15 +578,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -683,7 +690,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

packages/cmem/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -622,15 +622,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -917,7 +924,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

packages/forms/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -668,15 +668,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -981,7 +988,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

packages/forms/demo/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -700,15 +700,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -911,7 +918,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

packages/gdbint/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -633,15 +633,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -934,7 +941,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean
@@ -1036,11 +1043,10 @@ zipinstall: fpc_zipinstall
 zipsourceinstall: fpc_zipsourceinstall
 zipexampleinstall: fpc_zipexampleinstall
 zipdistinstall: fpc_zipdistinstall
-clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
@@ -1099,3 +1105,5 @@ simple: $(DBGCOM)
 testgdb$(EXEEXT): testgdb.pp gdbint$(PPUEXT) gdbcon$(PPUEXT) $(DBGCOM)
 .PHONY: test
 test: examples
+clean: fpc_clean
+	$(DEL) gdbver$(EXEEXT) gdbver$(OEXT)

packages/gdbint/libgdb/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -554,15 +554,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -659,7 +666,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

packages/gdbm/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -555,15 +555,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -660,7 +667,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

packages/ggi/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -631,15 +631,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -932,7 +939,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

packages/gtk/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -699,15 +699,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -1000,7 +1007,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

packages/gtk/examples/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -731,15 +731,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -942,7 +949,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

packages/gtk/examples/tutorial/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -692,15 +692,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -803,7 +810,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

packages/gtk/gtkgl/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -696,15 +696,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -918,7 +925,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

packages/ibase/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -631,15 +631,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -932,7 +939,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

packages/inet/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -622,15 +622,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -917,7 +924,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

packages/libgd/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -631,15 +631,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -932,7 +939,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

packages/libpng/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -666,15 +666,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -952,7 +959,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

packages/mysql/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -631,15 +631,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -932,7 +939,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

packages/ncurses/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -631,15 +631,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -932,7 +939,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

packages/opengl/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -677,15 +677,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -978,7 +985,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

packages/opengl/build/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all_units
 override PATH:=$(subst \,/,$(PATH))
@@ -790,15 +790,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -1009,7 +1016,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

packages/opengl/examples/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -693,15 +693,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -904,7 +911,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

packages/oracle/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -631,15 +631,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -932,7 +939,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

packages/oracle/example/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -826,15 +826,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -1048,7 +1055,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

packages/paszlib/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -622,15 +622,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -917,7 +924,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

packages/postgres/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -631,15 +631,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -932,7 +939,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

packages/regexpr/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -623,15 +623,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -918,7 +925,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

packages/svgalib/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -631,15 +631,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -932,7 +939,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

packages/syslog/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -631,15 +631,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -932,7 +939,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

packages/uncgi/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -622,15 +622,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -917,7 +924,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

packages/unzip/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -624,15 +624,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -904,7 +911,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

packages/utmp/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -622,15 +622,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -917,7 +924,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

packages/x11/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -630,15 +630,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -916,7 +923,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

packages/zlib/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -630,15 +630,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -916,7 +923,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

rtl/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -587,15 +587,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -834,7 +841,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

rtl/amiga/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -587,15 +587,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -803,7 +810,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

rtl/beos/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -582,15 +582,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -798,7 +805,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

rtl/freebsd/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -594,15 +594,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -810,7 +817,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

rtl/go32v1/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -580,15 +580,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -796,7 +803,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

rtl/go32v2/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -587,15 +587,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -803,7 +810,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

rtl/linux/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -600,15 +600,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -816,7 +823,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

rtl/os2/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -586,15 +586,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -802,7 +809,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

rtl/win32/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -590,15 +590,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -806,7 +813,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: allexectests
 override PATH:=$(subst \,/,$(PATH))
@@ -563,15 +563,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -668,7 +675,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

tests/units/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -619,15 +619,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -820,7 +827,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

utils/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -793,15 +793,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -1083,7 +1090,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

utils/dxegen/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -622,15 +622,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -827,7 +834,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

utils/fpcm/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -791,15 +791,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -1002,7 +1009,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

utils/fprcp/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -620,15 +620,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -825,7 +832,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

utils/h2pas/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -621,15 +621,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -826,7 +833,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

utils/simulator/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -620,15 +620,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -825,7 +832,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean

utils/tply/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/22]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -622,15 +622,22 @@ override FPCOPT+=-gl
 override FPCOPTDEF+=DEBUG
 endif
 ifdef RELEASE
-override FPCOPT+=-Xs -OG2p3 -n
+ifeq ($(CPU_TARGET),i386)
+FPCCPUOPT:=-OG2p3
+else
+FPCCPUOPT:=
+endif
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
 override FPCOPT+=-Xs
 endif
 ifdef OPTIMIZE
+ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-OG2p3
 endif
+endif
 ifdef VERBOSE
 override FPCOPT+=-vwni
 endif
@@ -835,7 +842,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean