From 3877d3b5bceea730a2c39786ca94ac2066e99ab0 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 31 Mar 2000 18:21:40 +0000 Subject: [PATCH] regenerated makefiles from templates git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7019 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/files.lst | 16 +++++++++++++--- src/gtk/files.lst | 3 ++- src/gtk1/files.lst | 3 ++- src/motif/files.lst | 3 ++- src/msw/files.lst | 3 ++- src/msw/makefile.b32 | 7 +------ src/msw/makefile.bcc | 2 +- src/msw/makefile.dos | 2 +- src/msw/makefile.g95 | 2 +- src/msw/makefile.sc | 2 +- src/msw/makefile.vc | 8 +++----- src/msw/makefile.wat | 2 +- 12 files changed, 30 insertions(+), 23 deletions(-) diff --git a/src/files.lst b/src/files.lst index 51e0cf1cce..14b8289f11 100644 --- a/src/files.lst +++ b/src/files.lst @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 19:26, 2000/03/20 +# This file was automatically generated by tmake at 20:17, 2000/03/31 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BASE.T! ALL_SOURCES = \ common/init.cpp \ @@ -9,6 +9,7 @@ ALL_SOURCES = \ common/datstrm.cpp \ common/dynarray.cpp \ common/dynlib.cpp \ + common/encconv.cpp \ common/event.cpp \ common/extended.c \ common/ffile.cpp \ @@ -16,6 +17,7 @@ ALL_SOURCES = \ common/fileconf.cpp \ common/filefn.cpp \ common/filesys.cpp \ + common/fontmap.cpp \ common/fs_inet.cpp \ common/fs_mem.cpp \ common/fs_zip.cpp \ @@ -78,12 +80,16 @@ ALL_HEADERS = \ dir.h \ dynarray.h \ dynlib.h \ + encconv.h \ event.h \ ffile.h \ file.h \ fileconf.h \ filefn.h \ filesys.h \ + fontenc.h \ + fontmap.h \ + fontutil.h \ fs_inet.h \ fs_mem.h \ fs_zip.h \ @@ -137,8 +143,6 @@ ALL_HEADERS = \ protocol/protocol.h BASE_OBJS = \ - fontmap.o \ - encconv.o \ init.o \ appcmn.o \ cmdline.o \ @@ -147,6 +151,7 @@ BASE_OBJS = \ datstrm.o \ dynarray.o \ dynlib.o \ + encconv.o \ event.o \ extended.o \ ffile.o \ @@ -154,6 +159,7 @@ BASE_OBJS = \ fileconf.o \ filefn.o \ filesys.o \ + fontmap.o \ fs_inet.o \ fs_mem.o \ fs_zip.o \ @@ -203,6 +209,7 @@ BASE_DEPS = \ datstrm.d \ dynarray.d \ dynlib.d \ + encconv.d \ event.d \ extended.d \ ffile.d \ @@ -210,6 +217,7 @@ BASE_DEPS = \ fileconf.d \ filefn.d \ filesys.d \ + fontmap.d \ fs_inet.d \ fs_mem.d \ fs_zip.d \ @@ -266,6 +274,7 @@ BASE_DEPS = \ datstrm.d \ dynarray.d \ dynlib.d \ + encconv.d \ event.d \ extended.d \ ffile.d \ @@ -273,6 +282,7 @@ BASE_DEPS = \ fileconf.d \ filefn.d \ filesys.d \ + fontmap.d \ fs_inet.d \ fs_mem.d \ fs_zip.d \ diff --git a/src/gtk/files.lst b/src/gtk/files.lst index 3703c7ec8d..1a9155553a 100644 --- a/src/gtk/files.lst +++ b/src/gtk/files.lst @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 08:23, 2000/03/21 +# This file was automatically generated by tmake at 20:17, 2000/03/31 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T! ALL_SOURCES = \ generic/busyinfo.cpp \ @@ -290,6 +290,7 @@ ALL_HEADERS = \ filesys.h \ font.h \ fontdlg.h \ + fontenc.h \ fontenum.h \ fontmap.h \ fontutil.h \ diff --git a/src/gtk1/files.lst b/src/gtk1/files.lst index 3703c7ec8d..1a9155553a 100644 --- a/src/gtk1/files.lst +++ b/src/gtk1/files.lst @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 08:23, 2000/03/21 +# This file was automatically generated by tmake at 20:17, 2000/03/31 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T! ALL_SOURCES = \ generic/busyinfo.cpp \ @@ -290,6 +290,7 @@ ALL_HEADERS = \ filesys.h \ font.h \ fontdlg.h \ + fontenc.h \ fontenum.h \ fontmap.h \ fontutil.h \ diff --git a/src/motif/files.lst b/src/motif/files.lst index 27980f1c4b..f36c786991 100644 --- a/src/motif/files.lst +++ b/src/motif/files.lst @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 15:55, 2000/03/14 +# This file was automatically generated by tmake at 20:17, 2000/03/31 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MOTIF.T! ALL_SOURCES = \ generic/busyinfo.cpp \ @@ -287,6 +287,7 @@ ALL_HEADERS = \ filesys.h \ font.h \ fontdlg.h \ + fontenc.h \ fontenum.h \ fontmap.h \ fontutil.h \ diff --git a/src/msw/files.lst b/src/msw/files.lst index bfa83e762b..9f2dbf0ea6 100644 --- a/src/msw/files.lst +++ b/src/msw/files.lst @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 16:18, 2000/03/29 +# This file was automatically generated by tmake at 20:17, 2000/03/31 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MSW.T! ALL_SOURCES = \ generic/busyinfo.cpp \ @@ -302,6 +302,7 @@ ALL_HEADERS = \ filesys.h \ font.h \ fontdlg.h \ + fontenc.h \ fontenum.h \ fontmap.h \ fontutil.h \ diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32 index a221c0d91d..a9bdcb117a 100644 --- a/src/msw/makefile.b32 +++ b/src/msw/makefile.b32 @@ -1,6 +1,6 @@ -# This file was automatically generated by tmake at 15:55, 2000/03/14 +# This file was automatically generated by tmake at 20:16, 2000/03/31 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T! # @@ -991,11 +991,6 @@ $(DEBUG_FLAGS) $(WIN95FLAG) ! $(CFG) -#$(LNKCFG): makefile.b32 -# copy &&! -#-L$(WXLIBDIR);$(WXLIBDIR2);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk -#! $(LNKCFG) - clean: $(PERIPH_CLEAN_TARGET) -erase $(LIBTARGET) -erase *.obj diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc index 456a7e3de2..f45b412eaf 100644 --- a/src/msw/makefile.bcc +++ b/src/msw/makefile.bcc @@ -1,6 +1,6 @@ -# This file was automatically generated by tmake at 16:08, 2000/03/20 +# This file was automatically generated by tmake at 20:13, 2000/03/31 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T! # diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos index afd69682d1..8d399e3d49 100644 --- a/src/msw/makefile.dos +++ b/src/msw/makefile.dos @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 15:55, 2000/03/14 +# This file was automatically generated by tmake at 20:13, 2000/03/31 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T! # diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95 index 27a9d79c74..418480f30d 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/03/14 +# This file was automatically generated by tmake at 20:13, 2000/03/31 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T! # diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc index cf69648015..91fdd854c5 100644 --- a/src/msw/makefile.sc +++ b/src/msw/makefile.sc @@ -1,6 +1,6 @@ -# This file was automatically generated by tmake at 15:55, 2000/03/14 +# This file was automatically generated by tmake at 20:13, 2000/03/31 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T! # Symantec C++ makefile for the msw objects diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc index 536fe6c0a1..a1ba23a7a8 100644 --- a/src/msw/makefile.vc +++ b/src/msw/makefile.vc @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 11:20, 2000/03/17 +# This file was automatically generated by tmake at 20:13, 2000/03/31 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T! # File: makefile.vc @@ -27,8 +27,6 @@ LIBTARGET=$(WXLIB) DUMMYOBJ=$D\dummy.obj !endif -USE_GLCANVAS=1 - # Please set these according to the settings in setup.h, so we can include # the appropriate libraries in wx.lib @@ -467,7 +465,7 @@ $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /c /Tp dummydll.cpp << # Compile certain files with no optimization (some files cause a -# compiler crash for buggy versions of VC++, e.g. 4.0) +# compiler crash for buggy versions of VC++, e.g. 4.0). # Don't forget to put FINAL=1 on the command line. noopt: cl @<< @@ -616,7 +614,7 @@ rcparser: nmake -f makefile.vc FINAL=$(FINAL) cd $(WXDIR)\src\msw -cleanall: clean clean_png clean_zlib clean_xpm clean_jpeg clean_tiff +cleanall: clean_png clean_zlib clean_xpm clean_jpeg clean_tiff -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).dll -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).lib -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).exp diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat index b342d6efad..3cedbc3bfa 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 15:55, 2000/03/14 +# This file was automatically generated by tmake at 20:13, 2000/03/31 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T! #