X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8535af00e277ee89c877e9cb3ac357791119f497..50d0b061eeeb4f87594ccea7508a7c5975fb36dd:/src/msw/makefile.g95 diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95 index 619081eeda..5fe109c698 100644 --- a/src/msw/makefile.g95 +++ b/src/msw/makefile.g95 @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 15:55, 2000/01/12 +# This file was automatically generated by tmake at 16:36, 2001/11/20 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T! # @@ -21,14 +21,14 @@ include $(WXDIR)/src/makeg95.env # DLL Name, if building wxWindows as a DLL. ifdef WXMAKINGDLL -WXDLL = $(WXDIR)/lib/wx$(WXVERSION).dll -WXDEF = wx$(WXVERSION).def +WXDLL = $(WXDIR)/lib/wxmsw$(WXVERSION)$(UNIEXT).dll +WXDEF = wxmsw$(WXVERSION)$(UNIEXT).def DLL_EXTRA_LIBS = $(WXDIR)/lib/libzlib.a \ $(WXDIR)/lib/libpng.a $(WXDIR)/lib/libjpeg.a \ - $(WXDIR)/lib/libxpm.a $(WXDIR)/lib/libtiff.a + $(WXDIR)/lib/libtiff.a $(WXDIR)/lib/libregex.a DLL_LDFLAGS = -L$(WXDIR)/lib DLL_LDLIBS = -mwindows -lcomctl32 -lctl3d32 -lole32 -loleaut32 \ - -luuid -lrpcrt4 -lodbc32 -lwinmm \ + -luuid -lrpcrt4 -lodbc32 -lwinmm -lopengl32 \ -lwsock32 $(DLL_EXTRA_LIBS) \ -lstdc++ endif @@ -43,16 +43,16 @@ HTMLDIR = $(WXDIR)/src/html ZLIBDIR = $(WXDIR)/src/zlib PNGDIR = $(WXDIR)/src/png JPEGDIR = $(WXDIR)/src/jpeg -XPMDIR = $(WXDIR)/src/xpm TIFFDIR = $(WXDIR)/src/tiff OLEDIR = $(WXDIR)/src/msw/ole MSWDIR = $(WXDIR)/src/msw +REGEXDIR= $(WXDIR)/src/regex ZLIBLIB = $(WXDIR)/lib/libzlib.a PNGLIB = $(WXDIR)/lib/libpng.a JPEGLIB = $(WXDIR)/lib/libjpeg.a -XPMLIB = $(WXDIR)/lib/libxpm.a TIFFLIB = $(WXDIR)/lib/libtiff.a +REGEXLIB= $(WXDIR)/lib/libregex.a DOCDIR = $(WXDIR)/docs @@ -72,7 +72,12 @@ GENERICOBJS = \ $(GENDIR)/busyinfo.$(OBJSUFF) \ $(GENDIR)/calctrl.$(OBJSUFF) \ $(GENDIR)/choicdgg.$(OBJSUFF) \ + $(GENDIR)/dcpsg.$(OBJSUFF) \ + $(GENDIR)/dirctrlg.$(OBJSUFF) \ + $(GENDIR)/dragimgg.$(OBJSUFF) \ $(GENDIR)/grid.$(OBJSUFF) \ + $(GENDIR)/gridctrl.$(OBJSUFF) \ + $(GENDIR)/gridsel.$(OBJSUFF) \ $(GENDIR)/laywin.$(OBJSUFF) \ $(GENDIR)/logg.$(OBJSUFF) \ $(GENDIR)/numdlgg.$(OBJSUFF) \ @@ -82,12 +87,17 @@ GENERICOBJS = \ $(GENDIR)/propform.$(OBJSUFF) \ $(GENDIR)/proplist.$(OBJSUFF) \ $(GENDIR)/sashwin.$(OBJSUFF) \ - $(GENDIR)/scrolwin.$(OBJSUFF) \ + $(GENDIR)/scrlwing.$(OBJSUFF) \ + $(GENDIR)/spinctlg.$(OBJSUFF) \ + $(GENDIR)/splash.$(OBJSUFF) \ $(GENDIR)/splitter.$(OBJSUFF) \ $(GENDIR)/statusbr.$(OBJSUFF) \ $(GENDIR)/tbarsmpl.$(OBJSUFF) \ $(GENDIR)/textdlgg.$(OBJSUFF) \ $(GENDIR)/tipdlg.$(OBJSUFF) \ + $(GENDIR)/tipwin.$(OBJSUFF) \ + $(GENDIR)/treectlg.$(OBJSUFF) \ + $(GENDIR)/treelay.$(OBJSUFF) \ $(GENDIR)/wizard.$(OBJSUFF) COMMONOBJS = \ @@ -95,37 +105,51 @@ COMMONOBJS = \ $(COMMDIR)/appcmn.$(OBJSUFF) \ $(COMMDIR)/choiccmn.$(OBJSUFF) \ $(COMMDIR)/clipcmn.$(OBJSUFF) \ + $(COMMDIR)/clntdata.$(OBJSUFF) \ $(COMMDIR)/cmdline.$(OBJSUFF) \ + $(COMMDIR)/cmdproc.$(OBJSUFF) \ $(COMMDIR)/cmndata.$(OBJSUFF) \ $(COMMDIR)/config.$(OBJSUFF) \ + $(COMMDIR)/containr.$(OBJSUFF) \ + $(COMMDIR)/cshelp.$(OBJSUFF) \ $(COMMDIR)/ctrlcmn.$(OBJSUFF) \ $(COMMDIR)/ctrlsub.$(OBJSUFF) \ $(COMMDIR)/datetime.$(OBJSUFF) \ $(COMMDIR)/datstrm.$(OBJSUFF) \ $(COMMDIR)/db.$(OBJSUFF) \ + $(COMMDIR)/dbgrid.$(OBJSUFF) \ $(COMMDIR)/dbtable.$(OBJSUFF) \ $(COMMDIR)/dcbase.$(OBJSUFF) \ + $(COMMDIR)/dircmn.$(OBJSUFF) \ $(COMMDIR)/dlgcmn.$(OBJSUFF) \ + $(COMMDIR)/dndcmn.$(OBJSUFF) \ $(COMMDIR)/dobjcmn.$(OBJSUFF) \ $(COMMDIR)/docmdi.$(OBJSUFF) \ $(COMMDIR)/docview.$(OBJSUFF) \ + $(COMMDIR)/dseldlg.$(OBJSUFF) \ $(COMMDIR)/dynarray.$(OBJSUFF) \ $(COMMDIR)/dynlib.$(OBJSUFF) \ + $(COMMDIR)/effects.$(OBJSUFF) \ $(COMMDIR)/encconv.$(OBJSUFF) \ $(COMMDIR)/event.$(OBJSUFF) \ $(COMMDIR)/extended.$(OBJSUFF) \ + $(COMMDIR)/fddlgcmn.$(OBJSUFF) \ $(COMMDIR)/ffile.$(OBJSUFF) \ $(COMMDIR)/file.$(OBJSUFF) \ $(COMMDIR)/fileconf.$(OBJSUFF) \ $(COMMDIR)/filefn.$(OBJSUFF) \ + $(COMMDIR)/filename.$(OBJSUFF) \ $(COMMDIR)/filesys.$(OBJSUFF) \ $(COMMDIR)/fontcmn.$(OBJSUFF) \ $(COMMDIR)/fontmap.$(OBJSUFF) \ $(COMMDIR)/framecmn.$(OBJSUFF) \ $(COMMDIR)/fs_inet.$(OBJSUFF) \ + $(COMMDIR)/fs_mem.$(OBJSUFF) \ $(COMMDIR)/fs_zip.$(OBJSUFF) \ $(COMMDIR)/ftp.$(OBJSUFF) \ + $(COMMDIR)/gaugecmn.$(OBJSUFF) \ $(COMMDIR)/gdicmn.$(OBJSUFF) \ + $(COMMDIR)/geometry.$(OBJSUFF) \ $(COMMDIR)/gifdecod.$(OBJSUFF) \ $(COMMDIR)/hash.$(OBJSUFF) \ $(COMMDIR)/helpbase.$(OBJSUFF) \ @@ -139,6 +163,7 @@ COMMONOBJS = \ $(COMMDIR)/imagpng.$(OBJSUFF) \ $(COMMDIR)/imagpnm.$(OBJSUFF) \ $(COMMDIR)/imagtiff.$(OBJSUFF) \ + $(COMMDIR)/imagxpm.$(OBJSUFF) \ $(COMMDIR)/intl.$(OBJSUFF) \ $(COMMDIR)/ipcbase.$(OBJSUFF) \ $(COMMDIR)/layout.$(OBJSUFF) \ @@ -146,17 +171,23 @@ COMMONOBJS = \ $(COMMDIR)/list.$(OBJSUFF) \ $(COMMDIR)/log.$(OBJSUFF) \ $(COMMDIR)/longlong.$(OBJSUFF) \ + $(COMMDIR)/matrix.$(OBJSUFF) \ $(COMMDIR)/memory.$(OBJSUFF) \ $(COMMDIR)/menucmn.$(OBJSUFF) \ - $(COMMDIR)/mimetype.$(OBJSUFF) \ + $(COMMDIR)/mimecmn.$(OBJSUFF) \ $(COMMDIR)/module.$(OBJSUFF) \ $(COMMDIR)/mstream.$(OBJSUFF) \ + $(COMMDIR)/nbkbase.$(OBJSUFF) \ $(COMMDIR)/object.$(OBJSUFF) \ $(COMMDIR)/objstrm.$(OBJSUFF) \ $(COMMDIR)/paper.$(OBJSUFF) \ + $(COMMDIR)/popupcmn.$(OBJSUFF) \ $(COMMDIR)/prntbase.$(OBJSUFF) \ $(COMMDIR)/process.$(OBJSUFF) \ $(COMMDIR)/protocol.$(OBJSUFF) \ + $(COMMDIR)/quantize.$(OBJSUFF) \ + $(COMMDIR)/radiocmn.$(OBJSUFF) \ + $(COMMDIR)/regex.$(OBJSUFF) \ $(COMMDIR)/resource.$(OBJSUFF) \ $(COMMDIR)/sckaddr.$(OBJSUFF) \ $(COMMDIR)/sckfile.$(OBJSUFF) \ @@ -165,14 +196,19 @@ COMMONOBJS = \ $(COMMDIR)/serbase.$(OBJSUFF) \ $(COMMDIR)/sizer.$(OBJSUFF) \ $(COMMDIR)/socket.$(OBJSUFF) \ + $(COMMDIR)/statbar.$(OBJSUFF) \ $(COMMDIR)/strconv.$(OBJSUFF) \ $(COMMDIR)/stream.$(OBJSUFF) \ $(COMMDIR)/string.$(OBJSUFF) \ + $(COMMDIR)/sysopt.$(OBJSUFF) \ $(COMMDIR)/tbarbase.$(OBJSUFF) \ + $(COMMDIR)/textbuf.$(OBJSUFF) \ $(COMMDIR)/textcmn.$(OBJSUFF) \ $(COMMDIR)/textfile.$(OBJSUFF) \ $(COMMDIR)/timercmn.$(OBJSUFF) \ $(COMMDIR)/tokenzr.$(OBJSUFF) \ + $(COMMDIR)/toplvcmn.$(OBJSUFF) \ + $(COMMDIR)/treebase.$(OBJSUFF) \ $(COMMDIR)/txtstrm.$(OBJSUFF) \ $(COMMDIR)/unzip.$(OBJSUFF) \ $(COMMDIR)/url.$(OBJSUFF) \ @@ -185,6 +221,7 @@ COMMONOBJS = \ $(COMMDIR)/wincmn.$(OBJSUFF) \ $(COMMDIR)/wxchar.$(OBJSUFF) \ $(COMMDIR)/wxexpr.$(OBJSUFF) \ + $(COMMDIR)/xpmdecod.$(OBJSUFF) \ $(COMMDIR)/zipstrm.$(OBJSUFF) \ $(COMMDIR)/zstream.$(OBJSUFF) @@ -205,6 +242,7 @@ HTMLOBJS = \ $(HTMLDIR)/m_layout.$(OBJSUFF) \ $(HTMLDIR)/m_links.$(OBJSUFF) \ $(HTMLDIR)/m_list.$(OBJSUFF) \ + $(HTMLDIR)/m_meta.$(OBJSUFF) \ $(HTMLDIR)/m_pre.$(OBJSUFF) \ $(HTMLDIR)/m_tables.$(OBJSUFF) \ $(HTMLDIR)/winpars.$(OBJSUFF) @@ -240,6 +278,9 @@ MSWOBJS = \ $(MSWDIR)/dibutils.$(OBJSUFF) \ $(MSWDIR)/dir.$(OBJSUFF) \ $(MSWDIR)/dragimag.$(OBJSUFF) \ + $(MSWDIR)/enhmeta.$(OBJSUFF) \ + $(MSWDIR)/evtloop.$(OBJSUFF) \ + $(MSWDIR)/fdrepdlg.$(OBJSUFF) \ $(MSWDIR)/filedlg.$(OBJSUFF) \ $(MSWDIR)/font.$(OBJSUFF) \ $(MSWDIR)/fontdlg.$(OBJSUFF) \ @@ -249,7 +290,11 @@ MSWOBJS = \ $(MSWDIR)/gauge95.$(OBJSUFF) \ $(MSWDIR)/gdiimage.$(OBJSUFF) \ $(MSWDIR)/gdiobj.$(OBJSUFF) \ + $(MSWDIR)/glcanvas.$(OBJSUFF) \ $(MSWDIR)/gsocket.$(OBJSUFF) \ + $(MSWDIR)/gsockmsw.$(OBJSUFF) \ + $(MSWDIR)/helpbest.$(OBJSUFF) \ + $(MSWDIR)/helpchm.$(OBJSUFF) \ $(MSWDIR)/helpwin.$(OBJSUFF) \ $(MSWDIR)/icon.$(OBJSUFF) \ $(MSWDIR)/imaglist.$(OBJSUFF) \ @@ -261,6 +306,7 @@ MSWOBJS = \ $(MSWDIR)/menu.$(OBJSUFF) \ $(MSWDIR)/menuitem.$(OBJSUFF) \ $(MSWDIR)/metafile.$(OBJSUFF) \ + $(MSWDIR)/mimetype.$(OBJSUFF) \ $(MSWDIR)/minifram.$(OBJSUFF) \ $(MSWDIR)/msgdlg.$(OBJSUFF) \ $(MSWDIR)/nativdlg.$(OBJSUFF) \ @@ -279,6 +325,7 @@ MSWOBJS = \ $(MSWDIR)/scrolbar.$(OBJSUFF) \ $(MSWDIR)/settings.$(OBJSUFF) \ $(MSWDIR)/slider95.$(OBJSUFF) \ + $(MSWDIR)/snglinst.$(OBJSUFF) \ $(MSWDIR)/spinbutt.$(OBJSUFF) \ $(MSWDIR)/spinctrl.$(OBJSUFF) \ $(MSWDIR)/statbmp.$(OBJSUFF) \ @@ -290,15 +337,16 @@ MSWOBJS = \ $(MSWDIR)/taskbar.$(OBJSUFF) \ $(MSWDIR)/tbar95.$(OBJSUFF) \ $(MSWDIR)/textctrl.$(OBJSUFF) \ + $(MSWDIR)/tglbtn.$(OBJSUFF) \ $(MSWDIR)/thread.$(OBJSUFF) \ $(MSWDIR)/timer.$(OBJSUFF) \ $(MSWDIR)/tooltip.$(OBJSUFF) \ + $(MSWDIR)/toplevel.$(OBJSUFF) \ $(MSWDIR)/treectrl.$(OBJSUFF) \ $(MSWDIR)/utils.$(OBJSUFF) \ $(MSWDIR)/utilsexc.$(OBJSUFF) \ $(MSWDIR)/wave.$(OBJSUFF) \ - $(MSWDIR)/window.$(OBJSUFF) \ - $(MSWDIR)/xpmhand.$(OBJSUFF) + $(MSWDIR)/window.$(OBJSUFF) ADVANCEDOBJS = \ $(COMMDIR)/odbc.$(OBJSUFF) \ @@ -391,18 +439,6 @@ JPEGOBJS = \ $(JPEGDIR)/jquant2.$(OBJSUFF) \ $(JPEGDIR)/jdmerge.$(OBJSUFF) -XPMOBJS = $(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 - TIFFOBJS = $(TIFFDIR)/tif_aux.o \ $(TIFFDIR)/tif_close.o \ $(TIFFDIR)/tif_codec.o \ @@ -447,7 +483,40 @@ else OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) endif -all: $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(XPMLIB) $(TIFFLIB) +# MBN: if anyone has a better solution for this kludge, step +# forward, *please* +# this tests is we are on cygwin or not ( will _not_ work if you are using +# ZSH on plain Win32, tought ); it uses the presence of "/" +# in the PATH variable + +# how do you do "VAR=\" ? BLEAGH! +BACKSLASH=$(subst a,\,a) +ifeq (,$(findstring /,$(PATH))) + IS_CYGWIN=0 + PATH_SEPARATOR:=$(BACKSLASH) + PATH_SUBST=/ +else + IS_CYGWIN=1 + PATH_SEPARATOR=/ + PATH_SUBST:=$(BACKSLASH) +endif + +ARCHINCDIR=$(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/lib/msw$(INCEXT)) + +SETUP_H=$(ARCHINCDIR)/wx/setup.h + +ifndef WXMAKINGDLL +all: $(SETUP_H) $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB) $(REGEXLIB) +else +all: $(SETUP_H) $(OBJECTS) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB) $(REGEXLIB) $(WXDLL) +endif + +$(ARCHINCDIR)/wx: + mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR)) + mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR)/wx) + +$(SETUP_H): $(ARCHINCDIR)/wx + $(COPY) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/include/wx/msw/setup.h) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$@) ifndef WXMAKINGDLL @@ -501,27 +570,25 @@ endif $(ZLIBLIB): $(ZLIBOBJS) - ar $(AROPTIONS) $@ $(ZLIBOBJS) + $(AR) $(AROPTIONS) $@ $(ZLIBOBJS) $(RANLIB) $@ $(PNGLIB): $(PNGOBJS) - ar $(AROPTIONS) $@ $(PNGOBJS) + $(AR) $(AROPTIONS) $@ $(PNGOBJS) $(RANLIB) $@ $(JPEGLIB): $(JPEGOBJS) - ar $(AROPTIONS) $@ $(JPEGOBJS) - $(RANLIB) $@ - -$(XPMLIB): $(XPMOBJS) - ar $(AROPTIONS) $@ $(XPMOBJS) + $(AR) $(AROPTIONS) $@ $(JPEGOBJS) $(RANLIB) $@ $(TIFFLIB): $(TIFFOBJS) - ar $(AROPTIONS) $@ $(TIFFOBJS) + $(AR) $(AROPTIONS) $@ $(TIFFOBJS) $(RANLIB) $@ +$(REGEXLIB): + $(MAKE) -C $(REGEXDIR) -f makefile.g95 WXDIR=$(WXDIR) -$(OBJECTS): $(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(WXINC)/wx/setup.h +$(OBJECTS): $(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(ARCHINCDIR)/wx/setup.h $(COMMDIR)/y_tab.$(OBJSUFF): $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c $(CCLEX) -c $(CPPFLAGS) -DUSE_DEFINE -DYY_USE_PROTOS -o $@ $(COMMDIR)/y_tab.c @@ -580,11 +647,18 @@ clean: -$(RM) ../png/*.bak -$(RM) ../jpeg/*.o -$(RM) ../jpeg/*.bak - -$(RM) ../xpm/*.o - -$(RM) ../xpm/*.bak -$(RM) ../tiff/*.o -$(RM) ../tiff/*.bak + -$(RM) ../regex/*.o + -$(RM) ../regex/*.bak + +cleanall: clean -$(RM) $(WXLIB) + -$(RM) $(ZLIBLIB) + -$(RM) $(PNGLIB) + -$(RM) $(JPEGLIB) + -$(RM) $(TIFFLIB) + -$(RM) $(REGEXLIB) ifdef WXMAKINGDLL -$(RM) $(WXDLL) @@ -595,7 +669,3 @@ ifneq "$(strip $(LD_SUPPORTS_SHARED))" "yes" endif endif - -cleanall: clean - -