AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Small changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4159 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 1999-10-24 15:14:05 +00:00
parent c7def858e5
commit ace03f87d6
5 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
distrib/msw/msw.rsp
View File

@ -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

9
distrib/msw/tmake/wat.t
View File

@ -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 = ..\..

9
docs/msw/install.txt
View File

@ -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
----------------------------------

2
src/makemsc.env
View File

@ -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

2
src/makewat.env
View File

@ -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