allow setting the wxWin directory explicitly using WXDIR option, ..\.. by default

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/tmake/vc6app.t b/distrib/msw/tmake/vc6app.t
index b5bdeae14284daf8a42a75d5085ea7b8bf3efd89..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") && !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
 
     #! 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") ) {
     }
 
     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');
        if ( !Project('WXCONFIGS') ) {
            #! default value
            Project('WXCONFIGS = Debug Release DebugDll ReleaseDll');