1. some more of "#if wxUSE_XXX" here and there

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

diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index b1101861b0e1807864b6f28b9e9c01093b3c51f7..5ded0306717fa562c8572ddbeca4fd01dbc482d7 100644 (file)
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -30,6 +30,7 @@ GENERICOBJS= choicdgg.obj &
   gridg.obj &
   laywin.obj &
   panelg.obj &
+  progdlgg.obj &
   prop.obj &
   propform.obj &
   proplist.obj &
@@ -51,6 +52,7 @@ NONESSENTIALOBJS= printps.obj &
 
 COMMONOBJS = cmndata.obj &
   config.obj &
+  dcbase.obj &
   docview.obj &
   docmdi.obj &
   dynarray.obj &
@@ -63,7 +65,6 @@ COMMONOBJS = cmndata.obj &
   gdicmn.obj &
   image.obj &
   imagpng.obj &
-  imagjpeg.obj &
   intl.obj &
   ipcbase.obj &
   helpbase.obj &
@@ -93,6 +94,7 @@ COMMONOBJS = cmndata.obj &
   sckfile.obj &
   sckipc.obj &
   sckstrm.obj &
+  sckint.obj &
   url.obj &
   http.obj &
   protocol.obj &
@@ -113,6 +115,7 @@ COMMONOBJS = cmndata.obj &
   wxchar.obj
 
 # Can't compile these yet under Watcom C++
+#  imagjpeg.obj &
 #  odbc.obj &
 #  db.obj &
 #  dbtable.obj &
@@ -459,7 +462,6 @@ tabctrl.obj:     $(MSWDIR)\tabctrl.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 taskbar.obj:     $(MSWDIR)\taskbar.cpp
-        cl @<<
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 tbar95.obj:     $(MSWDIR)\tbar95.cpp
@@ -481,7 +483,6 @@ tooltip.obj:     $(MSWDIR)\tooltip.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 treectrl.obj:     $(MSWDIR)\treectrl.cpp
-        cl @<<
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 utils.obj:     $(MSWDIR)\utils.cpp
@@ -526,6 +527,9 @@ cmndata.obj:     $(COMMDIR)\cmndata.cpp
 config.obj:     $(COMMDIR)\config.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+dcbase.obj:     $(COMMDIR)\dcbase.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 db.obj:     $(COMMDIR)\db.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -566,7 +570,7 @@ image.obj:     $(COMMDIR)\image.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 imagpng.obj:     $(COMMDIR)\imagpng.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+  *$(CCC) $(CPPFLAGS) -i=..\png -i=..\zlib $(IFLAGS) $<
 
 imagjpeg.obj:     $(COMMDIR)\imagjpeg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
@@ -652,6 +656,9 @@ string.obj:     $(COMMDIR)\string.cpp
 socket.obj:     $(COMMDIR)\socket.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+sckint.obj:     $(COMMDIR)\sckint.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 sckaddr.obj:     $(COMMDIR)\sckaddr.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -757,6 +764,9 @@ panelg.obj:     $(GENDIR)\panelg.cpp
 printps.obj:     $(GENDIR)\printps.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+progdlgg.obj:     $(GENDIR)\progdlgg.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 prop.obj:     $(GENDIR)\prop.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<