X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2edb0bdef6238c8c246b6978bc14828b7033d931..733a25f0f454eefbb1392faad986d8dde7919230:/docs/tech/tn0010.htm

diff --git a/docs/tech/tn0010.htm b/docs/tech/tn0010.htm
index c8b8063f0a..1302485940 100644
--- a/docs/tech/tn0010.htm
+++ b/docs/tech/tn0010.htm
@@ -1,7 +1,7 @@
 <HTML>
 
 <HEAD>
-<TITLE>Compiling wxWindows applications in the VC++ IDE</TITLE>
+<TITLE>Compiling wxWidgets applications in the VC++ IDE</TITLE>
 
 </HEAD>
 
@@ -15,7 +15,7 @@
 <tr>
 <td bgcolor="#C4ECF9">
 <font size=+1 face="Arial, Lucida Sans, Helvetica" color="#000000">
-Compiling wxWindows applications in the VC++ IDE
+Compiling wxWidgets applications in the VC++ IDE
 </font>
 </td>
 </tr>
@@ -24,12 +24,12 @@ Compiling wxWindows applications in the VC++ IDE
 <P>
 
 <CENTER>
-<a href="#wxwin2">Settings for wxWindows 2</a> / <a href="#wxwin1">Settings for wxWindows 1.68</a>
+<a href="#wxwin2">Settings for wxWidgets 2.2</a> / <a href="#wxwin1">Settings for wxWidgets 1.68</a>
 </CENTER>
 
 <P>
 
-To compile wxWindows samples and applications using the VC++ 5.0 or 6.0 IDE (having compiled wxWindows
+To compile wxWidgets samples and applications using the VC++ 5.0 or 6.0 IDE (having compiled wxWidgets
 using the makefile or project file provided), the following
 steps and settings should be used.<P>
 
@@ -38,15 +38,16 @@ steps and settings should be used.<P>
 <ol>
 <li>Create a new WIN32 Application project.
 <li>Add the .cpp and .rc files for your project.
-<li>Apply the settings listed below to the project, replacing c:\wx2 with your wxWindows
+<li>Apply the settings listed below to the project, replacing c:\wx2 with your wxWidgets
 installation path.
 </ol>
 
 <P>
 
-<H2><a name="wxwin2">Settings for wxWindows 2</a></H2>
+<H2><a name="wxwin2">Settings for wxWidgets 2.2</a></H2>
 
-These settings apply to wxWindows 2.1.14 and above.<P>
+These settings apply to wxWidgets 2.1.14 and above but most of them are not
+necessary any longer for wxWidgets 2.3+.<P>
 
 <DL>
 <DT><B>General</B><DD>
@@ -94,7 +95,7 @@ The <B>Object/library modules</B> field should contain:
 <PRE>
 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib
 ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib
-winmm.lib wxd.lib xpmd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib
+winmm.lib wxmsw25d.lib wxbase25d.lib wxpngd.lib wxzlibd.lib wxjpegd.lib wxtiffd.lib
 </PRE>
 
 for the Debug configuration and
@@ -102,7 +103,7 @@ for the Debug configuration and
 <PRE>
 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib
 ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib
-winmm.lib wx.lib xpm.lib png.lib zlib.lib jpeg.lib tiff.lib
+winmm.lib wxmsw25.lib wxbase25.lib wxpng.lib wxzlib.lib wxjpeg.lib wxtiff.lib
 </PRE>
 
 for the Release configuration.<P>
@@ -143,7 +144,7 @@ c:\wx2\include;c:\wx2\contrib\include
 
 <HR>
 
-<H2><a name="wxwin1">Settings for wxWindows 1.68</a></H2>
+<H2><a name="wxwin1">Settings for wxWidgets 1.68</a></H2>
 
 Note: these have not yet been checked.<P>
 
@@ -171,12 +172,12 @@ The <B>Additional include directories</B> field should contain the following:<P>
 <DT><B>C/C++: Precompiled Headers</B><DD>
 
 The <B>Not using precompiled headers</B> or <B>Automatic use of precompiled headers</B>
-button should be selected (I can't find a way of using the wxWindows PCH file).<P>
+button should be selected (I can't find a way of using the wxWidgets PCH file).<P>
 
 <DT><B>C/C++: Code Generation</B><DD>
 
 The <B>Use run-time library</B> control should be set to <B>Multithreaded DLL</B>. This
-sets the compiler switch to /MD to match the wxWindows makefile.<P>
+sets the compiler switch to /MD to match the wxWidgets makefile.<P>
 
 <DT><B>Link: Input</B><DD>
 
@@ -206,77 +207,6 @@ Select your .rc file. The <B>Additional resource include directories</B> field s
 
 </DL>
 
-<P>
-
-<!--
-<PRE>
-From: "Chris Breeze" <chris@hel.co.uk>
-To: <wxwin-users@wx.dent.med.uni-muenchen.de>
-Subject: Re: Compiling 2.0 wxWin Apps in the VC IDE
-Date: Wed, 20 May 1998 14:18:02 +0100
-
-First the apology: the description below is for wx1.68
-not for wx2.0 - sorry if I confused everybody.
-
-Anyway, third time lucky I hope! The settings for
-VC++ 5.0, wx2.0 beta 8, NT Workstation 4.0 sp3
-are:
-
-In project / settings / C/C++:
-Add "__WINDOWS__" to the pre-processor definitions
-Add "{wx}\include" to the additional include directories
-where {wx} is the directory in which wx is installed
-
-In project / settings / Resources:
-add "{wx}\include" to the additional resource include directories
-
-In project / settings / Link:
-Add "wx.lib comctl32.lib dummy.obj" to the Object/Library modules
-
-Add "libcd.lib,libcid.lib" to ignore libraries (under the "input" category)
-
-Add "{wx}\lib,{wx}\src\msw" to the additional library path
-
-I have tested these settings on samples/minimal and can
-build exes which can be debugged using Developer Studio.
-
-I hope I've finally answered the original question. (Next time
-I'll read the question more carefully!).
-
-Regards,
-Chris
-
-Original message (settings for wx1.68c):
-) Try the following (tested with VC++ 5 on NT4):
-) 
-) Create a new Win32 Application project and insert the source files
-) (including .rc files).
-) 
-) In project / settings / C/C++:
-) Add wx_msw to the pre-processor definitions
-) add {wx}\include\base,{wx}\include\msw to the additional include
-directories
-) where {wx} is the directory in which wx is installed
-) 
-) In project / settings / Resources:
-) add {wx}\include\msw;{wx}\contrib\fafa to the additional resource include
-) directories
-) 
-) In project / settings / Link:
-) Add comctl32.lib wx.lib dummy.obj ctl3d32.lib to the Object/Library modules
-) 
-) Add libc to ignore libraries (under the "input" category)
-) 
-) Add {wx}\lib,{wx}\src\msw to the additional library path
-) 
-) These settings are for a debug build. You can use the same settings for
-) a release build apart from ignoring libc.
-
-</PRE>
--->
-
-</font>
-
 </BODY>
 
 </HTML>
