Made VC++ makefiles and project files a bit more consistent
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -49,6 +49,8 @@ Default constructor.
|
||||
|
||||
Constructs a notebook control.
|
||||
|
||||
Note that sometimes you can reduce flicker by passing the wxCLIP\_CHILDREN window style.
|
||||
|
||||
\wxheading{Parameters}
|
||||
|
||||
\docparam{parent}{The parent window. Must be non-NULL.}
|
||||
|
@@ -80,23 +80,21 @@ compiler.
|
||||
Visual C++ 4.0/5.0/6.0 compilation
|
||||
----------------------------------
|
||||
|
||||
Using project files:
|
||||
Using project files (VC++ 5 and 6 only):
|
||||
|
||||
1. Unarchive wx2_x_y_vc.zip, the VC++ 5/6 project makefiles.
|
||||
2. Open src/wxvc.dsp, set Debug or Release configuration, and
|
||||
compile. This will produce src/Debug/wxvc.lib or
|
||||
src/Release/wxvc.lib. The project file src/wxvc_dll.dsp
|
||||
will make a DLL version of wxWindow, which will go in
|
||||
src/DebugDLL/wxvc.[lib,dll] and src/ReleaseDLL/wxvc.[lib,dll].
|
||||
3. If you want to use JPEG in your application (such as the image
|
||||
sample), open src/jpeg/jpeg.dsp (VC++ 5/6 only) and compile in
|
||||
Debug and Release configurations. If you have VC++ 4,
|
||||
use makefile.vc, but you may only have one set of object
|
||||
files at a time in use (debug or release versions).
|
||||
4. Similarly for TIFF: use src/tiff/tiff.dsp.
|
||||
5. Open a sample project file, choose a configuration using
|
||||
Build | Set Active Configuration..., and compile.
|
||||
The project files don't use precompiled headers, to save
|
||||
2. Open src/wxvc.dsp, set Debug or Release configuration for
|
||||
the wxvc project, and compile. Alternatively, use Batch Build
|
||||
to build both Debug and Release configurations.
|
||||
This will produce lib/wx.lib (release) and lib/wxd.lib (debug),
|
||||
plus various subordinate libraries. It assumes you have
|
||||
the TIFF and JPEG source, which is already in the setup
|
||||
version of the distribution.
|
||||
The project file src/wxvc_dll.dsp will make a DLL version of wxWindow,
|
||||
which will go in lib/wxdll.[lib,dll] and lib/wxdlld.[lib,dll].
|
||||
3. Open a sample project file, choose a configuration such as
|
||||
Debug using Build | Set Active Configuration..., and compile.
|
||||
The project files don't use precompiled headers, to save disk
|
||||
space, but you can switch PCH compiling on for greater speed.
|
||||
|
||||
Using makefiles:
|
||||
@@ -120,7 +118,7 @@ Using makefiles:
|
||||
4. Change directory to wx\samples and type 'nmake -f makefile.vc'
|
||||
to make all the samples. You can also make them individually.
|
||||
|
||||
Notes:
|
||||
Makefile notes:
|
||||
|
||||
Use the 'clean' target to clean all objects, libraries and
|
||||
executables.
|
||||
@@ -141,8 +139,8 @@ To build the DLL version using makefiles:
|
||||
suitable precompiled header file for compiling applications.
|
||||
The resulting libraries are called:
|
||||
|
||||
wx\lib\wx200.lib(dll) (debug version)
|
||||
wx\lib\wx200.lib(dll) (release version, using FINAL=1)
|
||||
wx\lib\wx[version].lib(dll) (debug version)
|
||||
wx\lib\wx[version].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
|
||||
@@ -157,8 +155,9 @@ using templates, to avoid the non-template stream files being included
|
||||
within wxWindows.
|
||||
|
||||
Note (2): libraries and applications generated with makefiles and
|
||||
project files are unlikely to be compatible, so use one method or
|
||||
the other.
|
||||
project files are now (hopefully) compatible where static libraries
|
||||
are concerned, but please exercise caution nevertheless and if
|
||||
possible, use one method or the other.
|
||||
|
||||
Note (3): VC++ 5's optimization code seems to be broken and can
|
||||
cause both compile and run-time problems: this can be seen when
|
||||
|
Reference in New Issue
Block a user