fixed typo in library name

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/tmake/wat.t b/distrib/msw/tmake/wat.t
index 65b183d569b83431284a5296ee07c3dddeb3c6b9..d20629497d6884ff6b58b8edcd0610c4a6539caf 100644 (file)
--- a/distrib/msw/tmake/wat.t
+++ b/distrib/msw/tmake/wat.t
@@ -69,7 +69,7 @@
 # Makefile : Builds wxWindows library for Watcom C++, WIN32
 !include ..\makewat.env
 
-LIBTARGET   = $(WXDIR)\lib\wx$(TOOLKIT)$(DEBGUSUFFIX)$(WATCOM_SUFFIX).lib
+LIBTARGET   = $(WXDIR)\lib\$(LIBNAME).lib
 
 EXTRATARGETS = png zlib jpeg tiff regex
 EXTRATARGETSCLEAN = clean_png clean_zlib clean_jpeg clean_tiff clean_regex

diff --git a/src/makewat.env b/src/makewat.env
index 9672a1a6777b1ac95ee4f05a1ef4df0ee9a1e6e0..d69a9762d9a37acfafab531980c14d55626bd3fe 100644 (file)
--- a/src/makewat.env
+++ b/src/makewat.env
@@ -19,7 +19,9 @@ wxUSE_GUI=1
 !endif
 
 # set FINAL=1 to disable debug and enable optimizations
+!ifndef FINAL
 FINAL=0
+!endif
 
 # set WATCOM_SUFFIX to nothing if you use only Watcom compiler, set it to
 # something Watcom-specific if you want to build wxWindows with more than one

diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index 388cac253c59fd0b765356dd4ac58a3a40966dfe..e68fac4ba43a8a8c49095e313134aa66699225f3 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
 
-LIBTARGET   = $(WXDIR)\lib\wx$(TOOLKIT)$(DEBGUSUFFIX)$(WATCOM_SUFFIX).lib
+LIBTARGET = $(WXDIR)\lib\$(LIBNAME).lib
 
 EXTRATARGETS = png zlib jpeg tiff regex
 EXTRATARGETSCLEAN = clean_png clean_zlib clean_jpeg clean_tiff clean_regex