X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/43d811ea55a6dee36e17e6815dcd891a82d62e28..a38b83c353cce75329b2c53c0eaa4ad0f500ccf1:/src/msw/makefile.g95

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 8e972d826e..cffc8f2cd7 100644
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -64,26 +64,30 @@ GENERICOBJS= \
   $(GENDIR)/colrdlgg.$(OBJSUFF) \
   $(GENDIR)/fontdlgg.$(OBJSUFF) \
   $(GENDIR)/gridg.$(OBJSUFF) \
-  $(GENDIR)/helpxlp.$(OBJSUFF) \
+  $(GENDIR)/laywin.$(OBJSUFF) \
   $(GENDIR)/msgdlgg.$(OBJSUFF) \
   $(GENDIR)/panelg.$(OBJSUFF) \
-  $(GENDIR)/printps.$(OBJSUFF) \
-  $(GENDIR)/prntdlgg.$(OBJSUFF) \
+  $(GENDIR)/sashwin.$(OBJSUFF) \
   $(GENDIR)/scrolwin.$(OBJSUFF) \
   $(GENDIR)/splitter.$(OBJSUFF) \
   $(GENDIR)/statusbr.$(OBJSUFF) \
   $(GENDIR)/tabg.$(OBJSUFF) \
   $(GENDIR)/textdlgg.$(OBJSUFF)
 
+#  $(GENDIR)/prntdlgg.$(OBJSUFF) \
+#  $(GENDIR)/printps.$(OBJSUFF) \
+
 COMMONOBJS = \
   $(COMMDIR)/config.$(OBJSUFF) \
   $(COMMDIR)/cmndata.$(OBJSUFF) \
   $(COMMDIR)/docview.$(OBJSUFF) \
+  $(COMMDIR)/docmdi.$(OBJSUFF) \
   $(COMMDIR)/dynarray.$(OBJSUFF) \
   $(COMMDIR)/event.$(OBJSUFF) \
   $(COMMDIR)/file.$(OBJSUFF) \
   $(COMMDIR)/fileconf.$(OBJSUFF) \
   $(COMMDIR)/filefn.$(OBJSUFF) \
+  $(COMMDIR)/framecmn.$(OBJSUFF) \
   $(COMMDIR)/gdicmn.$(OBJSUFF) \
   $(COMMDIR)/helpbase.$(OBJSUFF) \
   $(COMMDIR)/intl.$(OBJSUFF) \
@@ -93,7 +97,7 @@ COMMONOBJS = \
   $(COMMDIR)/module.$(OBJSUFF) \
   $(COMMDIR)/object.$(OBJSUFF) \
   $(COMMDIR)/odbc.$(OBJSUFF) \
-  $(COMMDIR)/postscrp.$(OBJSUFF) \
+  $(COMMDIR)/process.$(OBJSUFF) \
   $(COMMDIR)/prntbase.$(OBJSUFF) \
   $(COMMDIR)/resource.$(OBJSUFF) \
   $(COMMDIR)/tbarbase.$(OBJSUFF) \
@@ -107,14 +111,36 @@ COMMONOBJS = \
   $(COMMDIR)/wxexpr.$(OBJSUFF) \
   $(COMMDIR)/hash.$(OBJSUFF) \
   $(COMMDIR)/list.$(OBJSUFF) \
+  $(COMMDIR)/variant.$(OBJSUFF) \
   $(COMMDIR)/string.$(OBJSUFF) \
   $(COMMDIR)/time.$(OBJSUFF) \
