From 2fa7cb68b3e6cc500f31020ed9b4f2c60cd993bc Mon Sep 17 00:00:00 2001 From: Vladimir Prus Date: Mon, 16 Jun 2003 12:54:05 +0000 Subject: [PATCH] Update for recent changes. [SVN r18803] --- examples-v2/libraries/app/Jamfile | 2 +- examples-v2/libraries/project-root.jam | 5 ++++- examples-v2/qt-ui/Jamfile | 6 +++++- examples-v2/qt/Jamfile | 7 ++++++- v2/example/libraries/app/Jamfile | 2 +- v2/example/libraries/project-root.jam | 5 ++++- v2/example/qt-ui/Jamfile | 6 +++++- v2/example/qt/Jamfile | 7 ++++++- 8 files changed, 32 insertions(+), 8 deletions(-) diff --git a/examples-v2/libraries/app/Jamfile b/examples-v2/libraries/app/Jamfile index 22cc95d6b..28ba4ddd9 100644 --- a/examples-v2/libraries/app/Jamfile +++ b/examples-v2/libraries/app/Jamfile @@ -2,4 +2,4 @@ # Declare a executable file, which uses a library. Note that # includes that for library will be automatically used # when compiling 'app.cpp' -exe app : app.cpp ../lib1/lib1 ; \ No newline at end of file +exe app : app.cpp ../lib1//lib1 ; \ No newline at end of file diff --git a/examples-v2/libraries/project-root.jam b/examples-v2/libraries/project-root.jam index be01ebeeb..b3db2b405 100644 --- a/examples-v2/libraries/project-root.jam +++ b/examples-v2/libraries/project-root.jam @@ -1,2 +1,5 @@ -import gcc ; \ No newline at end of file +import gcc ; +import toolset : using ; + +using borland ; \ No newline at end of file diff --git a/examples-v2/qt-ui/Jamfile b/examples-v2/qt-ui/Jamfile index c1846aaaf..82a114002 100644 --- a/examples-v2/qt-ui/Jamfile +++ b/examples-v2/qt-ui/Jamfile @@ -1,2 +1,6 @@ -exe hello : main.cpp hello_world_widget.ui : qt ; \ No newline at end of file +project + : default-build multi + ; + +exe hello : main.cpp hello_world_widget.ui : /qt//qt ; diff --git a/examples-v2/qt/Jamfile b/examples-v2/qt/Jamfile index c3c0555c7..48f243d1a 100644 --- a/examples-v2/qt/Jamfile +++ b/examples-v2/qt/Jamfile @@ -1,2 +1,7 @@ -exe t7 : main.cpp lcdrange.cpp lcdrange.h : qt ; \ No newline at end of file +project + # built MT version, unless asked otherwise. + : default-build multi + ; + +exe t7 : main.cpp lcdrange.cpp lcdrange.h : /qt//qt ; \ No newline at end of file diff --git a/v2/example/libraries/app/Jamfile b/v2/example/libraries/app/Jamfile index 22cc95d6b..28ba4ddd9 100644 --- a/v2/example/libraries/app/Jamfile +++ b/v2/example/libraries/app/Jamfile @@ -2,4 +2,4 @@ # Declare a executable file, which uses a library. Note that # includes that for library will be automatically used # when compiling 'app.cpp' -exe app : app.cpp ../lib1/lib1 ; \ No newline at end of file +exe app : app.cpp ../lib1//lib1 ; \ No newline at end of file diff --git a/v2/example/libraries/project-root.jam b/v2/example/libraries/project-root.jam index be01ebeeb..b3db2b405 100644 --- a/v2/example/libraries/project-root.jam +++ b/v2/example/libraries/project-root.jam @@ -1,2 +1,5 @@ -import gcc ; \ No newline at end of file +import gcc ; +import toolset : using ; + +using borland ; \ No newline at end of file diff --git a/v2/example/qt-ui/Jamfile b/v2/example/qt-ui/Jamfile index c1846aaaf..82a114002 100644 --- a/v2/example/qt-ui/Jamfile +++ b/v2/example/qt-ui/Jamfile @@ -1,2 +1,6 @@ -exe hello : main.cpp hello_world_widget.ui : qt ; \ No newline at end of file +project + : default-build multi + ; + +exe hello : main.cpp hello_world_widget.ui : /qt//qt ; diff --git a/v2/example/qt/Jamfile b/v2/example/qt/Jamfile index c3c0555c7..48f243d1a 100644 --- a/v2/example/qt/Jamfile +++ b/v2/example/qt/Jamfile @@ -1,2 +1,7 @@ -exe t7 : main.cpp lcdrange.cpp lcdrange.h : qt ; \ No newline at end of file +project + # built MT version, unless asked otherwise. + : default-build multi + ; + +exe t7 : main.cpp lcdrange.cpp lcdrange.h : /qt//qt ; \ No newline at end of file