Applied Diana's font patch II

[wxWidgets.git] / src / msw / makefile.wat

diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index eaac121a918c9839f3a49ad17062c52e96f8de12..c8e0ca2d00db9e80efc4b44d05993d57fe67d5d7 100644 (file)
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -1,6 +1,6 @@
 
 
 
 

-# This file was automatically generated by tmake at 17:51, 1999/09/20
+# 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
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #!/binb/wmake.exe


@@ -34,7 +34,7 @@ DOCDIR = $(WXDIR)\docs
 
 GENERICOBJS= busyinfo.obj &
        choicdgg.obj &
 
 GENERICOBJS= busyinfo.obj &
        choicdgg.obj &

-       gridg.obj &
+       grid.obj &

        laywin.obj &
        logg.obj &
        numdlgg.obj &
        laywin.obj &
        logg.obj &
        numdlgg.obj &


@@ -95,6 +95,7 @@ COMMONOBJS = &
        fileconf.obj &
        filefn.obj &
        filesys.obj &
        fileconf.obj &
        filefn.obj &
        filesys.obj &

+       fontcmn.obj &

        framecmn.obj &
        fs_inet.obj &
        fs_zip.obj &
        framecmn.obj &
        fs_inet.obj &
        fs_zip.obj &


@@ -104,6 +105,7 @@ COMMONOBJS = &
        hash.obj &
        helpbase.obj &
        http.obj &
        hash.obj &
        helpbase.obj &
        http.obj &

+       imagall.obj &

        imagbmp.obj &
        image.obj &
        imaggif.obj &
        imagbmp.obj &
        image.obj &
        imaggif.obj &


@@ -230,6 +232,7 @@ MSWOBJS = accel.obj &
        slider95.obj &
        slidrmsw.obj &
        spinbutt.obj &
        slider95.obj &
        slidrmsw.obj &
        spinbutt.obj &

+       spinctrl.obj &

        statbmp.obj &
        statbox.obj &
        statbr95.obj &
        statbmp.obj &
        statbox.obj &
        statbr95.obj &


@@ -488,6 +491,9 @@ slidrmsw.obj:     $(MSWDIR)\slidrmsw.cpp
 spinbutt.obj:     $(MSWDIR)\spinbutt.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 spinbutt.obj:     $(MSWDIR)\spinbutt.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

+spinctrl.obj:     $(MSWDIR)\spinctrl.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+

 statbmp.obj:     $(MSWDIR)\statbmp.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 statbmp.obj:     $(MSWDIR)\statbmp.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 


@@ -613,6 +619,9 @@ filefn.obj:     $(COMMDIR)\filefn.cpp
 filesys.obj:     $(COMMDIR)\filesys.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 filesys.obj:     $(COMMDIR)\filesys.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

+fontcmn.obj:     $(COMMDIR)\fontcmn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+

 framecmn.obj:     $(COMMDIR)\framecmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 framecmn.obj:     $(COMMDIR)\framecmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 


@@ -640,6 +649,9 @@ helpbase.obj:     $(COMMDIR)\helpbase.cpp
 http.obj:     $(COMMDIR)\http.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 http.obj:     $(COMMDIR)\http.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

+imagall.obj:     $(COMMDIR)\imagall.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+

 imagbmp.obj:     $(COMMDIR)\imagbmp.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 imagbmp.obj:     $(COMMDIR)\imagbmp.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 


@@ -825,7 +837,7 @@ busyinfo.obj:     $(GENDIR)\busyinfo.cpp
 choicdgg.obj:     $(GENDIR)\choicdgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 choicdgg.obj:     $(GENDIR)\choicdgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

-gridg.obj:     $(GENDIR)\gridg.cpp
+grid.obj:     $(GENDIR)\grid.cpp

   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 laywin.obj:     $(GENDIR)\laywin.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 laywin.obj:     $(GENDIR)\laywin.cpp