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

Changed .vc makefiles to allow different configurations to co-exist (so library

Browse Source 
names have changed a bit). Split ipvaddr.tex from sckaddr.tex.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1708 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 1999-02-17 17:18:22 +00:00
parent de8113d9a3
commit ca5c8b2df6
15 changed files with 476 additions and 1288 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
distrib/msw/bc.rsp Normal file
View File

@ -0,0 +1,2 @@
src/bc32.ide
samples/bc32.ide

3
distrib/msw/zipdist.bat
View File

@ -34,6 +34,9 @@ zip32 -@ %dest\wx200wrd.zip < %src\distrib\msw\wx_word.rsp
rem VC++ project files
zip32 -@ %dest\wx200vc.zip < %src\distrib\msw\vc.rsp
rem BC++ project files
zip32 -@ %dest\wx200bc.zip < %src\distrib\msw\bc.rsp
rem CodeWarrior project files
zip32 -@ %dest\wx200cw.zip < %src\distrib\msw\cw.rsp

3
docs/changes.txt
View File

@ -11,6 +11,9 @@ wxMSW:
- Fixed wxWindow::IsShown (::IsWindowVisible doesn't behave as
expected).
- Changed VC++ makefiles (.vc) so that it's possible to have
debug/release/DLL versions of the library available simultaneously,
with names wx.lib, wx_d.lib, wx200.lib(dll), wx200_d.lib(dll).
wxMotif:

15
docs/latex/wx/classes.tex
View File

@ -69,13 +69,13 @@ $$\image{14cm;0cm}{wxclass.ps}$$
\input debugcxt.tex
\input dialog.tex
\input dirdlg.tex
\input document.tex
\input docchfrm.tex
\input docmanag.tex
\input docmdich.tex
\input docmdipr.tex
\input docprfrm.tex
\input doctempl.tex
\input document.tex
\input dropevt.tex
\input dropsrc.tex
\input droptrgt.tex
@ -88,8 +88,8 @@ $$\image{14cm;0cm}{wxclass.ps}$$
\input filedlg.tex
\input fildrptg.tex
\input filehist.tex
\input filetype.tex
\input strmfile.tex
\input filetype.tex
\input fltinstr.tex
\input fltoutst.tex
\input focusevt.tex
@ -111,6 +111,7 @@ $$\image{14cm;0cm}{wxclass.ps}$$
\input ilayout.tex
\input indlgevt.tex
\input inputstr.tex
\input ipvaddr.tex
\input joystick.tex
\input joyevent.tex
\input keyevent.tex
@ -124,10 +125,12 @@ $$\image{14cm;0cm}{wxclass.ps}$$
\input log.tex
\input mask.tex
\input mdi.tex
\input memorydc.tex
\input strmmem.tex
\input menu.tex
\input menuitem.tex
\input menuevt.tex
\input memorydc.tex
\input msgdlg.tex
\input metafile.tex
\input mimetype.tex
\input minifram.tex
@ -135,7 +138,6 @@ $$\image{14cm;0cm}{wxclass.ps}$$
\input mouseevt.tex
\input moveevt.tex
\input mltchdlg.tex
\input msgdlg.tex
\input mutex.tex
\input mutexlck.tex
\input node.tex
@ -193,22 +195,21 @@ $$\image{14cm;0cm}{wxclass.ps}$$
\input tokenizr.tex
\input strmbase.tex
\input stream.tex
\input strmmem.tex
\input sysclevt.tex
\input settings.tex
\input tab.tex
\input tabctrl.tex
\input tabevent.tex
\input taskbar.tex
\input tempfile.tex
\input text.tex
\input txtdatob.tex
\input textdlg.tex
\input txtdrptg.tex
\input valtext.tex
\input tempfile.tex
\input tcpclint.tex
\input tcpconn.tex
\input tcpservr.tex
\input txtdatob.tex
\input textfile.tex
\input thread.tex
\input time.tex

95
docs/latex/wx/ipvaddr.tex Normal file
View File

