X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/57a7b7c1484fda95240972aae876bdbdbbc98344..f8a3e080aaf03010044191b373d27c2e17cbd7d9:/src/msw/makefile.g95?ds=inline diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95 index 5db4dfeeb6..21199e7ca6 100644 --- a/src/msw/makefile.g95 +++ b/src/msw/makefile.g95 @@ -29,8 +29,6 @@ include $(WXDIR)/src/makeg95.env # USE_GAUGE should be 1 # xpm: XPM pixmap support # USE_XPM_IN_X should be 1 -# image: GIF, BMP image reading -# USE_IMAGE_LOADING_IN_X should be 1 # wxstring: string class # USE_GNU_WXSTRING should be 1 # @@ -49,6 +47,7 @@ EXTRAOBJS= GENDIR=../generic COMMDIR=../common +XPMDIR=../xpm OLEDIR=ole MSWDIR=. @@ -61,20 +60,26 @@ DOCDIR = $(WXDIR)\docs GENERICOBJS= \ $(GENDIR)/choicdgg.$(OBJSUFF) \ - $(GENDIR)/colrdlgg.$(OBJSUFF) \ - $(GENDIR)/fontdlgg.$(OBJSUFF) \ + $(GENDIR)/dirdlgg.$(OBJSUFF) \ $(GENDIR)/gridg.$(OBJSUFF) \ - $(GENDIR)/helpxlp.$(OBJSUFF) \ - $(GENDIR)/msgdlgg.$(OBJSUFF) \ + $(GENDIR)/laywin.$(OBJSUFF) \ $(GENDIR)/panelg.$(OBJSUFF) \ - $(GENDIR)/printps.$(OBJSUFF) \ - $(GENDIR)/prntdlgg.$(OBJSUFF) \ + $(GENDIR)/prop.$(OBJSUFF) \ + $(GENDIR)/propform.$(OBJSUFF) \ + $(GENDIR)/proplist.$(OBJSUFF) \ + $(GENDIR)/sashwin.$(OBJSUFF) \ $(GENDIR)/scrolwin.$(OBJSUFF) \ $(GENDIR)/splitter.$(OBJSUFF) \ $(GENDIR)/statusbr.$(OBJSUFF) \ $(GENDIR)/tabg.$(OBJSUFF) \ $(GENDIR)/textdlgg.$(OBJSUFF) +# $(GENDIR)/colrdlgg.$(OBJSUFF) \ +# $(GENDIR)/fontdlgg.$(OBJSUFF) \ +# $(GENDIR)/prntdlgg.$(OBJSUFF) \ +# $(GENDIR)/printps.$(OBJSUFF) \ +# $(GENDIR)/msgdlgg.$(OBJSUFF) \ + COMMONOBJS = \ $(COMMDIR)/config.$(OBJSUFF) \ $(COMMDIR)/cmndata.$(OBJSUFF) \ @@ -88,14 +93,15 @@ COMMONOBJS = \ $(COMMDIR)/framecmn.$(OBJSUFF) \ $(COMMDIR)/gdicmn.$(OBJSUFF) \ $(COMMDIR)/helpbase.$(OBJSUFF) \ + $(COMMDIR)/image.$(OBJSUFF) \ $(COMMDIR)/intl.$(OBJSUFF) \ $(COMMDIR)/layout.$(OBJSUFF) \ $(COMMDIR)/log.$(OBJSUFF) \ $(COMMDIR)/memory.$(OBJSUFF) \ $(COMMDIR)/module.$(OBJSUFF) \ + $(COMMDIR)/mimetype.$(OBJSUFF) \ $(COMMDIR)/object.$(OBJSUFF) \ $(COMMDIR)/odbc.$(OBJSUFF) \ - $(COMMDIR)/postscrp.$(OBJSUFF) \ $(COMMDIR)/process.$(OBJSUFF) \ $(COMMDIR)/prntbase.$(OBJSUFF) \ $(COMMDIR)/resource.$(OBJSUFF) \ @@ -110,17 +116,35 @@ 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) \ @@ -147,7 +171,6 @@ MSWOBJS = \ dde.$(OBJSUFF) \ dialog.$(OBJSUFF) \ dib.$(OBJSUFF) \ - dirdlg.$(OBJSUFF) \ filedlg.$(OBJSUFF) \ font.$(OBJSUFF) \ fontdlg.$(OBJSUFF) \ @@ -201,14 +224,32 @@ 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) + +# Native wxDirDlg can't be compiled due to GnuWin32/OLE limitations +# dirdlg.$(OBJSUFF) \ + +# OLE not supported yet by GnuWin32 +# $(OLEDIR)/droptgt.$(OBJSUFF) \ +# $(OLEDIR)/dropsrc.$(OBJSUFF) \ +# $(OLEDIR)/dataobj.$(OBJSUFF) \ +# $(OLEDIR)/oleutils.$(OBJSUFF) \ +# $(OLEDIR)/uuid.$(OBJSUFF) \ +# $(OLEDIR)/automtn.$(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) @@ -241,6 +282,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 @@ -255,46 +299,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 @@ -303,14 +307,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