X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7361f176df8aa58a67a0d29788e75bd58cc28b39..1483041dab88f43563c26405c1e2a41d6babe6a0:/src/msw/makefile.g95 diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95 index 8007666ac0..e6af5575b5 100644 --- a/src/msw/makefile.g95 +++ b/src/msw/makefile.g95 @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 23:49, 2001/10/14 +# This file was automatically generated by tmake at 11:30, 2002/01/23 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T! # @@ -21,11 +21,11 @@ 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/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 -lopengl32 \ @@ -46,11 +46,13 @@ JPEGDIR = $(WXDIR)/src/jpeg 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 TIFFLIB = $(WXDIR)/lib/libtiff.a +REGEXLIB= $(WXDIR)/lib/libregex.a DOCDIR = $(WXDIR)/docs @@ -70,6 +72,7 @@ GENERICOBJS = \ $(GENDIR)/busyinfo.$(OBJSUFF) \ $(GENDIR)/calctrl.$(OBJSUFF) \ $(GENDIR)/choicdgg.$(OBJSUFF) \ + $(GENDIR)/dcpsg.$(OBJSUFF) \ $(GENDIR)/dirctrlg.$(OBJSUFF) \ $(GENDIR)/dragimgg.$(OBJSUFF) \ $(GENDIR)/grid.$(OBJSUFF) \ @@ -123,8 +126,10 @@ COMMONOBJS = \ $(COMMDIR)/dobjcmn.$(OBJSUFF) \ $(COMMDIR)/docmdi.$(OBJSUFF) \ $(COMMDIR)/docview.$(OBJSUFF) \ + $(COMMDIR)/dseldlg.$(OBJSUFF) \ $(COMMDIR)/dynarray.$(OBJSUFF) \ $(COMMDIR)/dynlib.$(OBJSUFF) \ + $(COMMDIR)/dynload.$(OBJSUFF) \ $(COMMDIR)/effects.$(OBJSUFF) \ $(COMMDIR)/encconv.$(OBJSUFF) \ $(COMMDIR)/event.$(OBJSUFF) \ @@ -154,6 +159,7 @@ COMMONOBJS = \ $(COMMDIR)/imagbmp.$(OBJSUFF) \ $(COMMDIR)/image.$(OBJSUFF) \ $(COMMDIR)/imaggif.$(OBJSUFF) \ + $(COMMDIR)/imagiff.$(OBJSUFF) \ $(COMMDIR)/imagjpeg.$(OBJSUFF) \ $(COMMDIR)/imagpcx.$(OBJSUFF) \ $(COMMDIR)/imagpng.$(OBJSUFF) \ @@ -175,7 +181,6 @@ COMMONOBJS = \ $(COMMDIR)/mstream.$(OBJSUFF) \ $(COMMDIR)/nbkbase.$(OBJSUFF) \ $(COMMDIR)/object.$(OBJSUFF) \ - $(COMMDIR)/objstrm.$(OBJSUFF) \ $(COMMDIR)/paper.$(OBJSUFF) \ $(COMMDIR)/popupcmn.$(OBJSUFF) \ $(COMMDIR)/prntbase.$(OBJSUFF) \ @@ -189,7 +194,6 @@ COMMONOBJS = \ $(COMMDIR)/sckfile.$(OBJSUFF) \ $(COMMDIR)/sckipc.$(OBJSUFF) \ $(COMMDIR)/sckstrm.$(OBJSUFF) \ - $(COMMDIR)/serbase.$(OBJSUFF) \ $(COMMDIR)/sizer.$(OBJSUFF) \ $(COMMDIR)/socket.$(OBJSUFF) \ $(COMMDIR)/statbar.$(OBJSUFF) \ @@ -198,6 +202,7 @@ COMMONOBJS = \ $(COMMDIR)/string.$(OBJSUFF) \ $(COMMDIR)/sysopt.$(OBJSUFF) \ $(COMMDIR)/tbarbase.$(OBJSUFF) \ + $(COMMDIR)/textbuf.$(OBJSUFF) \ $(COMMDIR)/textcmn.$(OBJSUFF) \ $(COMMDIR)/textfile.$(OBJSUFF) \ $(COMMDIR)/timercmn.$(OBJSUFF) \ @@ -239,6 +244,7 @@ HTMLOBJS = \ $(HTMLDIR)/m_list.$(OBJSUFF) \ $(HTMLDIR)/m_meta.$(OBJSUFF) \ $(HTMLDIR)/m_pre.$(OBJSUFF) \ + $(HTMLDIR)/m_style.$(OBJSUFF) \ $(HTMLDIR)/m_tables.$(OBJSUFF) \ $(HTMLDIR)/winpars.$(OBJSUFF) @@ -478,12 +484,44 @@ else OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(DIRDLGOBJ) endif +# 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)) +ARCHINCDIR=$(WXDIR)/lib/msw$(INCEXT) + +SETUP_H=$(ARCHINCDIR)/wx/setup.h + ifndef WXMAKINGDLL -all: $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB) +all: $(SETUP_H) $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB) $(REGEXLIB) else -all: $(OBJECTS) $(ZLIBLIB) $(PNGLIB) $(JPEGLIB) $(TIFFLIB) $(WXDLL) +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) $(WXDIR)/include/wx/msw/setup.h $@ + +# $(COPY) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/include/wx/msw/setup.h) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$@) + ifndef WXMAKINGDLL $(WXLIB): $(OBJECTS) $(EXTRAOBJS) @@ -551,8 +589,10 @@ $(TIFFLIB): $(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 @@ -563,14 +603,6 @@ $(COMMDIR)/y_tab.c: $(COMMDIR)/dosyacc.c $(COMMDIR)/lex_yy.c: $(COMMDIR)/doslex.c $(COPY) ../common/doslex.c ../common/lex_yy.c - -# -# NOTE: by default, you don't need to run $(LEX) and $(YACC) -# to rebuild lex_yy.c and y_tab.c, since these will be copied -# from the doslex.c and dosyacc.c files. So, normally you -# don't need to uncomment the following lines. -# -# # Replace lex with flex if you run into compilation # problems with lex_yy.c. See also note about LEX_SCANNER # above. @@ -621,6 +653,8 @@ clean: -$(RM) ../jpeg/*.bak -$(RM) ../tiff/*.o -$(RM) ../tiff/*.bak + -$(RM) ../regex/*.o + -$(RM) ../regex/*.bak cleanall: clean -$(RM) $(WXLIB) @@ -628,6 +662,7 @@ cleanall: clean -$(RM) $(PNGLIB) -$(RM) $(JPEGLIB) -$(RM) $(TIFFLIB) + -$(RM) $(REGEXLIB) ifdef WXMAKINGDLL -$(RM) $(WXDLL)