wxArray<T> macros have been changed to fix runtime problems under 64 bit

[wxWidgets.git] / distrib / msw / tmake / vc6app.t

diff --git a/distrib/msw/tmake/vc6app.t b/distrib/msw/tmake/vc6app.t
index d16d0fd716d44a71832ffc6c05a85633226dd91b..39ff9c463e8afd5226a79febc249dc306f78fd2a 100644 (file)
--- a/distrib/msw/tmake/vc6app.t
+++ b/distrib/msw/tmake/vc6app.t
@@ -70,7 +70,7 @@
     if ( Config("wx") ) {
        #! default rel path works for all the demos and most of the samples
        #! if no explicit path given
-       $WXDIR = Project("WXDIR") || "..\\..";
+       $WXDIR = Project("WXDIR") || (Project("WXDIRREL") || "..\\..");
 
        AddIncludePath("$WXDIR\\include");
 
@@ -136,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";
@@ -167,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 ';