-  $(COMMDIR)/y_tab.$(OBJSUFF)
-
-#  $(COMMDIR)/wxstrgnu/wxstrgnu.$(OBJSUFF) \
-#  $(COMMDIR)/wxstrgnu/wxregex.$(OBJSUFF)
+  $(COMMDIR)/tokenzr.$(OBJSUFF) \
+  $(COMMDIR)/y_tab.$(OBJSUFF) \
+  $(COMMDIR)/stream.$(OBJSUFF) \
+  $(COMMDIR)/wfstream.$(OBJSUFF) \
+  $(COMMDIR)/mstream.$(OBJSUFF) \
+  $(COMMDIR)/zstream.$(OBJSUFF) \
+  $(COMMDIR)/datstrm.$(OBJSUFF) \
+  $(COMMDIR)/objstrm.$(OBJSUFF) \
+  $(COMMDIR)/extended.$(OBJSUFF) \
+  $(COMMDIR)/socket.$(OBJSUFF) \
+  $(COMMDIR)/sckaddr.$(OBJSUFF) \
+  $(COMMDIR)/sckfile.$(OBJSUFF) \
+  $(COMMDIR)/sckipc.$(OBJSUFF) \
+  $(COMMDIR)/sckstrm.$(OBJSUFF) \
+  $(COMMDIR)/protocol.$(OBJSUFF) \
+  $(COMMDIR)/http.$(OBJSUFF) \
+  $(COMMDIR)/ftp.$(OBJSUFF) \
+  $(COMMDIR)/url.$(OBJSUFF) \
+  $(COMMDIR)/wincmn.$(OBJSUFF)
+
+#  $(COMMDIR)/postscrp.$(OBJSUFF) \
+
+# NOTE: if the socket-related files above fail with a syntax error in Sockets.h,
+# remove the files (probably all GnuWin32 releases < b20).
 
 MSWOBJS = \
+  accel.$(OBJSUFF) \
   app.$(OBJSUFF) \
   bitmap.$(OBJSUFF) \
   bmpbuttn.$(OBJSUFF) \
@@ -144,7 +170,8 @@ MSWOBJS = \
   font.$(OBJSUFF) \
   fontdlg.$(OBJSUFF) \
   frame.$(OBJSUFF) \
-  gauge.$(OBJSUFF) \
+  gaugemsw.$(OBJSUFF) \
+  gauge95.$(OBJSUFF) \
   gdiobj.$(OBJSUFF) \
   helpwin.$(OBJSUFF) \
   icon.$(OBJSUFF) \
@@ -160,6 +187,7 @@ MSWOBJS = \
   minifram.$(OBJSUFF) \
   msgdlg.$(OBJSUFF) \
   nativdlg.$(OBJSUFF) \
+  notebook.$(OBJSUFF) \
   ownerdrw.$(OBJSUFF) \
   palette.$(OBJSUFF) \
   pen.$(OBJSUFF) \
@@ -170,9 +198,11 @@ MSWOBJS = \
   radiobut.$(OBJSUFF) \
   region.$(OBJSUFF) \
   registry.$(OBJSUFF) \
+  regconf.$(OBJSUFF) \
   scrolbar.$(OBJSUFF) \
   settings.$(OBJSUFF) \
-  slider.$(OBJSUFF) \
+  slidrmsw.$(OBJSUFF) \
+  slider95.$(OBJSUFF) \
   spinbutt.$(OBJSUFF) \
   statbmp.$(OBJSUFF) \
   statbox.$(OBJSUFF) \
@@ -187,13 +217,16 @@ MSWOBJS = \
   timer.$(OBJSUFF) \
   treectrl.$(OBJSUFF) \
   utils.$(OBJSUFF) \
+  utilsexc.$(OBJSUFF) \
   wave.$(OBJSUFF) \
-  window.$(OBJSUFF) \
-  $(OLEDIR)/droptgt.$(OBJSUFF) \
-  $(OLEDIR)/dropsrc.$(OBJSUFF) \
-  $(OLEDIR)/dataobj.$(OBJSUFF) \
-  $(OLEDIR)/oleutils.$(OBJSUFF) \
-  $(OLEDIR)/uuid.$(OBJSUFF)
+  window.$(OBJSUFF)
+
+# OLE not supported yet by GnuWin32 (?)
+#  $(OLEDIR)/droptgt.$(OBJSUFF) \
+#  $(OLEDIR)/dropsrc.$(OBJSUFF) \
+#  $(OLEDIR)/dataobj.$(OBJSUFF) \
+#  $(OLEDIR)/oleutils.$(OBJSUFF) \
+#  $(OLEDIR)/uuid.$(OBJSUFF)
 
 OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS)
 
