use specific linker flags under Mac OS X when linking executables against the

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

diff --git a/distrib/msw/tmake/vc6app.t b/distrib/msw/tmake/vc6app.t
index b5bdeae14284daf8a42a75d5085ea7b8bf3efd89..39ff9c463e8afd5226a79febc249dc306f78fd2a 100644 (file)
--- 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');
@@ -142,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";
@@ -173,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 ';