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
This commit is contained in:
@@ -23,18 +23,6 @@
|
|||||||
if ( Config("wx") && !Config("wxbase") ) {
|
if ( Config("wx") && !Config("wxbase") ) {
|
||||||
Project('CONFIG += windows');
|
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
|
#! 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
|
#! 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') ) {
|
if ( !Project('WXCONFIGS') ) {
|
||||||
#! default value
|
#! default value
|
||||||
Project('WXCONFIGS = Debug Release DebugDll ReleaseDll');
|
Project('WXCONFIGS = Debug Release DebugDll ReleaseDll');
|
||||||
|
Reference in New Issue
Block a user