X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/17533c89d2f1b2361ca02edfddc9d64a42b0a35b..a664d17e06cb52a82e54e67696fd3f9697eade07:/distrib/msw/tmake/vc6app.t

diff --git a/distrib/msw/tmake/vc6app.t b/distrib/msw/tmake/vc6app.t
index 067576cc61..39ff9c463e 100644
--- a/distrib/msw/tmake/vc6app.t
+++ b/distrib/msw/tmake/vc6app.t
@@ -23,18 +23,6 @@
     if ( Config("wx") && !Config("wxbase") ) {
 	Project('CONFIG += windows');
     }
-    if ( Config("wx") ) {
-	if ( Config("wxnodir") ) {
-	    #! hard code relative paths
-	    $WXDIR = "..\\..";
-	}
-	else {
-	    #! VC 6.0 supports env vars in include path
-	    $WXDIR = "\$(WXWIN)";
-	}
-
-	AddIncludePath("$WXDIR\\include");
-    }
 
     #! let's be smart: if no extension is given, add .lib (this allows for
     #! LIBS=libname in project files which map either to -l libname.lib under
@@ -80,6 +68,12 @@
     }
 
     if ( Config("wx") ) {
+	#! default rel path works for all the demos and most of the samples
+	#! if no explicit path given
+	$WXDIR = Project("WXDIR") || (Project("WXDIRREL") || "..\\..");
+
+	AddIncludePath("$WXDIR\\include");
+
 	if ( !Project('WXCONFIGS') ) {
 	    #! default value
 	    Project('WXCONFIGS = Debug Release DebugDll ReleaseDll');
@@ -107,6 +101,7 @@
 	$WX_BASENAME = "$WXDIR\\lib\\wx$TOOLKIT";
 	$UNICODE_SUFFIX = "u";
 	$DEBUG_SUFFIX = "d";
+	$DLL = "dll";
 
 	#! compiler options: for the given configuration they are just obrained
 	#! by concatenating together all relevant values from the list below
@@ -141,7 +136,7 @@
 	#! the wxWin lib name itself is composed from the basename with various
 	#! suffixes: 'u' for Unicode, 'd' for debug and we also need the version
 	#! for the DLL
-	$DLL_VERSION = "232";
+	$DLL_VERSION = "233";
 
 	$project{"WX_LINK_DEBUG"} = $DEBUG_EXTRA_LIBS . "$WX_BASENAME$DEBUG_SUFFIX.lib";
 	$project{"WX_LINK_RELEASE"} = $RELEASE_EXTRA_LIBS . "$WX_BASENAME.lib";
@@ -172,7 +167,7 @@
     if ( $text ne "" ) { $vc_def = $text . " ";  $text = ""; } else { $vc_def = ""; }
     if ( Config("wx") ) {
 	#! define wxWindows compilation flags
-	$vc_def .= '/D WIN32 /D WINVER=0x400 /D _MT ';
+	$vc_def .= '/D WIN32 /D WINVER=0x400 ';
 
 	if ( Config("wxbase") ) {
 	    $vc_def .= '/D wxUSE_GUI=0 ';