Small changes

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

diff --git a/distrib/msw/msw.rsp b/distrib/msw/msw.rsp
index 10a9d817eddb5b7c75e6eb46af24fca318eccd6d..41a6fbe95e94a649da52859143ee18d5b99c07f0 100644 (file)
--- a/distrib/msw/msw.rsp
+++ b/distrib/msw/msw.rsp
@@ -1,5 +1,10 @@
 Mingw32-gcc295.patches
 
+lib/watcom/*.txt
+lib/watcom/*.lib
+lib/watcom/*.bat
+lib/bcc16/*.lib
+
 docs/licence.txt
 docs/msw/*.txt
 docs/wine/*.txt
@@ -55,11 +60,6 @@ src/msw/*.inc
 src/msw/winestub.c
 src/msw/gsocket.c
 
-src/msw/ctl3d/*.*
-src/msw/ctl3d/msvc/*.*
-src/msw/ctl3d/wat32/*.*
-src/msw/ctl3d/wat386/*.*
-src/msw/ctl3d/borland/*.*
 src/msw/ole/*.cpp
 src/msw/*.prj
 

diff --git a/distrib/msw/tmake/wat.t b/distrib/msw/tmake/wat.t
index 2e7350af2e763aaec10f93fe86d3853cd2d9f2f2..dd44990bfccd9326246716d2ddff82d0f3512e58 100644 (file)
--- a/distrib/msw/tmake/wat.t
+++ b/distrib/msw/tmake/wat.t
@@ -61,6 +61,15 @@
 # Created:  1998
 #
 # Makefile : Builds wxWindows library for Watcom C++, WIN32
+#
+# NOTE: This file is generated from wat.t by tmake, but not all bugs have
+# been removed from this process. If wxWindows doesn't compile,
+# check the following and edit this makefile accordingly:
+#
+# - OLE-related files such as oleutils.cpp should have 'ole\' prepended
+#   to the path.
+# - extended.c, gsocket.c, unzip.c must be compiled using $(CC), not $(CCC).
+#   They may also be wrongly specified as extended.cpp, etc.
 
 WXDIR = ..\..
 

diff --git a/docs/msw/install.txt b/docs/msw/install.txt
index 597f4a7b52d1387007c7f264eacb1638aaea4933..100a42f5a65b1829f679b007dd0cfef7fc399ec1 100644 (file)
--- a/docs/msw/install.txt
+++ b/docs/msw/install.txt
@@ -250,7 +250,7 @@ C++Builder compilation is the same as for Borland C++ above.
 Tested with C++Builder 1.0 and 3.0. Only makefiles are currently
 supplied.
 
-Watcom C++ 10.6 compilation
+Watcom C++ 10.6/11 compilation
 ---------------------------
 
 1. Make sure your WXWIN variable is set, and uses the DOS short
@@ -258,7 +258,12 @@ Watcom C++ 10.6 compilation
 2. Change directory to wx\src\msw. Type 'wmake -f makefile.wat' to
    make the wxWindows core library.
 3. Change directory to wx\samples\minimal and type 'wmake -f makefile.wat'
-   to make this sample.
+   to make this sample. Repeat for other samples of interest.
+
+Note (1): setup.h overrides wxUSE_LIBJPEG and sets it to 0, since
+imagjpeg.cpp doesn't compile.
+Note (2): makewat.env uses the odbc32.lib supplied in wxWindows' lib\watcom
+directory. See the notes in that directory.
 
 Metrowerks CodeWarrior compilation
 ----------------------------------

diff --git a/src/makemsc.env b/src/makemsc.env
index 282fafea227042cf83b61836fc0d5bb0c37ed823..28cf0817aff7b1b50f8f270d1c29ac8dd029c761 100644 (file)
--- a/src/makemsc.env
+++ b/src/makemsc.env
@@ -52,7 +52,7 @@ DEBUG_FLAGS=
 LINK_DEBUG_FLAGS=
 !endif
 
-LIBS=$(WXLIB) $(EXTRALIBS) oldnames libw llibcew commdlg ddeml shell mmsystem ole2 $(WXDIR)\src\msw\ctl3d\msvc\ctl3dv2.lib
+LIBS=$(WXLIB) $(EXTRALIBS) oldnames libw llibcew commdlg ddeml shell mmsystem ole2 $(WXDIR)\lib\msvc15\ctl3dv2.lib
 
 !if "$(DLL)" == "0"
 PCH=WX.PCH

diff --git a/src/makewat.env b/src/makewat.env
index f3b86cacff3dd07f3259e69f3fe144a20e9df4d9..62282b8c2f76b5c603c487dee04a1137ed5fcb4a 100644 (file)
--- a/src/makewat.env
+++ b/src/makewat.env
@@ -54,7 +54,7 @@ STACK       = option stack=64k
 LIBS   = $(WXDIR)\lib\wx.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\png.lib $(WXDIR)\lib\xpm.lib &
       $(WATLIBDIR)\comctl32.lib $(WATLIBDIR)\comdlg32.lib &
       $(WATLIBDIR)\ole32.lib $(WATLIBDIR)\oleaut32.lib &
-      $(WATLIBDIR)\uuid.lib $(WATLIBDIR)\odbc32.lib 
+      $(WATLIBDIR)\uuid.lib $(WXDIR)\lib\watcom\odbc32.lib 
 IFLAGS      = -i=$(WXINC) -i=$(%watcom)\h;$(%watcom)\h\nt;$(WXDIR)\src\png;$(WXDIR)\src\zlib;$(WXDIR)\src\jpeg;$(WXDIR)\include\wx\msw\gnuwin32
 RESFLAGS1   = -r -bt=nt /i$(WXDIR)\include
 RESFLAGS2   = -R $(name) /i$(WXDIR)\include