From 791a21023fc590d8f99268dad424fcc3c0161307 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 14 Oct 1999 12:55:26 +0000 Subject: [PATCH] init.cpp isn't included in the makefiles for wxMSW any more git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3988 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 8 +- distrib/msw/tmake/filelist.t | 4 +- distrib/msw/tmake/filelist.txt | 232 ++++++++++++++++----------------- distrib/msw/tmake/unx.t | 19 ++- distrib/msw/tmake/vc6.t | 5 +- distrib/msw/tmake/vc6dll.t | 1 - src/msw/makefile.b32 | 8 +- src/msw/makefile.bcc | 8 +- src/msw/makefile.dos | 14 +- src/msw/makefile.g95 | 36 ++--- src/msw/makefile.sc | 4 +- src/msw/makefile.vc | 2 +- src/msw/makefile.wat | 10 +- 13 files changed, 180 insertions(+), 171 deletions(-) diff --git a/Makefile.in b/Makefile.in index f5cf478c72..2d7560d84a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,5 +1,5 @@ # -# This file was automatically generated by tmake at 15:31, 1999/10/14 +# This file was automatically generated by tmake at 14:54, 1999/10/14 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T! # @@ -1627,6 +1627,7 @@ MSW_GUIOBJS = \ settings.o \ slider95.o \ spinbutt.o \ + spinctrl.o \ statbmp.o \ statbox.o \ statbr95.o \ @@ -1713,6 +1714,7 @@ MSW_GUIDEPS = \ settings.d \ slider95.d \ spinbutt.d \ + spinctrl.d \ statbmp.d \ statbox.d \ statbr95.d \ @@ -1733,6 +1735,7 @@ MSW_GUIDEPS = \ xpmhand.d BASE_OBJS = \ + init.o \ config.o \ date.o \ dynarray.o \ @@ -1745,7 +1748,6 @@ BASE_OBJS = \ filefn.o \ filesys.o \ hash.o \ - init.o \ intl.o \ list.o \ log.o \ @@ -1767,6 +1769,7 @@ BASE_OBJS = \ utilsunx.o BASE_DEPS = \ + init.d \ config.d \ date.d \ dynarray.d \ @@ -1779,7 +1782,6 @@ BASE_DEPS = \ filefn.d \ filesys.d \ hash.d \ - init.d \ intl.d \ list.d \ log.d \ diff --git a/distrib/msw/tmake/filelist.t b/distrib/msw/tmake/filelist.t index e2536e1108..18ce139b37 100644 --- a/distrib/msw/tmake/filelist.t +++ b/distrib/msw/tmake/filelist.t @@ -47,6 +47,8 @@ $wxHTML{$fields[0]} = $fields[2]; } elsif ( $fields[1] eq "U" ) { $wxUNIX{$fields[0]} = $fields[2]; + } elsif ( $fields[1] eq "B" ) { + $wxBase{$fields[0]} = $fields[2]; } elsif ( $fields[1] eq "W" ) { $wxWXINCLUDE{$fields[0]} = $fields[2]; } elsif ( $fields[1] eq "P" ) { @@ -55,7 +57,7 @@ $wxHTMLINCLUDE{$fields[0]} = $fields[2]; } elsif ( $fields[1] eq "F" ) { $wxMOTIFINCLUDE{$fields[0]} = $fields[2]; - } elsif ( $fields[1] eq "B" ) { + } elsif ( $fields[1] eq "9" ) { $wxMSWINCLUDE{$fields[0]} = $fields[2]; } elsif ( $fields[1] eq "K" ) { $wxGTKINCLUDE{$fields[0]} = $fields[2]; diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt index ea044999ae..5ddfbf0a73 100644 --- a/distrib/msw/tmake/filelist.txt +++ b/distrib/msw/tmake/filelist.txt @@ -7,6 +7,7 @@ # # Format of this file: TAB separated columns. The first column contains the # filename, the second a letter corresonding a directory: +# B /src/common but only needed for the wxBase compilation # G /src/generic # C /src/common # M /src/msw @@ -17,7 +18,7 @@ # W /include/wx # K /include/wx/gtk K for gtK # F /include/wx/motif F for motiF -# B /include/wx/msw B for Bill Gates +# 9 /include/wx/msw 9 for Windows 9x # N /include/wx/generic N for geNeric # L /include/wx/html L for htmL # P /include/wx/protocol @@ -29,7 +30,6 @@ # # Known flags: # B makes part of the base library too -# BO only for the base library # 16 a generic file implementing Win32 control for Win16 # 32 only can be compiled under Win32 # PS PostScript related file, normally not compiled under Windows @@ -130,7 +130,7 @@ imagjpeg.cpp C 32 imagpcx.cpp C 32 imagpng.cpp C 32 imagpnm.cpp C 32 -init.cpp C B,BO +init.cpp B intl.cpp C B ipcbase.cpp C layout.cpp C @@ -713,119 +713,119 @@ timer.h F toolbar.h F window.h F -accel.h B -app.h B -bitmap.h B -bmpbuttn.h B -brush.h B -button.h B -caret.h B -checkbox.h B -checklst.h B -choice.h B -clipbrd.h B -colordlg.h B -colour.h B -combobox.h B -control.h B -curico.h B -curicop.h B -cursor.h B -dc.h B -dcclient.h B -dcmemory.h B -dcprint.h B -dcscreen.h B -dde.h B -dialog.h B -dib.h B -dibutils.h B -dirdlg.h B -dragimag.h B -filedlg.h B -font.h B -fontdlg.h B -frame.h B -gauge.h B -gauge95.h B -gaugemsw.h B -gdiobj.h B -helpwin.h B -icon.h B -imaglist.h B -iniconf.h B -joystick.h B -listbox.h B -listctrl.h B -mdi.h B -menu.h B -menuitem.h B -metafile.h B -minifram.h B -msgdlg.h B -msvcrt.h B -notebook.h B -palette.h B -pen.h B -pnghand.h B -pngread.h B -printdlg.h B -printwin.h B -private.h B -radiobox.h B -radiobut.h B -regconf.h B -region.h B -registry.h B -scrolbar.h B -settings.h B -setup0.h B -slider.h B -slider95.h B -slidrmsw.h B -spinbutt.h B -statbmp.h B -statbox.h B -statbr95.h B -statline.h B -stattext.h B -tabctrl.h B -taskbar.h B -tbar95.h B -tbarmsw.h B -textctrl.h B -timer.h B -tooltip.h B -treectrl.h B -wave.h B -window.h B -winundef.h B -xpmhand.h B -# blank.cur B -# bullseye.cur B -# child.ico B -# clock.cur B -# error.ico B -# hand.cur B -# heart.cur B -# info.ico B -# magnif1.cur B -# mdi.ico B -# noentry.cur B -# pbrush.cur B -# pencil.cur B -# pntleft.cur B -# pntright.cur B -# query.cur B -# question.ico B -# roller.cur B -# size.cur B -# std.ico B -# tip.ico B -# warning.ico B -# watch1.cur B -# disable.bmp B -# wx.rc B +accel.h 9 +app.h 9 +bitmap.h 9 +bmpbuttn.h 9 +brush.h 9 +button.h 9 +caret.h 9 +checkbox.h 9 +checklst.h 9 +choice.h 9 +clipbrd.h 9 +colordlg.h 9 +colour.h 9 +combobox.h 9 +control.h 9 +curico.h 9 +curicop.h 9 +cursor.h 9 +dc.h 9 +dcclient.h 9 +dcmemory.h 9 +dcprint.h 9 +dcscreen.h 9 +dde.h 9 +dialog.h 9 +dib.h 9 +dibutils.h 9 +dirdlg.h 9 +dragimag.h 9 +filedlg.h 9 +font.h 9 +fontdlg.h 9 +frame.h 9 +gauge.h 9 +gauge95.h 9 +gaugemsw.h 9 +gdiobj.h 9 +helpwin.h 9 +icon.h 9 +imaglist.h 9 +iniconf.h 9 +joystick.h 9 +listbox.h 9 +listctrl.h 9 +mdi.h 9 +menu.h 9 +menuitem.h 9 +metafile.h 9 +minifram.h 9 +msgdlg.h 9 +msvcrt.h 9 +notebook.h 9 +palette.h 9 +pen.h 9 +pnghand.h 9 +pngread.h 9 +printdlg.h 9 +printwin.h 9 +private.h 9 +radiobox.h 9 +radiobut.h 9 +regconf.h 9 +region.h 9 +registry.h 9 +scrolbar.h 9 +settings.h 9 +setup0.h 9 +slider.h 9 +slider95.h 9 +slidrmsw.h 9 +spinbutt.h 9 +statbmp.h 9 +statbox.h 9 +statbr95.h 9 +statline.h 9 +stattext.h 9 +tabctrl.h 9 +taskbar.h 9 +tbar95.h 9 +tbarmsw.h 9 +textctrl.h 9 +timer.h 9 +tooltip.h 9 +treectrl.h 9 +wave.h 9 +window.h 9 +winundef.h 9 +xpmhand.h 9 +# blank.cur 9 +# bullseye.cur 9 +# child.ico 9 +# clock.cur 9 +# error.ico 9 +# hand.cur 9 +# heart.cur 9 +# info.ico 9 +# magnif1.cur 9 +# mdi.ico 9 +# noentry.cur 9 +# pbrush.cur 9 +# pencil.cur 9 +# pntleft.cur 9 +# pntright.cur 9 +# query.cur 9 +# question.ico 9 +# roller.cur 9 +# size.cur 9 +# std.ico 9 +# tip.ico 9 +# warning.ico 9 +# watch1.cur 9 +# disable.bmp 9 +# wx.rc 9 execute.h S diff --git a/distrib/msw/tmake/unx.t b/distrib/msw/tmake/unx.t index 6e7d6cd0ce..13b1f1e07d 100644 --- a/distrib/msw/tmake/unx.t +++ b/distrib/msw/tmake/unx.t @@ -12,7 +12,7 @@ IncludeTemplate("filelist.t"); #! Generic - + foreach $file (sort keys %wxGeneric) { #! native wxDirDlg can't be compiled due to GnuWin32/OLE limitations, #! so take the generic version @@ -48,8 +48,18 @@ $project{"WXMOTIF_GENERICDEPS"} .= $file2 . " " } + #! Base + + foreach $file (sort keys %wxBase) { + ($fileobj = $file) =~ s/cp?p?$/\o/; + ($filedep = $file) =~ s/cp?p?$/\d/; + + $project{"BASE_OBJS"} .= $fileobj . " "; + $project{"BASE_DEPS"} .= $filedep . " "; + } + #! Common - + foreach $file (sort keys %wxCommon) { ($fileobj = $file) =~ s/cp?p?$/\o/; ($filedep = $file) =~ s/cp?p?$/\d/; @@ -60,9 +70,6 @@ $project{"BASE_DEPS"} .= $filedep . " "; } - #! if it's the wxBase-only file, nothing more to do with it - next if $wxCommon{$file} =~ /\bBO\b/; - if ( $wxCommon{$file} !~ /\bR\b/ ) { #! unless not for GTK $project{"WXGTK_COMMONOBJS"} .= $fileobj . " "; $project{"WXGTK_COMMONDEPS"} .= $filedep . " " @@ -80,7 +87,7 @@ } #! GUI - + foreach $file (sort keys %wxMSW) { #! Mingw32 doesn't have the OLE headers and has some troubles with #! socket code diff --git a/distrib/msw/tmake/vc6.t b/distrib/msw/tmake/vc6.t index e7220215eb..79796d7e75 100644 --- a/distrib/msw/tmake/vc6.t +++ b/distrib/msw/tmake/vc6.t @@ -19,7 +19,6 @@ foreach $file (sort keys %wxCommon) { next if $wxCommon{$file} =~ /\b16\b/; - next if $wxCommon{$file} =~ /\bBO\b/; my $tag = $file =~ /\.c$/ ? "WXCSRCS" : "WXCOMMONSRCS"; $project{$tag} .= $file . " " @@ -29,8 +28,8 @@ next if $wxMSW{$file} =~ /\b16\b/; my $tag; - if ( $wxMSW{$file} =~ /\bO\b/ ) { $tag = "WXOLESRCS" } - else { $tag = $file =~ /\.c$/ ? "WXMSWCSRCS" : "WXMSWSRCS" } + if ( $wxMSW{$file} =~ /\bO\b/ ) { $tag = "WXOLESRCS" } + else { $tag = $file =~ /\.c$/ ? "WXMSWCSRCS" : "WXMSWSRCS" } $project{$tag} .= $file . " " } diff --git a/distrib/msw/tmake/vc6dll.t b/distrib/msw/tmake/vc6dll.t index af3a6facc5..ce5182d4f9 100644 --- a/distrib/msw/tmake/vc6dll.t +++ b/distrib/msw/tmake/vc6dll.t @@ -19,7 +19,6 @@ foreach $file (sort keys %wxCommon) { next if $wxCommon{$file} =~ /\b16\b/; - next if $wxCommon{$file} =~ /\bBO\b/; my $tag = $file =~ /\.c$/ ? "WXCSRCS" : "WXCOMMONSRCS"; $project{$tag} .= $file . " " diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32 index 87f9c9ac70..4a13bde399 100644 --- a/src/msw/makefile.b32 +++ b/src/msw/makefile.b32 @@ -1,6 +1,6 @@ -# This file was automatically generated by tmake at 15:31, 1999/10/14 +# This file was automatically generated by tmake at 14:54, 1999/10/14 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T! # @@ -148,7 +148,6 @@ COMMONOBJS = \ $(MSWDIR)\imagpcx.obj \ $(MSWDIR)\imagpng.obj \ $(MSWDIR)\imagpnm.obj \ - $(MSWDIR)\init.obj \ $(MSWDIR)\intl.obj \ $(MSWDIR)\ipcbase.obj \ $(MSWDIR)\layout.obj \ @@ -269,6 +268,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \ $(MSWDIR)\settings.obj \ $(MSWDIR)\slider95.obj \ $(MSWDIR)\spinbutt.obj \ + $(MSWDIR)\spinctrl.obj \ $(MSWDIR)\statbmp.obj \ $(MSWDIR)\statbox.obj \ $(MSWDIR)\statbr95.obj \ @@ -480,6 +480,8 @@ $(MSWDIR)\slider95.obj: $(MSWDIR)\slider95.$(SRCSUFF) $(MSWDIR)\spinbutt.obj: $(MSWDIR)\spinbutt.$(SRCSUFF) +$(MSWDIR)\spinctrl.obj: $(MSWDIR)\spinctrl.$(SRCSUFF) + $(MSWDIR)\statbmp.obj: $(MSWDIR)\statbmp.$(SRCSUFF) $(MSWDIR)\statbox.obj: $(MSWDIR)\statbox.$(SRCSUFF) @@ -601,8 +603,6 @@ $(MSWDIR)\imagpng.obj: $(COMMDIR)\imagpng.$(SRCSUFF) $(MSWDIR)\imagpnm.obj: $(COMMDIR)\imagpnm.$(SRCSUFF) -$(MSWDIR)\init.obj: $(COMMDIR)\init.$(SRCSUFF) - $(MSWDIR)\intl.obj: $(COMMDIR)\intl.$(SRCSUFF) $(MSWDIR)\ipcbase.obj: $(COMMDIR)\ipcbase.$(SRCSUFF) diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc index 7c14c2ec44..b25de61c34 100644 --- a/src/msw/makefile.bcc +++ b/src/msw/makefile.bcc @@ -1,6 +1,6 @@ -# This file was automatically generated by tmake at 15:31, 1999/10/14 +# This file was automatically generated by tmake at 14:54, 1999/10/14 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T! # @@ -133,7 +133,6 @@ COMMONOBJS = \ $(MSWDIR)\imagbmp.obj \ $(MSWDIR)\image.obj \ $(MSWDIR)\imaggif.obj \ - $(MSWDIR)\init.obj \ $(MSWDIR)\intl.obj \ $(MSWDIR)\ipcbase.obj \ $(MSWDIR)\layout.obj \ @@ -235,6 +234,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \ $(MSWDIR)\settings.obj \ $(MSWDIR)\slidrmsw.obj \ $(MSWDIR)\spinbutt.obj \ + $(MSWDIR)\spinctrl.obj \ $(MSWDIR)\statbmp.obj \ $(MSWDIR)\statbox.obj \ $(MSWDIR)\statline.obj \ @@ -400,6 +400,8 @@ $(MSWDIR)\slidrmsw.obj: $(MSWDIR)\slidrmsw.$(SRCSUFF) $(MSWDIR)\spinbutt.obj: $(MSWDIR)\spinbutt.$(SRCSUFF) +$(MSWDIR)\spinctrl.obj: $(MSWDIR)\spinctrl.$(SRCSUFF) + $(MSWDIR)\statbmp.obj: $(MSWDIR)\statbmp.$(SRCSUFF) $(MSWDIR)\statbox.obj: $(MSWDIR)\statbox.$(SRCSUFF) @@ -497,8 +499,6 @@ $(MSWDIR)\image.obj: $(COMMDIR)\image.$(SRCSUFF) $(MSWDIR)\imaggif.obj: $(COMMDIR)\imaggif.$(SRCSUFF) -$(MSWDIR)\init.obj: $(COMMDIR)\init.$(SRCSUFF) - $(MSWDIR)\intl.obj: $(COMMDIR)\intl.$(SRCSUFF) $(MSWDIR)\ipcbase.obj: $(COMMDIR)\ipcbase.$(SRCSUFF) diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos index 27e6602963..c717c3c56e 100644 --- a/src/msw/makefile.dos +++ b/src/msw/makefile.dos @@ -1,6 +1,6 @@ -# This file was automatically generated by tmake at 15:31, 1999/10/14 +# This file was automatically generated by tmake at 14:54, 1999/10/14 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T! # @@ -120,7 +120,6 @@ COMMONOBJS = \ $(COMMDIR)\imagbmp.obj \ $(COMMDIR)\image.obj \ $(COMMDIR)\imaggif.obj \ - $(COMMDIR)\init.obj \ $(COMMDIR)\intl.obj \ $(COMMDIR)\ipcbase.obj \ $(COMMDIR)\layout.obj \ @@ -222,6 +221,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \ $(MSWDIR)\settings.obj \ $(MSWDIR)\slidrmsw.obj \ $(MSWDIR)\spinbutt.obj \ + $(MSWDIR)\spinctrl.obj \ $(MSWDIR)\statbmp.obj \ $(MSWDIR)\statbox.obj \ $(MSWDIR)\statline.obj \ @@ -607,6 +607,11 @@ $(MSWDIR)/spinbutt.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << +$(MSWDIR)/spinctrl.obj: $*.$(SRCSUFF) + cl @<< +$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) +<< + $(MSWDIR)/statbmp.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) @@ -837,11 +842,6 @@ $(COMMDIR)/imaggif.obj: $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) << -$(COMMDIR)/init.obj: $*.$(SRCSUFF) - cl @<< -$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) -<< - $(COMMDIR)/intl.obj: $*.$(SRCSUFF) cl @<< $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95 index ea2c448976..3f3fe7b866 100644 --- a/src/msw/makefile.g95 +++ b/src/msw/makefile.g95 @@ -1,5 +1,5 @@ -# This file was automatically generated by tmake at 15:31, 1999/10/14 +# This file was automatically generated by tmake at 14:54, 1999/10/14 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T! # @@ -99,7 +99,6 @@ COMMONOBJS = \ $(COMMDIR)/imagpcx.$(OBJSUFF) \ $(COMMDIR)/imagpng.$(OBJSUFF) \ $(COMMDIR)/imagpnm.$(OBJSUFF) \ - $(COMMDIR)/init.$(OBJSUFF) \ $(COMMDIR)/intl.$(OBJSUFF) \ $(COMMDIR)/ipcbase.$(OBJSUFF) \ $(COMMDIR)/layout.$(OBJSUFF) \ @@ -235,6 +234,7 @@ MSWOBJS = \ $(MSWDIR)/settings.$(OBJSUFF) \ $(MSWDIR)/slider95.$(OBJSUFF) \ $(MSWDIR)/spinbutt.$(OBJSUFF) \ + $(MSWDIR)/spinctrl.$(OBJSUFF) \ $(MSWDIR)/statbmp.$(OBJSUFF) \ $(MSWDIR)/statbox.$(OBJSUFF) \ $(MSWDIR)/statbr95.$(OBJSUFF) \ @@ -399,21 +399,21 @@ $(COMMDIR)/lex_yy.c: $(COMMDIR)/doslex.c # mv y.tab.c $(COMMDIR)/y_tab.c clean: - rm -f *.o - rm -f *.bak - rm -f core - rm -f ..\common\y_tab.c - rm -f ..\common\lex_yy.c - rm -f ..\common\*.o - rm -f ..\common\*.bak - rm -f ..\generic\*.o - rm -f ..\generic\*.bak - rm -f ..\html\*.o - rm -f ..\png\*.o - rm -f ..\png\*.bak - rm -f ..\zlib\*.o - rm -f ..\zlib\*.bak - rm -f ..\jpeg\*.o - rm -f ..\..\lib\libwx.a + -erase *.o + -erase *.bak + -erase core + -erase ..\common\y_tab.c + -erase ..\common\lex_yy.c + -erase ..\common\*.o + -erase ..\common\*.bak + -erase ..\generic\*.o + -erase ..\generic\*.bak + -erase ..\html\*.o + -erase ..\png\*.o + -erase ..\png\*.bak + -erase ..\zlib\*.o + -erase ..\zlib\*.bak + -erase ..\jpeg\*.o + -erase ..\..\lib\libwx.a cleanall: clean diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc index 501d0accdc..342f65c38f 100644 --- a/src/msw/makefile.sc +++ b/src/msw/makefile.sc @@ -1,6 +1,6 @@ -# This file was automatically generated by tmake at 15:31, 1999/10/14 +# This file was automatically generated by tmake at 14:54, 1999/10/14 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T! # Symantec C++ makefile for the msw objects @@ -87,7 +87,6 @@ COMMONOBJS = \ $(COMMDIR)\imagpcx.obj \ $(COMMDIR)\imagpng.obj \ $(COMMDIR)\imagpnm.obj \ - $(COMMDIR)\init.obj \ $(COMMDIR)\intl.obj \ $(COMMDIR)\ipcbase.obj \ $(COMMDIR)\layout.obj \ @@ -207,6 +206,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \ $(MSWDIR)\slider95.obj \ $(MSWDIR)\slidrmsw.obj \ $(MSWDIR)\spinbutt.obj \ + $(MSWDIR)\spinctrl.obj \ $(MSWDIR)\statbmp.obj \ $(MSWDIR)\statbox.obj \ $(MSWDIR)\statbr95.obj \ diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc index 8af82bc42d..64c55f907d 100644 --- a/src/msw/makefile.vc +++ b/src/msw/makefile.vc @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 11:44, 1999/10/14 +# This file was automatically generated by tmake at 14:54, 1999/10/14 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T! # File: makefile.vc diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat index e3442ce622..c8e0ca2d00 100644 --- a/src/msw/makefile.wat +++ b/src/msw/makefile.wat @@ -1,6 +1,6 @@ -# This file was automatically generated by tmake at 15:31, 1999/10/14 +# This file was automatically generated by tmake at 14:54, 1999/10/14 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T! #!/binb/wmake.exe @@ -112,7 +112,6 @@ COMMONOBJS = & imagpcx.obj & imagpng.obj & imagpnm.obj & - init.obj & intl.obj & ipcbase.obj & layout.obj & @@ -233,6 +232,7 @@ MSWOBJS = accel.obj & slider95.obj & slidrmsw.obj & spinbutt.obj & + spinctrl.obj & statbmp.obj & statbox.obj & statbr95.obj & @@ -491,6 +491,9 @@ slidrmsw.obj: $(MSWDIR)\slidrmsw.cpp spinbutt.obj: $(MSWDIR)\spinbutt.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< +spinctrl.obj: $(MSWDIR)\spinctrl.cpp + *$(CCC) $(CPPFLAGS) $(IFLAGS) $< + statbmp.obj: $(MSWDIR)\statbmp.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< @@ -667,9 +670,6 @@ imagpng.obj: $(COMMDIR)\imagpng.cpp imagpnm.obj: $(COMMDIR)\imagpnm.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $< -init.obj: $(COMMDIR)\init.cpp - *$(CCC) $(CPPFLAGS) $(IFLAGS) $< - intl.obj: $(COMMDIR)\intl.cpp *$(CCC) $(CPPFLAGS) $(IFLAGS) $<