X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2aabc7da6ac76144d93261b0f2bf2a4e23c31b86..4d7289e6b077278a1ec050e20d2357cdbfe66897:/distrib/msw/tmake/vc6app.t diff --git a/distrib/msw/tmake/vc6app.t b/distrib/msw/tmake/vc6app.t index d16d0fd716..39ff9c463e 100644 --- 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 ';