@@ -228,6 +261,9 @@ $(COMMDIR)/y_tab.$(OBJSUFF):    $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c
 $(COMMDIR)/lex_yy.c:	$(COMMDIR)/lexer.l
 	$(LEX) $(COMMDIR)/lexer.l > $(COMMDIR)/lex_yy.c
 
+# The following may be required for some versions of LEX/FLEX
+#	$(LEX) -o$(COMMDIR)/lex_yy.c $(COMMDIR)/lexer.l
+
 #	sed -e "s/BUFSIZ/5000/g" < lex.yy.c | \
 #	sed -e "s/yyoutput(c)/void yyoutput(c)/g" | \
 #       sed -e "s/YYLMAX 200/YYLMAX 5000/g" > lex_yy.c
@@ -242,46 +278,6 @@ $(COMMDIR)/y_tab.c:	$(COMMDIR)/parser.y
 
 
 # Extra targets
-prologio:
-	cd $(WXDIR)/utils/prologio/src ; $(MAKE) -f makefile.g95
-	cd $(WXDIR)/src/msw
-
-clean_proio:
-	cd $(WXDIR)/utils/prologio/src; $(MAKE) -f makefile.g95 clean
-	cd $(WXDIR)/src/msw
-
-makedib:
-	cd $(WXDIR)/src/msw/dib ; $(MAKE) -f makefile.g95
-	cd $(WXDIR)/src/msw
-
-clean_dib:
-	cd $(WXDIR)/src/msw/dib; $(MAKE) -f makefile.g95 clean
-	cd $(WXDIR)/src/msw
-
-gauge:
-	cd $(WXDIR)/src/msw/gauge; $(MAKE) -f makefile.g95
-	cd $(WXDIR)/src/msw
-
-clean_gauge:
-	cd $(WXDIR)/src/msw/gauge; $(MAKE) -f makefile.g95 clean
-	cd $(WXDIR)/src/msw
-
-wxstring:
-	cd $(WXDIR)/contrib/wxstring; $(MAKE) -f makefile.g95 OPTIONS="$(OPTIONS)" DEBUG="$(DEBUG)"
-	cd $(WXDIR)/src/msw
-
-clean_wxstring:
-	cd $(WXDIR)/contrib/wxstring; $(MAKE) -f makefile.g95 clean
-	cd $(WXDIR)/src/msw
-
-itsy:
-	cd $(WXDIR)/src/msw/itsybits; $(MAKE) -f makefile.g95
-	cd $(WXDIR)/src/msw
-
-clean_itsy:
-	cd $(WXDIR)/contrib/itsybits; $(MAKE) -f makefile.g95 clean
-	cd $(WXDIR)/src/msw
-
 rcparser:
 	cd $(WXDIR)/utils/rcparser/src; $(MAKE)  -f makefile.g95
 	cd $(WXDIR)/src/msw
@@ -290,14 +286,6 @@ clean_rcp:
 	cd $(WXDIR)/utils/rcparser/src; $(MAKE) -f makefile.g95 clean
 	cd $(WXDIR)/src/msw
 
-# +++start steve161(09.04.1995): added for wxString in \contrib\wxstring
-wxstring_ol:
-	cd ../../contrib/wxstring; $(MAKE) -f makefile.unx xview
-wxstring_motif:
-	cd ../../contrib/wxstring; $(MAKE) -f makefile.unx motif
-wxstring_hp:
-	cd ../../contrib/wxstring; $(MAKE) -f makefile.unx hp
-
 clean:
 	rm -f $(OBJECTS) $(EXTRAOBJS) ../common/y_tab.c ../common/lex_yy.c $(WXDIR)/lib/libwx$(GUISUFFIX).a core