X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2108f33a68772013d4e1c9dc2e476bb8ae77ad8f..f5419957e5794f2d10f4e125f77b2c2e2cd222d6:/src/msw/makefile.g95

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 8e6ac8f024..db437e0f3e 100644
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -49,6 +49,7 @@ EXTRAOBJS=
 
 GENDIR=../generic
 COMMDIR=../common
+XPMDIR=../xpm
 OLEDIR=ole
 MSWDIR=.
 
@@ -64,17 +65,19 @@ 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) \
@@ -95,7 +98,6 @@ COMMONOBJS = \
   $(COMMDIR)/module.$(OBJSUFF) \
   $(COMMDIR)/object.$(OBJSUFF) \
   $(COMMDIR)/odbc.$(OBJSUFF) \
-  $(COMMDIR)/postscrp.$(OBJSUFF) \
   $(COMMDIR)/process.$(OBJSUFF) \
   $(COMMDIR)/prntbase.$(OBJSUFF) \
   $(COMMDIR)/resource.$(OBJSUFF) \
@@ -110,18 +112,37 @@ COMMONOBJS = \
   $(COMMDIR)/wxexpr.$(OBJSUFF) \
   $(COMMDIR)/hash.$(OBJSUFF) \
   $(COMMDIR)/list.$(OBJSUFF) \
+  $(COMMDIR)/variant.$(OBJSUFF) \
   $(COMMDIR)/string.$(OBJSUFF) \
   $(COMMDIR)/time.$(OBJSUFF) \
+  $(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)/wincmn.$(OBJSUFF)
 
+#  $(COMMDIR)/postscrp.$(OBJSUFF) \
+
+# NOTE: if the socket-related files fail with a syntax error in Sockets.h,
+# remove the files (probably all GnuWin32 releases < b20). Cygwin b20 is OK,
+# Mingw32 may still have problems.
+#  $(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) \
+
 MSWOBJS = \
+  accel.$(OBJSUFF) \
   app.$(OBJSUFF) \
   bitmap.$(OBJSUFF) \
   bmpbuttn.$(OBJSUFF) \
@@ -200,14 +221,28 @@ MSWOBJS = \
   utils.$(OBJSUFF) \
   utilsexc.$(OBJSUFF) \
   wave.$(OBJSUFF) \
-  window.$(OBJSUFF) \
-  $(OLEDIR)/droptgt.$(OBJSUFF) \
-  $(OLEDIR)/dropsrc.$(OBJSUFF) \
-  $(OLEDIR)/dataobj.$(OBJSUFF) \
-  $(OLEDIR)/oleutils.$(OBJSUFF) \
-  $(OLEDIR)/uuid.$(OBJSUFF)
-
-OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS)
+  window.$(OBJSUFF)
+
+# OLE not supported yet by GnuWin32
+#  $(OLEDIR)/droptgt.$(OBJSUFF) \
+#  $(OLEDIR)/dropsrc.$(OBJSUFF) \
+#  $(OLEDIR)/dataobj.$(OBJSUFF) \
+#  $(OLEDIR)/oleutils.$(OBJSUFF) \
+#  $(OLEDIR)/uuid.$(OBJSUFF)
+
+XPMOBJECTS = 	$(XPMDIR)/crbuffri.o\
+		$(XPMDIR)/crdatfri.o\
+		$(XPMDIR)/create.o $(XPMDIR)/crifrbuf.o\
+		$(XPMDIR)/crifrdat.o\
+		$(XPMDIR)/data.o\
+		$(XPMDIR)/hashtab.o $(XPMDIR)/misc.o\
+		$(XPMDIR)/parse.o $(XPMDIR)/rdftodat.o\
+		$(XPMDIR)/rdftoi.o\
+		$(XPMDIR)/rgb.o $(XPMDIR)/scan.o\
+		$(XPMDIR)/simx.o $(XPMDIR)/wrffrdat.o\
+		$(XPMDIR)/wrffrp.o $(XPMDIR)/wrffri.o
+
+OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) # $(XPMOBJECTS)
 
 all:    $(OBJECTS) $(WXLIB)
 
@@ -240,6 +275,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
@@ -254,46 +292,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
@@ -302,14 +300,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