1. minor fixes in wxDynLib

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

diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index a3d1c73d8210434148032127733a0fcb7ff13119..04db240faadfc8cd8e764ad739fea1e519edebc4 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 &
   gridg.obj &
   laywin.obj &
   panelg.obj &

+  progdlgg.obj &

   prop.obj &
   propform.obj &
   proplist.obj &
   prop.obj &
   propform.obj &
   proplist.obj &


@@ -38,7 +39,8 @@ GENERICOBJS= choicdgg.obj &
   splitter.obj &
   statusbr.obj &
   tabg.obj &
   splitter.obj &
   statusbr.obj &
   tabg.obj &

-  textdlgg.obj
+  textdlgg.obj &
+  tipdlg.obj

 
 # These are generic things that don't need to be compiled on MSW,
 # but sometimes it's useful to do so for testing purposes.
 
 # These are generic things that don't need to be compiled on MSW,
 # but sometimes it's useful to do so for testing purposes.


@@ -51,6 +53,7 @@ NONESSENTIALOBJS= printps.obj &
 
 COMMONOBJS = cmndata.obj &
   config.obj &
 
 COMMONOBJS = cmndata.obj &
   config.obj &

+  dcbase.obj &

   docview.obj &
   docmdi.obj &
   dynarray.obj &
   docview.obj &
   docmdi.obj &
   dynarray.obj &


@@ -62,6 +65,8 @@ COMMONOBJS = cmndata.obj &
   framecmn.obj &
   gdicmn.obj &
   image.obj &
   framecmn.obj &
   gdicmn.obj &
   image.obj &

+  imagbmp.obj &
+  imagpng.obj &

   intl.obj &
   ipcbase.obj &
   helpbase.obj &
   intl.obj &
   ipcbase.obj &
   helpbase.obj &


@@ -91,6 +96,7 @@ COMMONOBJS = cmndata.obj &
   sckfile.obj &
   sckipc.obj &
   sckstrm.obj &
   sckfile.obj &
   sckipc.obj &
   sckstrm.obj &

+  sckint.obj &

   url.obj &
   http.obj &
   protocol.obj &
   url.obj &
   http.obj &
   protocol.obj &


@@ -107,9 +113,12 @@ COMMONOBJS = cmndata.obj &
   datstrm.obj &
   objstrm.obj &
   variant.obj &
   datstrm.obj &
   objstrm.obj &
   variant.obj &

-  wincmn.obj
+  dlgcmn.obj &
+  wincmn.obj &
+  wxchar.obj

 
 # Can't compile these yet under Watcom C++
 
 # Can't compile these yet under Watcom C++

+#  imagjpeg.obj &

 #  odbc.obj &
 #  db.obj &
 #  dbtable.obj &
 #  odbc.obj &
 #  db.obj &
 #  dbtable.obj &


@@ -123,6 +132,7 @@ MSWOBJS = &
   button.obj &
   checkbox.obj &
   checklst.obj &
   button.obj &
   checkbox.obj &
   checklst.obj &

+  caret.obj &

   choice.obj &
   clipbrd.obj &
   colordlg.obj &
   choice.obj &
   clipbrd.obj &
   colordlg.obj &


@@ -183,6 +193,7 @@ MSWOBJS = &
   spinbutt.obj &
   statbmp.obj &
   statbox.obj &
   spinbutt.obj &
   statbmp.obj &
   statbox.obj &

+  statline.obj &

   statbr95.obj &
   stattext.obj &
   tabctrl.obj &
   statbr95.obj &
   stattext.obj &
   tabctrl.obj &


@@ -253,6 +264,9 @@ brush.obj:     $(MSWDIR)\brush.cpp
 button.obj:     $(MSWDIR)\button.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 button.obj:     $(MSWDIR)\button.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

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

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


@@ -442,6 +456,9 @@ statbmp.obj:     $(MSWDIR)\statbmp.cpp
 statbox.obj:     $(MSWDIR)\statbox.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 statbox.obj:     $(MSWDIR)\statbox.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

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

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


@@ -452,7 +469,6 @@ tabctrl.obj:     $(MSWDIR)\tabctrl.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 taskbar.obj:     $(MSWDIR)\taskbar.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 taskbar.obj:     $(MSWDIR)\taskbar.cpp

-        cl @<<

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


@@ -474,7 +490,6 @@ tooltip.obj:     $(MSWDIR)\tooltip.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 treectrl.obj:     $(MSWDIR)\treectrl.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 treectrl.obj:     $(MSWDIR)\treectrl.cpp

-        cl @<<

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


@@ -519,6 +534,9 @@ cmndata.obj:     $(COMMDIR)\cmndata.cpp
 config.obj:     $(COMMDIR)\config.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 config.obj:     $(COMMDIR)\config.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

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

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


@@ -558,6 +576,15 @@ gdicmn.obj:     $(COMMDIR)\gdicmn.cpp
 image.obj:     $(COMMDIR)\image.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 image.obj:     $(COMMDIR)\image.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

+imagbmp.obj:     $(COMMDIR)\imagbmp.cpp
+  *$(CCC) $(CPPFLAGS) -i=..\png -i=..\zlib $(IFLAGS) $<
+
+imagpng.obj:     $(COMMDIR)\imagpng.cpp
+  *$(CCC) $(CPPFLAGS) -i=..\png -i=..\zlib $(IFLAGS) $<
+
+imagjpeg.obj:     $(COMMDIR)\imagjpeg.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+

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


@@ -639,6 +666,9 @@ string.obj:     $(COMMDIR)\string.cpp
 socket.obj:     $(COMMDIR)\socket.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 socket.obj:     $(COMMDIR)\socket.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

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

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


@@ -696,9 +726,15 @@ process.obj:     $(COMMDIR)\process.cpp
 variant.obj:     $(COMMDIR)\variant.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 variant.obj:     $(COMMDIR)\variant.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

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

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

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

 y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
   *$(CC) $(CPPFLAGS) $(IFLAGS) -DUSE_DEFINE $(COMMDIR)\y_tab.c
 
 y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
   *$(CC) $(CPPFLAGS) $(IFLAGS) -DUSE_DEFINE $(COMMDIR)\y_tab.c
 


@@ -741,6 +777,9 @@ panelg.obj:     $(GENDIR)\panelg.cpp
 printps.obj:     $(GENDIR)\printps.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 printps.obj:     $(GENDIR)\printps.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

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

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


@@ -771,6 +810,9 @@ tabg.obj:     $(GENDIR)\tabg.cpp
 textdlgg.obj: $(GENDIR)\textdlgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 textdlgg.obj: $(GENDIR)\textdlgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

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

 crbuffri.obj: $(XPMDIR)\crbuffri.c
   *$(CC) $(CPPFLAGS) $(IFLAGS) $<
 
 crbuffri.obj: $(XPMDIR)\crbuffri.c
   *$(CC) $(CPPFLAGS) $(IFLAGS) $<