From 2aabc7da6ac76144d93261b0f2bf2a4e23c31b86 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 6 Oct 2001 01:53:02 +0000 Subject: [PATCH] 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 --- distrib/msw/tmake/vc6app.t | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/distrib/msw/tmake/vc6app.t b/distrib/msw/tmake/vc6app.t index b5bdeae142..d16d0fd716 100644 --- 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'); -- 2.49.0