@ -0,0 +1,95 @@
% ----------------------------------------------------------------------------
% CLASS: wxIPV4address
% ----------------------------------------------------------------------------
\section{\class{wxIPV4address}}\label{wxipv4address}
\wxheading{Derived from}
\helpref{wxSockAddress}{wxsockaddress}
\wxheading{Include files}
<wx/socket.h>
% ----------------------------------------------------------------------------
% MEMBERS
% ----------------------------------------------------------------------------
\latexignore{\rtfignore{\wxheading{Members}}}
%
% Hostname
%
\membersection{wxIPV4address::Hostname}
\func{bool}{Hostname}{\param{const wxString\&}{ hostname}}
Use the specified {\it hostname} for the address.
\wxheading{Return value}
Returns FALSE if something bad happens (invalid hostname, invalid IP address).
%
% Hostname
%
\membersection{wxIPV4address::Hostname}
\func{wxString}{Hostname}{\void}
Returns the hostname which matches the IP address.
%
% Service
%
\membersection{wxIPV4address::Service}
\func{bool}{Service}{\param{const wxString\&}{ service}}
Use the specified {\it service} string for the address.
\wxheading{Return value}
Returns FALSE if something bad happens (invalid service).
%
% Service
%
\membersection{wxIPV4address::Service}
\func{bool}{Service}{\param{unsigned short}{ service}}
Use the specified {\it service} for the address.
\wxheading{Return value}
Returns FALSE if something bad happens (invalid service).
%
% Service
%
\membersection{wxIPV4address::Service}
\func{unsigned short}{Service}{\void}
Returns the current service.
%
% LocalHost
%
\membersection{wxIPV4address::LocalHost}
\func{bool}{LocalHost}{\void}
Initialize peer host to local host.
\wxheading{Return value}
Returns FALSE if something bad happens.

95
docs/latex/wx/sckaddr.tex
View File

@ -78,98 +78,3 @@ function: only wxSocketBase use it.}
Returns the length of the socket address.
% ----------------------------------------------------------------------------
% CLASS: wxIPV4address
% ----------------------------------------------------------------------------
\section{\class{wxIPV4address}}\label{wxipv4address}
\wxheading{Derived from}
\helpref{wxSockAddress}{wxsockaddress}
\wxheading{Include files}
<wx/socket.h>
% ----------------------------------------------------------------------------
% MEMBERS
% ----------------------------------------------------------------------------
\latexignore{\rtfignore{\wxheading{Members}}}
%
% Hostname
%
\membersection{wxIPV4address::Hostname}
\func{bool}{Hostname}{\param{const wxString\&}{ hostname}}
Use the specified {\it hostname} for the address.
\wxheading{Return value}
Returns FALSE if something bad happens (invalid hostname, invalid IP address).
%
% Hostname
%
\membersection{wxIPV4address::Hostname}
\func{wxString}{Hostname}{\void}
Returns the hostname which matches the IP address.
%
% Service
%
\membersection{wxIPV4address::Service}
\func{bool}{Service}{\param{const wxString\&}{ service}}
Use the specified {\it service} string for the address.
\wxheading{Return value}
Returns FALSE if something bad happens (invalid service).
%
% Service
%
\membersection{wxIPV4address::Service}
\func{bool}{Service}{\param{unsigned short}{ service}}
Use the specified {\it service} for the address.
\wxheading{Return value}
Returns FALSE if something bad happens (invalid service).
%
% Service
%
\membersection{wxIPV4address::Service}
\func{unsigned short}{Service}{\void}
Returns the current service.
%
% LocalHost
%
\membersection{wxIPV4address::LocalHost}
\func{bool}{LocalHost}{\void}
Initialize peer host to local host.
\wxheading{Return value}
Returns FALSE if something bad happens.

3
docs/motif/install.txt
View File

@ -122,6 +122,9 @@ Troubleshooting
of string arrays), set wxUSE_GLOBAL_MEMORY_OPERATORS to 0 in
setup.h, and recompile.
- If you get an internal compiler error in gcc, turn off
optimisations.
- Problems with XtDestroyWidget crashing in ~wxWindow have been
reported on SGI IRIX 6.4. This has not yet been resolved, so
any advice here would be very welcome. See bugs.txt for a

55
docs/msw/install.txt
View File

