Added $(NEW_WXLIBNAME) to allow changing the library or DLL name

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

diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index af978287650e478b9165a8ee9d11cb557497a94f..37778a11fe53a2dc5a9d25a443f428b0c9fc8114 100644 (file)
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -47,8 +47,7 @@ NONESSENTIALOBJS= printps.obj &
   msgdlgg.obj &
   helpxlp.obj &
   colrdlgg.obj &
   msgdlgg.obj &
   helpxlp.obj &
   colrdlgg.obj &

-  fontdlgg.obj &
-  postscrp.obj
+  fontdlgg.obj

 
 COMMONOBJS = cmndata.obj &
   config.obj &
 
 COMMONOBJS = cmndata.obj &
   config.obj &


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

+  imagpng.obj &
+  imagjpeg.obj &

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


@@ -80,10 +81,12 @@ COMMONOBJS = cmndata.obj &
   timercmn.obj &
   utilscmn.obj &
   validate.obj &
   timercmn.obj &
   utilscmn.obj &
   validate.obj &

+  valgen.obj &

   valtext.obj &
   date.obj &
   hash.obj &
   list.obj &
   valtext.obj &
   date.obj &
   hash.obj &
   list.obj &

+  paper.obj &

   string.obj &
   socket.obj &
   sckaddr.obj &
   string.obj &
   socket.obj &
   sckaddr.obj &


@@ -106,7 +109,8 @@ COMMONOBJS = cmndata.obj &
   datstrm.obj &
   objstrm.obj &
   variant.obj &
   datstrm.obj &
   objstrm.obj &
   variant.obj &

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

 
 # Can't compile these yet under Watcom C++
 #  odbc.obj &
 
 # Can't compile these yet under Watcom C++
 #  odbc.obj &


@@ -191,6 +195,7 @@ MSWOBJS = &
   textctrl.obj &
   thread.obj &
   timer.obj &
   textctrl.obj &
   thread.obj &
   timer.obj &

+  tooltip.obj &

   treectrl.obj &
   utils.obj &
   utilsexc.obj &
   treectrl.obj &
   utils.obj &
   utilsexc.obj &


@@ -224,7 +229,7 @@ $(LIBTARGET) : $(OBJECTS)
 #    wlib /b /c /n /p=512 $^@ @tmp.lbc
        
        
 #    wlib /b /c /n /p=512 $^@ @tmp.lbc
        
        

-clean:   $(EXTRATARGETSCLEAN)
+clean:   .SYMBOLIC $(EXTRATARGETSCLEAN)

     -erase *.obj
     -erase $(LIBTARGET)
     -erase *.pch
     -erase *.obj
     -erase $(LIBTARGET)
     -erase *.pch


@@ -335,12 +340,18 @@ gaugemsw.obj:     $(MSWDIR)\gaugemsw.cpp
 gdiobj.obj:     $(MSWDIR)\gdiobj.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 gdiobj.obj:     $(MSWDIR)\gdiobj.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

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

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

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

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


@@ -462,6 +473,9 @@ thread.obj:     $(MSWDIR)\thread.cpp
 timer.obj:     $(MSWDIR)\timer.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 timer.obj:     $(MSWDIR)\timer.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

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

 treectrl.obj:     $(MSWDIR)\treectrl.cpp
         cl @<<
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 treectrl.obj:     $(MSWDIR)\treectrl.cpp
         cl @<<
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<


@@ -547,6 +561,12 @@ gdicmn.obj:     $(COMMDIR)\gdicmn.cpp
 image.obj:     $(COMMDIR)\image.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 image.obj:     $(COMMDIR)\image.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

+imagpng.obj:     $(COMMDIR)\imagpng.cpp
+  *$(CCC) $(CPPFLAGS) $(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) $<
 


@@ -577,9 +597,6 @@ object.obj:     $(COMMDIR)\object.cpp
 odbc.obj:     $(COMMDIR)\odbc.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 odbc.obj:     $(COMMDIR)\odbc.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

-postscrp.obj:     $(COMMDIR)\postcrp.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-

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


@@ -604,6 +621,9 @@ utilscmn.obj:     $(COMMDIR)\utilscmn.cpp
 validate.obj:     $(COMMDIR)\validate.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 validate.obj:     $(COMMDIR)\validate.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

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

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


@@ -619,6 +639,9 @@ hash.obj:     $(COMMDIR)\hash.cpp
 list.obj:     $(COMMDIR)\list.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 list.obj:     $(COMMDIR)\list.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

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

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


@@ -685,6 +708,9 @@ variant.obj:     $(COMMDIR)\variant.cpp
 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
 


@@ -903,4 +929,3 @@ clean_zlib:   .SYMBOLIC
     wmake -f makefile.wat clean
     cd $(WXDIR)\src\msw
 
     wmake -f makefile.wat clean
     cd $(WXDIR)\src\msw
 

-