give focus to show top level windows

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

diff --git a/distrib/msw/tmake/vc6app.t b/distrib/msw/tmake/vc6app.t
index 067576cc6123c01916aae037a36bc7ba58f39006..d16d0fd716d44a71832ffc6c05a85633226dd91b 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") || "..\\..";
+
+       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