X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/32037c4ed95668dc9422efcfb06013a5de31e673..1f86850d45e786987db4884ba9403eec510625f7:/src/msw/makefile.wat?ds=sidebyside diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat index a8671665e6..cc553f349c 100644 --- a/src/msw/makefile.wat +++ b/src/msw/makefile.wat @@ -1,6 +1,6 @@ #!/binb/wmake.exe -# This file was automatically generated by tmake at 16:36, 2001/11/20 +# This file was automatically generated by tmake at 22:26, 2002/01/29 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T! # @@ -29,8 +29,8 @@ LIBTARGET = $(WXLIB)\wx.lib DUMMY=dummydll # ODBCLIB = ..\..\contrib\odbc\odbc32.lib -EXTRATARGETS = png zlib jpeg tiff -EXTRATARGETSCLEAN = clean_png clean_zlib clean_jpeg clean_tiff +EXTRATARGETS = png zlib jpeg tiff regex +EXTRATARGETSCLEAN = clean_png clean_zlib clean_jpeg clean_tiff clean_regex GENDIR=$(WXDIR)\src\generic COMMDIR=$(WXDIR)\src\common JPEGDIR=$(WXDIR)\src\jpeg @@ -123,6 +123,7 @@ COMMONOBJS = & dseldlg.obj & dynarray.obj & dynlib.obj & + dynload.obj & effects.obj & encconv.obj & event.obj & @@ -146,12 +147,14 @@ COMMONOBJS = & geometry.obj & gifdecod.obj & hash.obj & + hashmap.obj & helpbase.obj & http.obj & imagall.obj & imagbmp.obj & image.obj & imaggif.obj & + imagiff.obj & imagjpeg.obj & imagpcx.obj & imagpng.obj & @@ -173,7 +176,6 @@ COMMONOBJS = & mstream.obj & nbkbase.obj & object.obj & - objstrm.obj & odbc.obj & paper.obj & popupcmn.obj & @@ -188,7 +190,6 @@ COMMONOBJS = & sckfile.obj & sckipc.obj & sckstrm.obj & - serbase.obj & sizer.obj & socket.obj & statbar.obj & @@ -349,13 +350,24 @@ HTMLOBJS = helpctrl.obj & m_list.obj & m_meta.obj & m_pre.obj & + m_style.obj & m_tables.obj & winpars.obj # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc. OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS) -all: $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS) .SYMBOLIC +ARCHINCDIR=$(WXDIR)\lib\msw +SETUP_H=$(ARCHINCDIR)\wx\setup.h + +all: $(SETUP_H) $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS) .SYMBOLIC + +$(ARCHINCDIR)\wx: + mkdir $(ARCHINCDIR) + mkdir $(ARCHINCDIR)\wx + +$(SETUP_H): $(WXDIR)\include\wx\msw\setup.h $(ARCHINCDIR)\wx + copy $(WXDIR)\include\wx\msw\setup.h $@ $(LIBTARGET) : $(OBJECTS) %create tmp.lbc @@ -793,6 +805,9 @@ dynarray.obj: $(COMMDIR)\dynarray.cpp dynlib.obj: $(COMMDIR)\dynlib.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +dynload.obj: $(COMMDIR)\dynload.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + effects.obj: $(COMMDIR)\effects.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -862,6 +877,9 @@ gifdecod.obj: $(COMMDIR)\gifdecod.cpp hash.obj: $(COMMDIR)\hash.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +hashmap.obj: $(COMMDIR)\hashmap.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + helpbase.obj: $(COMMDIR)\helpbase.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -880,6 +898,9 @@ image.obj: $(COMMDIR)\image.cpp imaggif.obj: $(COMMDIR)\imaggif.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +imagiff.obj: $(COMMDIR)\imagiff.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + imagjpeg.obj: $(COMMDIR)\imagjpeg.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -943,9 +964,6 @@ nbkbase.obj: $(COMMDIR)\nbkbase.cpp object.obj: $(COMMDIR)\object.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< -objstrm.obj: $(COMMDIR)\objstrm.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< - odbc.obj: $(COMMDIR)\odbc.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -988,9 +1006,6 @@ sckipc.obj: $(COMMDIR)\sckipc.cpp sckstrm.obj: $(COMMDIR)\sckstrm.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< -serbase.obj: $(COMMDIR)\serbase.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< - sizer.obj: $(COMMDIR)\sizer.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -1248,6 +1263,9 @@ m_meta.obj: $(HTMLDIR)\m_meta.cpp m_pre.obj: $(HTMLDIR)\m_pre.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +m_style.obj: $(HTMLDIR)\m_style.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + m_tables.obj: $(HTMLDIR)\m_tables.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -1256,56 +1274,6 @@ winpars.obj: $(HTMLDIR)\winpars.cpp - -OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \ - trees$(O) -OBJ2 = zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) \ - infutil$(O) inffast$(O) - -adler32.obj: adler32.c zutil.h zlib.h zconf.h - $(CC) -c $(CFLAGS) $*.c - -compress.obj: compress.c zlib.h zconf.h - $(CC) -c $(CFLAGS) $*.c - -crc32.obj: crc32.c zutil.h zlib.h zconf.h - $(CC) -c $(CFLAGS) $*.c - -deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h - $(CC) -c $(CFLAGS) $*.c - -gzio.obj: gzio.c zutil.h zlib.h zconf.h - $(CC) -c $(CFLAGS) $*.c - -infblock.obj: infblock.c zutil.h zlib.h zconf.h infblock.h inftrees.h\ - infcodes.h infutil.h - $(CC) -c $(CFLAGS) $*.c - -infcodes.obj: infcodes.c zutil.h zlib.h zconf.h inftrees.h infutil.h\ - infcodes.h inffast.h - $(CC) -c $(CFLAGS) $*.c - -inflate.obj: inflate.c zutil.h zlib.h zconf.h infblock.h - $(CC) -c $(CFLAGS) $*.c - -inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h - $(CC) -c $(CFLAGS) $*.c - -infutil.obj: infutil.c zutil.h zlib.h zconf.h inftrees.h infutil.h - $(CC) -c $(CFLAGS) $*.c - -inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h infutil.h inffast.h - $(CC) -c $(CFLAGS) $*.c - -trees.obj: trees.c deflate.h zutil.h zlib.h zconf.h - $(CC) -c $(CFLAGS) $*.c - -uncompr.obj: uncompr.c zlib.h zconf.h - $(CC) -c $(CFLAGS) $*.c - -zutil.obj: zutil.c zutil.h zlib.h zconf.h - $(CC) -c $(CFLAGS) $*.c - png: .SYMBOLIC cd $(WXDIR)\src\png wmake -f makefile.wat all @@ -1346,6 +1314,16 @@ clean_tiff: .SYMBOLIC wmake -f makefile.wat clean cd $(WXDIR)\src\msw +regex: .SYMBOLIC + cd $(WXDIR)\src\regex + wmake -f makefile.wat all + cd $(WXDIR)\src\msw + +clean_regex: .SYMBOLIC + cd $(WXDIR)\src\regex + wmake -f makefile.wat clean + cd $(WXDIR)\src\msw + MFTYPE=wat self : .SYMBOLIC $(WXDIR)\distrib\msw\tmake\filelist.txt $(WXDIR)\distrib\msw\tmake\$(MFTYPE).t cd $(WXDIR)\distrib\msw\tmake