Modified vc.t according to last changes to makefile.vc, and regenerated

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

diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index 502c299d2c12b3e876afb6e304b46beeaf76ce1e..07e3a525c60e360ec068a5c7f8bcde592e5e3a0d 100644 (file)
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -11,7 +11,7 @@
 # Makefile : Builds wxWindows library for Watcom C++, WIN32
 !include ..\makewat.env
 
 # Makefile : Builds wxWindows library for Watcom C++, WIN32
 !include ..\makewat.env
 

-LIBTARGET   = $(WXDIR)\lib\wx$(TOOLKIT)$(DEBGUSUFFIX)_w.lib
+LIBTARGET   = $(WXDIR)\lib\$(LIBNAME).lib

 
 EXTRATARGETS = png zlib jpeg tiff regex
 EXTRATARGETSCLEAN = clean_png clean_zlib clean_jpeg clean_tiff clean_regex
 
 EXTRATARGETS = png zlib jpeg tiff regex
 EXTRATARGETSCLEAN = clean_png clean_zlib clean_jpeg clean_tiff clean_regex


@@ -366,7 +366,7 @@ LBCFILE=wx$(TOOLKIT).lbc
 $(LIBTARGET) : $(OBJECTS)
     %create $(LBCFILE)
     @for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i
 $(LIBTARGET) : $(OBJECTS)
     %create $(LBCFILE)
     @for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i

-    wlib /b /c /n /p=512 $^@ @$(LBCFILE)
+    wlib /b /c /n $(LIBPAGESIZE) $^@ @$(LBCFILE)

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


@@ -1109,7 +1109,7 @@ $(OUTPUTDIR)\y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
   *$(CC) $(CFLAGS) -DUSE_DEFINE $(COMMDIR)\y_tab.c
 
 $(COMMDIR)\y_tab.c:     $(COMMDIR)\dosyacc.c
   *$(CC) $(CFLAGS) -DUSE_DEFINE $(COMMDIR)\y_tab.c
 
 $(COMMDIR)\y_tab.c:     $(COMMDIR)\dosyacc.c

-    copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c
+        copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c

 
 $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
     copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c
 
 $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
     copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c