Applied patch [ 597700 ] Fix proposal for wxJoystick under MSW

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

diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index ce15e03732d30a85813cc54eb6dfb4dcb98d4924..cef1a7df01a2d2fa2731b73056c0eb2ef53b3b64 100644 (file)
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -44,6 +44,7 @@ DOCDIR = $(WXDIR)\docs
 GENERICOBJS= busyinfo.obj &
        calctrl.obj &
        choicdgg.obj &
 GENERICOBJS= busyinfo.obj &
        calctrl.obj &
        choicdgg.obj &

+       dcbuffer.obj &

        dcpsg.obj &
        dirctrlg.obj &
        dragimgg.obj &
        dcpsg.obj &
        dirctrlg.obj &
        dragimgg.obj &


@@ -83,7 +84,6 @@ NONESSENTIALOBJS= accel.obj &
        fontdlgg.obj &
        helpext.obj &
        helphtml.obj &
        fontdlgg.obj &
        helpext.obj &
        helphtml.obj &

-       helpwxht.obj &

        imaglist.obj &
        listctrl.obj &
        msgdlgg.obj &
        imaglist.obj &
        listctrl.obj &
        msgdlgg.obj &


@@ -98,6 +98,8 @@ NONESSENTIALOBJS= accel.obj &
 COMMONOBJS = &
        y_tab.obj &
        appcmn.obj &
 COMMONOBJS = &
        y_tab.obj &
        appcmn.obj &

+       artprov.obj &
+       artstd.obj &

        choiccmn.obj &
        clipcmn.obj &
        clntdata.obj &
        choiccmn.obj &
        clipcmn.obj &
        clntdata.obj &


@@ -151,9 +153,11 @@ COMMONOBJS = &
        hashmap.obj &
        helpbase.obj &
        http.obj &
        hashmap.obj &
        helpbase.obj &
        http.obj &

+       iconbndl.obj &

        imagall.obj &
        imagbmp.obj &
        image.obj &
        imagall.obj &
        imagbmp.obj &
        image.obj &

+       imagfill.obj &

        imaggif.obj &
        imagiff.obj &
        imagjpeg.obj &
        imaggif.obj &
        imagiff.obj &
        imagjpeg.obj &


@@ -174,6 +178,7 @@ COMMONOBJS = &
        menucmn.obj &
        mimecmn.obj &
        module.obj &
        menucmn.obj &
        mimecmn.obj &
        module.obj &

+       msgout.obj &

        mstream.obj &
        nbkbase.obj &
        object.obj &
        mstream.obj &
        nbkbase.obj &
        object.obj &


@@ -191,6 +196,7 @@ COMMONOBJS = &
        sckfile.obj &
        sckipc.obj &
        sckstrm.obj &
        sckfile.obj &
        sckipc.obj &
        sckstrm.obj &

+       settcmn.obj &

        sizer.obj &
        socket.obj &
        statbar.obj &
        sizer.obj &
        socket.obj &
        statbar.obj &


@@ -298,6 +304,7 @@ MSWOBJS = accel.obj &
        palette.obj &
        pen.obj &
        penwin.obj &
        palette.obj &
        pen.obj &
        penwin.obj &

+       popupwin.obj &

        printdlg.obj &
        printwin.obj &
        radiobox.obj &
        printdlg.obj &
        printwin.obj &
        radiobox.obj &


@@ -620,6 +627,9 @@ pen.obj:     $(MSWDIR)\pen.cpp
 penwin.obj:     $(MSWDIR)\penwin.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 penwin.obj:     $(MSWDIR)\penwin.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

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

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


@@ -736,6 +746,12 @@ window.obj:     $(MSWDIR)\window.cpp
 appcmn.obj:     $(COMMDIR)\appcmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 appcmn.obj:     $(COMMDIR)\appcmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

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

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


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

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

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


@@ -904,6 +923,9 @@ imagbmp.obj:     $(COMMDIR)\imagbmp.cpp
 image.obj:     $(COMMDIR)\image.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 image.obj:     $(COMMDIR)\image.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

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

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


@@ -964,6 +986,9 @@ mimecmn.obj:     $(COMMDIR)\mimecmn.cpp
 module.obj:     $(COMMDIR)\module.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 module.obj:     $(COMMDIR)\module.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

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

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


@@ -1015,6 +1040,9 @@ sckipc.obj:     $(COMMDIR)\sckipc.cpp
 sckstrm.obj:     $(COMMDIR)\sckstrm.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 sckstrm.obj:     $(COMMDIR)\sckstrm.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

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

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


@@ -1131,6 +1159,9 @@ calctrl.obj:     $(GENDIR)\calctrl.cpp
 choicdgg.obj:     $(GENDIR)\choicdgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 choicdgg.obj:     $(GENDIR)\choicdgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

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

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