Makefile updates from new filelist.txt

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3628 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 9761025d2dba36e441e8d9239323117cefba56b6..428eecd0fc641fb886748fd6c3c7ee4a5081b228 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 13:13, 1999/09/12
+# This file was automatically generated by tmake at 21:04, 1999/09/12
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
 
 #

diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc
index e68593c8f44f7d50bb1b1d8e11c7bd9cde8b0518..0b1884627c761a9e5d9b668c2f8164e425954ac1 100644 (file)
--- a/src/msw/makefile.bcc
+++ b/src/msw/makefile.bcc
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 13:13, 1999/09/12
+# This file was automatically generated by tmake at 21:04, 1999/09/12
 # 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 5d9f005682f86211114a85186f410856085ba9b8..7abdfb39add787e29a2654e7e09733355fdbbf2a 100644 (file)
--- a/src/msw/makefile.dos
+++ b/src/msw/makefile.dos
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 13:13, 1999/09/12
+# This file was automatically generated by tmake at 21:04, 1999/09/12
 # 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 b00ea7a88b0942bd99ed5a74909c4550fb65f66d..6271ebfa517e7d5d515a094d437b2c6a8c6864a9 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -1,5 +1,5 @@
 
-# This file was automatically generated by tmake at 13:13, 1999/09/12
+# This file was automatically generated by tmake at 21:04, 1999/09/12
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #
@@ -122,6 +122,7 @@ COMMONOBJS  = \
                $(COMMDIR)/stream.$(OBJSUFF) \
                $(COMMDIR)/string.$(OBJSUFF) \
                $(COMMDIR)/tbarbase.$(OBJSUFF) \
+               $(COMMDIR)/tbarsmpl.$(OBJSUFF) \
                $(COMMDIR)/textcmn.$(OBJSUFF) \
                $(COMMDIR)/textfile.$(OBJSUFF) \
                $(COMMDIR)/time.$(OBJSUFF) \

diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc
index be506cb76e61e028822ae89a9c81aaba8dfd0452..6f7b187a57397e2994a32ed31ae636ee79bb2bcb 100644 (file)
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 13:13, 1999/09/12
+# This file was automatically generated by tmake at 21:04, 1999/09/12
 # 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 6e7b7d4a275f0fc2db8f91fd532e19f95f9b6209..678fe19d410594bf7564e0389aabddcbf31fa8cb 100644 (file)
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 13:13, 1999/09/12
+# This file was automatically generated by tmake at 21:04, 1999/09/12
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
@@ -68,6 +68,11 @@ $(CPPFLAGS2) /Fo$@ /c /Tc $<
 $(CPPFLAGS) /Fo$@ /c /Tp $<
 <<
 
+{..\msw}.c{..\msw\$D}.obj:
+       cl @<<
+$(CPPFLAGS2) /Fo$@ /c /Tc $<
+<<
+
 {..\msw\ole}.cpp{..\msw\ole\$D}.obj:
        cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $<
@@ -183,6 +188,7 @@ COMMONOBJS = \
                ..\common\$D\stream.obj \
                ..\common\$D\string.obj \
                ..\common\$D\tbarbase.obj \
+               ..\common\$D\tbarsmpl.obj \
                ..\common\$D\textcmn.obj \
                ..\common\$D\textfile.obj \
                ..\common\$D\time.obj \
@@ -317,7 +323,7 @@ HTMLOBJS = \
 
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
 # Add $(HTMLOBJS) if wanting wxHTML classes
-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
 
 # Normal, static library
 all:    dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg $(LIBTARGET)

diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index 6eb0c5d71de5cb3cd7bdf1980dea65083d01b1c6..c3e85b10032e0e9f696d97259cbdf6004d0fe6ce 100644 (file)
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 13:13, 1999/09/12
+# This file was automatically generated by tmake at 21:04, 1999/09/12
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #!/binb/wmake.exe