@ -71,23 +71,48 @@ Using project files:
Using makefiles:
1. Make sure your WXWIN variable is set.
2. Change directory to wx\src\msw. Type 'nmake -f makefile.vc' to
make the wxWindows core library.
2. Change directory to wx\src\msw. Type:
'nmake -f makefile.vc'
to make the wxWindows core library with debug information
(wx\lib\wx_d.lib), or
'nmake -f makefile.vc FINAL=1'
to make the wxWindows core library without debug information
(wx\lib\wx.lib).
3. Change directory to wx\samples and type 'nmake -f makefile.vc'
to make all the samples. You can also make them individually.
To build the release version using makefiles, add FINAL=1 to your
nmake invocation, both when building the library and for samples.
Notes:
Use the 'clean' target to clean all objects, libraries and
executables.
Use the 'clean' target to clean all objects, libraries and
executables.
To build the release version using makefiles, add FINAL=1 to your
nmake invocation, both when building the library and for samples.
Note that the wxWindows core library allows you to have debug
and release libraries available simultaneously, by compiling the
objects in different subdirectories, whereas samples must be
cleaned and re-made to build a different configuration. This
may be changed in later versions of wxWindows.
To build the DLL version using makefiles:
1. Change directory to wx\src\msw. Type 'nmake -f makefile.vc dll pch'
to make both a suitable DLL and import library, and to build a
suitable precompiled header file for compiling applications.
2. Invoke a sample makefile with 'nmake -f makefile.vc WXUSINGDLL=1'.
The resulting libraries are called:
wx\lib\wx200_d.lib(dll) (debug version)
wx\lib\wx200.lib(dll) (release version, using FINAL=1)
2. Invoke a sample makefile with 'nmake -f makefile.vc WXUSINGDLL=1'
(or edit src\makeprog.vc to set WXUSINGDLL to 1 for all
applications).
Note (1): if you wish to use templates, please edit
include\wx\msw\setup.h and set wxUSE_DEBUG_NEW_ALWAYS to 0.
@ -130,6 +155,8 @@ executables.
Borland C++ 4.5/5.0 compilation
-------------------------------
Compiling using the makefiles:
1. Make sure your WXWIN variable is set, and uses the FAT (short
name) form if doing a 16-bit compile.
2. Change directory to wx\src\msw. Type 'make -f makefile.b32' to
@ -146,6 +173,20 @@ Note: the wxWindows library and (some) samples compile in 16-bit mode
using makefile.bcc, but at present the wxWindows resource system is switched
off in this mode. See issues.txt for details.
Compiling using the IDE files:
1. Load src\wxwin32_lib.ide.
2. Go to Options|Project... and specify the correct BC++ include and lib path for
your file structure.
3. Press F9 to compile the wxWindows library.
4. Load samples\samples.ide.
5. Go to Options|Project... and specify the correct BC++ include and lib path for
your file structure.
6. Press F9 to compile the samples.
See also the file bc_ide.txt for further instructions and details
of how to create your own project files.
Borland C++Builder compilation
------------------------------

47
src/makevc.env
View File

@ -77,12 +77,6 @@ WXBASESRC=$(WXDIR)\src\common
#DLL=0
!if "$(WXUSINGDLL)" == "1" || "$(WXMAKINGDLL)" == "1"
WXLIB=$(WXDIR)\lib\wx200.lib
!else
WXLIB=$(WXDIR)\lib\wx.lib
!endif
!if "$(WXUSINGDLL)" == "1"
EXTRADLLFLAGS=/DWXUSINGDLL=1
!endif
@ -99,9 +93,6 @@ EXTRADLLFLAGS=
EXTRADLLFLAGS=$(EXTRADLLFLAGS) /DNOMAIN
!endif
INC=-I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib $(EXTRAINC)
LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\xpm.lib
!ifndef FINAL
FINAL=0
DEBUG=1
@ -116,6 +107,32 @@ DLL=0
NOPCH=0
!endif
# This sets 'D' to a suitable directory name
# for this kind of build, and WXLIBNAME to one of wx (static release), wx_d (static debug),
# wx200 (DLL release), wx200_d (DLL debug)
!if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"
WXLIBNAME=wx200
!else
WXLIBNAME=wx
!endif
!if "$(FINAL)" == "1"
D=Release
!else
D=Debug
WXLIBNAME=$(WXLIBNAME)_d
!endif
!if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"
D=$(D)DLL
!endif
WXLIB=$(WXDIR)\lib\$(WXLIBNAME).lib
INC=-I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib $(EXTRAINC)
LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\xpm.lib
MAKEPRECOMP=/YcWX/WXPREC.H
OPTIONS=
@ -141,8 +158,8 @@ PCH=
PRECOMP=
MAKEPRECOMP=
!else
PCH=WX.PCH
PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$(PCH) /Fd$(WXDIR)\lib\wx.pdb
PCH=$(WXLIBNAME).pch
PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$(PCH) /Fd$(WXDIR)\lib\$(WXLIBNAME).pdb
MAKEPRECOMP=/YcWX/WXPREC.H
!endif
@ -155,18 +172,18 @@ DUMMY=dummy
!else
!if "$(WXMAKINGDLL)" == "1"
PCH=WXDLL.PCH
PCH=$(WXLIBNAME).pch
DUMMY=dummydll
!else
PCH=WX.PCH
PCH=$(WXLIBNAME).pch
DUMMY=dummy
!endif
PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$(PCH) /Fd$(WXDIR)\lib\wx.pdb
PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$(PCH) /Fd$(WXDIR)\lib\$(WXLIBNAME).pdb
CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ $(INC) $(OPT) /D_DLL $(CRTFLAG) $(EXTRADLLFLAGS) /D_WINDOWS /D__WINDOWS__ /D_WINDLL
CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WXMSW__ $(INC) $(EXTRAFLAGS) $(OPT) /D_DLL $(CRTFLAG) $(EXTRADLLFLAGS) /D_WINDOWS /D__WINDOWS__ /D_WINDLL
LINKFLAGS=$(LINK_DEBUG_FLAGS) -machine:i386 -subsystem:windows,$(APPVER) -dll # -entry:_DllMainCRTStartup$(DLLENTRY)
!endif
DUMMYOBJ=$(WXDIR)\src\msw\$(DUMMY).obj
DUMMYOBJ=$(WXDIR)\src\msw\$D\$(DUMMY).obj

