summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-04-02 12:04:53 (UTC)
committer mickeyl <mickeyl>2003-04-02 12:04:53 (UTC)
commit617523539b2ac77a97db427ba218b5951267410d (patch) (unidiff)
tree415b9365e1c328b798dfc55390649fb363a6d8a9
parent911a05806c4cce85750f3bd9bca84e18162cb739 (diff)
downloadopie-617523539b2ac77a97db427ba218b5951267410d.zip
opie-617523539b2ac77a97db427ba218b5951267410d.tar.gz
opie-617523539b2ac77a97db427ba218b5951267410d.tar.bz2
- only build the lib subdir in the standalone build
- corrent driver-detection order
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/configwindow.cpp2
-rw-r--r--noncore/net/wellenreiter/wellenreiter.pro3
2 files changed, 3 insertions, 2 deletions
diff --git a/noncore/net/wellenreiter/gui/configwindow.cpp b/noncore/net/wellenreiter/gui/configwindow.cpp
index e287b47..59c2a61 100644
--- a/noncore/net/wellenreiter/gui/configwindow.cpp
+++ b/noncore/net/wellenreiter/gui/configwindow.cpp
@@ -60,8 +60,8 @@ WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char
60 { 60 {
61 modules >> line; 61 modules >> line;
62 if ( line.contains( "cisco" ) ) devicetype = 1; 62 if ( line.contains( "cisco" ) ) devicetype = 1;
63 else if ( line.contains( "wlan" ) ) devicetype = 2;
64 else if ( line.contains( "hostap" ) ) devicetype = 3; 63 else if ( line.contains( "hostap" ) ) devicetype = 3;
64 else if ( line.contains( "prism" ) ) devicetype = 2;
65 else if ( line.contains( "orinoco" ) ) devicetype = 4; 65 else if ( line.contains( "orinoco" ) ) devicetype = 4;
66 } 66 }
67 if ( devicetype ) 67 if ( devicetype )
diff --git a/noncore/net/wellenreiter/wellenreiter.pro b/noncore/net/wellenreiter/wellenreiter.pro
index 6fe49c3..eb60c4a 100644
--- a/noncore/net/wellenreiter/wellenreiter.pro
+++ b/noncore/net/wellenreiter/wellenreiter.pro
@@ -1,13 +1,14 @@
1TEMPLATE = subdirs 1TEMPLATE = subdirs
2unix:SUBDIRS = lib gui
3 2
4!contains( platform, x11 ) { 3!contains( platform, x11 ) {
5 message( Configuring Wellenreiter for build on Opie ) 4 message( Configuring Wellenreiter for build on Opie )
5 SUBDIRS = gui
6 include ( $(OPIEDIR)/include.pro ) 6 include ( $(OPIEDIR)/include.pro )
7} 7}
8 8
9contains( platform, x11 ) { 9contains( platform, x11 ) {
10 message( Configuring Wellenreiter for build on Qt/X11 ) 10 message( Configuring Wellenreiter for build on Qt/X11 )
11 SUBDIRS = lib gui
11 system( mkdir -p $OPIEDIR/lib $OPIEDIR/bin $OPIEDIR/share/pics ) 12 system( mkdir -p $OPIEDIR/lib $OPIEDIR/bin $OPIEDIR/share/pics )
12} 13}
13 14