* fixed ostype problem

rtl/win32/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/24]
+# Makefile generated by fpcmake v0.99.13 [2000/01/17]
 #
 
 defaultrule: all
@@ -84,14 +84,12 @@ ifdef PP
 FPC=$(PP)
 else
 ifdef inOS2
-FPC=ppos2
+FPC=ppos2$(EXEEXT)
 else
-FPC=ppc386
+FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
-override FPC:=$(subst $(EXEEXT),,$(FPC))
-override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
 
 # Target OS
 ifndef OS_TARGET
@@ -149,10 +147,8 @@ WINDOWS_SOURCE_FILES=$(addprefix $(WININC)/,$(addsuffix .inc,$(WINDOWS_FILES)))
 ifdef FPCDIR
 override FPCDIR:=$(subst \,/,$(FPCDIR))
 ifeq ($(wildcard $(FPCDIR)/rtl),)
-ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=wrong
 endif
-endif
 else
 override FPCDIR=wrong
 endif
@@ -161,32 +157,16 @@ endif
 ifeq ($(FPCDIR),wrong)
 override FPCDIR=.
 ifeq ($(wildcard $(FPCDIR)/rtl),)
-ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=wrong
 endif
 endif
-endif
 
 # Detect FPCDIR
 ifeq ($(FPCDIR),wrong)
 ifdef inlinux
-override FPCDIR=/usr/local/lib/fpc/$(FPC_VERSION)
-ifeq ($(wildcard $(FPCDIR)/units),)
 override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
-endif
 else
-override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
-override FPCDIR:=$(FPCDIR)/..
-ifeq ($(wildcard $(FPCDIR)/rtl),)
-ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR:=$(FPCDIR)/..
-ifeq ($(wildcard $(FPCDIR)/rtl),)
-ifeq ($(wildcard $(FPCDIR)/units),)
-override FPCDIR=c:/pp
-endif
-endif
-endif
-endif
+override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
 endif
 endif
 
@@ -350,6 +330,13 @@ PPAS=ppas.bat
 endif
 endif
 
+# also call ppas if with command option -s
+ifeq (,$(findstring -s ,$(COMPILER)))
+EXECPPAS=
+else
+EXECPPAS:=@$(PPAS)
+endif
+
 # ldconfig to rebuild .so cache
 ifdef inlinux
 LDCONFIG=ldconfig
@@ -407,7 +394,7 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-ZIPPROG:=$(firstword $(ZIPPROG))
+ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
 endif
 endif
 export ZIPPROG
@@ -607,6 +594,7 @@ endif
 # Redirection
 #####################################################################
 
+# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 REDIRFILE=log
 endif
@@ -648,39 +636,19 @@ override FPCOPT+=-FE$(TARGETDIR)
 endif
 
 # Smartlinking
-ifdef LINKSMART
+ifdef SMARTLINK
 override FPCOPT+=-CX
 endif
 
-# Smartlinking
-ifdef CREATESMART
-override FPCOPT+=-XX
-endif
-
 # Debug
 ifdef DEBUG
 override FPCOPT+=-g -dDEBUG
 endif
 
 # Release mode (strip, optimize and don't load ppc386.cfg)
-# 0.99.12b has a bug in the optimizer so don't use it by default
 ifdef RELEASE
-ifeq ($(FPC_VERSION),0.99.12)
-override FPCOPT+=-Xs -OGp3 -n
-else
 override FPCOPT+=-Xs -OG2p3 -n
 endif
-endif
-
-# Strip
-ifdef STRIP
-override FPCOPT+=-Xs
-endif
-
-# Optimizer
-ifdef OPTIMIZE
-override FPCOPT+=-OG2p3
-endif
 
 # Verbose settings (warning,note,info)
 ifdef VERBOSE
@@ -723,19 +691,11 @@ endif
 ifeq ($(OS_SOURCE),win32)
 override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
-export FPCEXTCMD
 endif
 
 # Compiler commandline
 override COMPILER:=$(FPC) $(FPCOPT)
 
-# also call ppas if with command option -s
-ifeq (,$(findstring -s ,$(COMPILER)))
-EXECPPAS=
-else
-EXECPPAS:=@$(PPAS)
-endif
-
 #####################################################################
 # Standard rules
 #####################################################################
@@ -760,13 +720,11 @@ zipsourceinstall: fpc_zipsourceinstall
 
 clean: fpc_clean
 
-distclean: fpc_distclean
-
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
+.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall info
 
 #####################################################################
 # Loaders
@@ -832,19 +790,19 @@ fpc_debug:
 
 %$(PPUEXT): %.pp
 	$(COMPILER) $< $(REDIR)
-	$(EXECPPAS)
+	$(EXECPASS)
 
 %$(PPUEXT): %.pas
 	$(COMPILER) $< $(REDIR)
-	$(EXECPPAS)
+	$(EXECPASS)
 
 %$(EXEEXT): %.pp
 	$(COMPILER) $< $(REDIR)
-	$(EXECPPAS)
+	$(EXECPASS)
 
 %$(EXEEXT): %.pas
 	$(COMPILER) $< $(REDIR)
-	$(EXECPPAS)
+	$(EXECPASS)
 
 #####################################################################
 # Library
@@ -858,7 +816,7 @@ SHAREDLIBUNITOBJECTS:=$(UNITOBJECTS)
 endif
 
 fpc_smart:
-	$(MAKE) all LINKSMART=1 CREATESMART=1
+	$(MAKE) all SMARTLINK=1
 
 fpc_shared: all
 ifdef inlinux
@@ -1001,7 +959,7 @@ ifdef USETAR
 	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT)
 	cd $(PACKDIR) ; $(TARPROG) c$(TAROPT) --file $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT) * ; cd $(BASEDIR)
 else
-	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(ZIPEXT)
+	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)/$(ZIPEXT)
 	cd $(PACKDIR) ; $(ZIPPROG) -Dr $(ZIPOPT) $(DESTZIPDIR)/$(ZIPNAME)$(ZIPEXT) * ; cd $(BASEDIR)
 endif
 	$(DELTREE) $(PACKDIR)
@@ -1016,7 +974,7 @@ fpc_zipsourceinstall:
 # Clean rules
 #####################################################################
 
-.PHONY: fpc_clean fpc_cleanall fpc_distclean
+.PHONY: fpc_clean fpc_cleanall
 
 ifdef EXTRACLEANUNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
@@ -1046,9 +1004,7 @@ endif
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 endif
-	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
-
-fpc_distclean: fpc_clean
+	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE)
 
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
@@ -1056,7 +1012,7 @@ ifdef CLEANEXEFILES
 endif
 	-$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
 	-$(DELTREE) *$(SMARTEXT)
-	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE)
 
 #####################################################################
 # Info rules
@@ -1172,7 +1128,9 @@ ole2$(PPUEXT) : ole2.pp windows$(PPUEXT) $(SYSTEMPPU)
 
 opengl32$(PPUEXT) : opengl32.pp windows$(PPUEXT) $(SYSTEMPPU)
 
-winsock$(PPUEXT) : winsock.pp windows$(PPUEXT) $(SYSTEMPPU)
+os_types$(PPUEXT) : $(INC)/os_types.pp
+
+winsock$(PPUEXT) : winsock.pp windows$(PPUEXT) $(SYSTEMPPU) os_types$(PPUEXT)
 
 sockets$(PPUEXT) : sockets.pp windows$(PPUEXT) winsock$(PPUEXT) $(SYSTEMPPU) \
 		   $(INC)/sockets.inc $(INC)/socketsh.inc