3
src/msw/app.cpp
View File

@ -378,7 +378,8 @@ void wxApp::ConvertToStandardCommandArgs(char* lpCmdLine)
::GetModuleFileName(wxhInstance, name, WXSIZEOF(name));
// GNUWIN32 already fills in the first arg with the application name.
#if !defined(__GNUWIN32__)
// JACS: apparently not now (b20 and above?)
#if 0 // !defined(__GNUWIN32__)
args.Add(name);
count ++;
#endif

1423
src/msw/makefile.vc
View File

File diff suppressed because it is too large Load Diff

2
src/png/makefile.vc
View File

@ -11,8 +11,6 @@
# Change WXDIR or WXWIN to wherever wxWindows is found
WXDIR = $(WXWIN)
WXLIB = $(WXDIR)\lib\wx.lib
WXINC = $(WXDIR)\include
WINPNGDIR = ..\png
WINPNGINC = $(WINPNGDIR)

10
src/xpm/makefile.vc
View File

@ -15,16 +15,6 @@ THISDIR=$(WXWIN)\src\xpm
LIBTARGET=$(WXDIR)\lib\xpm.lib
# Please set these according to the settings in wx_setup.h, so we can include
# the appropriate libraries in wx.lib
# This one overrides the others, to be consistent with the settings in wx_setup.h
MINIMAL_WXWINDOWS_SETUP=0
PERIPH_LIBS=
PERIPH_TARGET=
PERIPH_CLEAN_TARGET=
XPMDIR=$(WXDIR)\src\xpm
OBJECTS = $(XPMDIR)\crbuffri.obj\

4
utils/nplugin/samples/gui/makefile.vc
View File

@ -38,11 +38,11 @@ wx:
# Update the dynamic link library
$(PROGRAM).dll: $(DUMMYOBJ) $(OBJECTS) $(WXDIR)\lib\wx.lib $(PLUGINLIB) $(PROGRAM).res $(PROGRAM).def
$(PROGRAM).dll: $(DUMMYOBJ) $(OBJECTS) $(WXLIB) $(PLUGINLIB) $(PROGRAM).res $(PROGRAM).def
$(link) $(LINKFLAGS) \
-out:$(PROGRAM).dll \
-def:$(PROGRAM).def \
$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res $(WXDIR)\lib\wx.lib $(PLUGINLIB) \
$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res $(WXLIB) $(PLUGINLIB) \
$(guilibsdll) shell32.lib comctl32.lib ctl3d32.lib
gui.obj: gui.$(SRCSUFF) gui.h $(DUMMYOBJ)

4
utils/nplugin/samples/simple/makefile.vc
View File

@ -38,11 +38,11 @@ wx:
# Update the dynamic link library
$(PROGRAM).dll: $(DUMMYOBJ) $(OBJECTS) $(WXDIR)\lib\wx.lib $(PLUGINLIB) $(PROGRAM).res $(PROGRAM).def
$(PROGRAM).dll: $(DUMMYOBJ) $(OBJECTS) $(WXLIB) $(PLUGINLIB) $(PROGRAM).res $(PROGRAM).def
$(link) $(LINKFLAGS) \
-out:$(PROGRAM).dll \
-def:$(PROGRAM).def \
$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res $(WXDIR)\lib\wx.lib $(PLUGINLIB) \
$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res $(WXLIB) $(PLUGINLIB) \
$(guilibsdll) lib shell32.lib comctl32.lib ctl3d32.lib ole32.lib
simple.obj: simple.$(SRCSUFF) $(DUMMYOBJ)