fixed the vsprintf() problem once and for all

[wxWidgets.git] / src / msw / makefile.g95

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 2219732e4065b59b07702aa6d166e210432659f2..cffc8f2cd7e21f74d9b49603ec046431f95973bc 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -64,12 +64,9 @@ 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) \
@@ -77,6 +74,9 @@ GENERICOBJS= \
   $(GENDIR)/tabg.$(OBJSUFF) \
   $(GENDIR)/textdlgg.$(OBJSUFF)
 
+#  $(GENDIR)/prntdlgg.$(OBJSUFF) \
+#  $(GENDIR)/printps.$(OBJSUFF) \
+
 COMMONOBJS = \
   $(COMMDIR)/config.$(OBJSUFF) \
   $(COMMDIR)/cmndata.$(OBJSUFF) \
@@ -97,7 +97,6 @@ COMMONOBJS = \
   $(COMMDIR)/module.$(OBJSUFF) \
   $(COMMDIR)/object.$(OBJSUFF) \
   $(COMMDIR)/odbc.$(OBJSUFF) \
-  $(COMMDIR)/postscrp.$(OBJSUFF) \
   $(COMMDIR)/process.$(OBJSUFF) \
   $(COMMDIR)/prntbase.$(OBJSUFF) \
   $(COMMDIR)/resource.$(OBJSUFF) \
@@ -118,25 +117,27 @@ COMMONOBJS = \
   $(COMMDIR)/tokenzr.$(OBJSUFF) \
   $(COMMDIR)/y_tab.$(OBJSUFF) \
   $(COMMDIR)/stream.$(OBJSUFF) \
-  $(COMMDIR)/fstream.$(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)
 
-# Unfortunately, GnuWin32 fails with a syntax error in Sockets.h,
-# so remove socket code.
-#  $(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)/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) \