support undo patch applied

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

diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index 6bd6b83badef478f17583147e2c58954e57ea6ca..97285fd859c3ad3ca4149a277e3d680b4a1a4544 100644 (file)
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -63,7 +63,6 @@ NONESSENTIALOBJS= $(OUTPUTDIR)\accel.obj &
        $(OUTPUTDIR)\filedlgg.obj &
        $(OUTPUTDIR)\fontdlgg.obj &
        $(OUTPUTDIR)\helpext.obj &
        $(OUTPUTDIR)\filedlgg.obj &
        $(OUTPUTDIR)\fontdlgg.obj &
        $(OUTPUTDIR)\helpext.obj &

-       $(OUTPUTDIR)\helphtml.obj &

        $(OUTPUTDIR)\imaglist.obj &
        $(OUTPUTDIR)\listctrl.obj &
        $(OUTPUTDIR)\mdig.obj &
        $(OUTPUTDIR)\imaglist.obj &
        $(OUTPUTDIR)\listctrl.obj &
        $(OUTPUTDIR)\mdig.obj &


@@ -92,6 +91,7 @@ COMMONOBJS = &
        $(OUTPUTDIR)\cshelp.obj &
        $(OUTPUTDIR)\ctrlcmn.obj &
        $(OUTPUTDIR)\ctrlsub.obj &
        $(OUTPUTDIR)\cshelp.obj &
        $(OUTPUTDIR)\ctrlcmn.obj &
        $(OUTPUTDIR)\ctrlsub.obj &

+       $(OUTPUTDIR)\datacmn.obj &

        $(OUTPUTDIR)\datetime.obj &
        $(OUTPUTDIR)\datstrm.obj &
        $(OUTPUTDIR)\db.obj &
        $(OUTPUTDIR)\datetime.obj &
        $(OUTPUTDIR)\datstrm.obj &
        $(OUTPUTDIR)\db.obj &


@@ -185,6 +185,7 @@ COMMONOBJS = &
        $(OUTPUTDIR)\stream.obj &
        $(OUTPUTDIR)\string.obj &
        $(OUTPUTDIR)\sysopt.obj &
        $(OUTPUTDIR)\stream.obj &
        $(OUTPUTDIR)\string.obj &
        $(OUTPUTDIR)\sysopt.obj &

+       $(OUTPUTDIR)\taskbarcmn.obj &

        $(OUTPUTDIR)\tbarbase.obj &
        $(OUTPUTDIR)\textbuf.obj &
        $(OUTPUTDIR)\textcmn.obj &
        $(OUTPUTDIR)\tbarbase.obj &
        $(OUTPUTDIR)\textbuf.obj &
        $(OUTPUTDIR)\textcmn.obj &


@@ -315,6 +316,7 @@ MSWOBJS = $(OUTPUTDIR)\accel.obj &
        $(OUTPUTDIR)\utils.obj &
        $(OUTPUTDIR)\utilsexc.obj &
        $(OUTPUTDIR)\uuid.obj &
        $(OUTPUTDIR)\utils.obj &
        $(OUTPUTDIR)\utilsexc.obj &
        $(OUTPUTDIR)\uuid.obj &

+       $(OUTPUTDIR)\uxtheme.obj &

        $(OUTPUTDIR)\volume.obj &
        $(OUTPUTDIR)\wave.obj &
        $(OUTPUTDIR)\window.obj
        $(OUTPUTDIR)\volume.obj &
        $(OUTPUTDIR)\wave.obj &
        $(OUTPUTDIR)\window.obj


@@ -754,6 +756,9 @@ $(OUTPUTDIR)\ctrlcmn.obj:     $(COMMDIR)\ctrlcmn.cpp
 $(OUTPUTDIR)\ctrlsub.obj:     $(COMMDIR)\ctrlsub.cpp
   *$(CXX) $(CXXFLAGS) $<
 
 $(OUTPUTDIR)\ctrlsub.obj:     $(COMMDIR)\ctrlsub.cpp
   *$(CXX) $(CXXFLAGS) $<
 

+$(OUTPUTDIR)\datacmn.obj:     $(COMMDIR)\datacmn.cpp
+  *$(CXX) $(CXXFLAGS) $<
+

 $(OUTPUTDIR)\datetime.obj:     $(COMMDIR)\datetime.cpp
   *$(CXX) $(CXXFLAGS) $<
 
 $(OUTPUTDIR)\datetime.obj:     $(COMMDIR)\datetime.cpp
   *$(CXX) $(CXXFLAGS) $<
 


@@ -1033,6 +1038,9 @@ $(OUTPUTDIR)\string.obj:     $(COMMDIR)\string.cpp
 $(OUTPUTDIR)\sysopt.obj:     $(COMMDIR)\sysopt.cpp
   *$(CXX) $(CXXFLAGS) $<
 
 $(OUTPUTDIR)\sysopt.obj:     $(COMMDIR)\sysopt.cpp
   *$(CXX) $(CXXFLAGS) $<
 

+$(OUTPUTDIR)\taskbarcmn.obj:     $(COMMDIR)\taskbarcmn.cpp
+  *$(CXX) $(CXXFLAGS) $<
+

 $(OUTPUTDIR)\tbarbase.obj:     $(COMMDIR)\tbarbase.cpp
   *$(CXX) $(CXXFLAGS) $<
 
 $(OUTPUTDIR)\tbarbase.obj:     $(COMMDIR)\tbarbase.cpp
   *$(CXX) $(CXXFLAGS) $<
 


@@ -1101,6 +1109,7 @@ $(OUTPUTDIR)\zstream.obj:     $(COMMDIR)\zstream.cpp
 
 
 
 
 
 

+

 ########################################################
 # Generic objects (not always compiled, depending on
 # whether platforms have native implementations)
 ########################################################
 # Generic objects (not always compiled, depending on
 # whether platforms have native implementations)