From c61c66126ce48a0915ba382a201c96c56a11ee15 Mon Sep 17 00:00:00 2001 From: Arnold Krille Date: Thu, 19 Apr 2007 22:02:06 +0000 Subject: [PATCH 01/12] Branch for the 0.1 release. From b3a72507ce83473cace008b3ec394a816cdc8772 Mon Sep 17 00:00:00 2001 From: Arnold Krille Date: Thu, 19 Apr 2007 22:08:46 +0000 Subject: [PATCH 02/12] remove debug --- Doxyfile | 4 ++-- SConstruct | 5 +++-- libofqf/qoscclient.cpp | 19 +++---------------- libofqf/qoscserver.cpp | 21 +++++++++------------ libofqf/qosctypes.cpp | 4 ---- 5 files changed, 17 insertions(+), 36 deletions(-) diff --git a/Doxyfile b/Doxyfile index 013f6e4..07b1342 100644 --- a/Doxyfile +++ b/Doxyfile @@ -4,7 +4,7 @@ # Project related configuration options #--------------------------------------------------------------------------- PROJECT_NAME = "OSC for Qt4" -PROJECT_NUMBER = +PROJECT_NUMBER = 0.1 OUTPUT_DIRECTORY = dox CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English @@ -25,7 +25,7 @@ ABBREVIATE_BRIEF = "The $name class" \ ALWAYS_DETAILED_SEC = NO INLINE_INHERITED_MEMB = NO FULL_PATH_NAMES = YES -STRIP_FROM_PATH = /home/arnold/programme/ofqf/ +STRIP_FROM_PATH = STRIP_FROM_INC_PATH = SHORT_NAMES = NO JAVADOC_AUTOBRIEF = NO diff --git a/SConstruct b/SConstruct index 808efc7..f5354d7 100644 --- a/SConstruct +++ b/SConstruct @@ -13,7 +13,9 @@ env.Replace( LIBS="" ) env.Replace( LIBPATH="" ) # DEBUG: -env['CXXFLAGS']+="-Wall -Werror -g -fpic" +#env['CXXFLAGS']+="-Wall -Werror -g -fpic" +# RELEASE: +env['CXXFLAGS']+="-fpic" def CheckPKGConfig( context, pkgname, version="", all=False ): import SCons.Util, os, string @@ -62,7 +64,6 @@ conf = Configure( env, custom_tests={'CheckPKGConfig' : CheckPKGConfig }, conf_d conf.CheckPKGConfig( 'QtCore', "4.2", True ) conf.CheckPKGConfig( 'QtGui', "4.2", True ) conf.CheckPKGConfig( 'QtNetwork', "4.2", True ) -#conf.CheckPKGConfig( 'liblo', "0", True ) env = conf.Finish() diff --git a/libofqf/qoscclient.cpp b/libofqf/qoscclient.cpp index eedcee7..84f0281 100644 --- a/libofqf/qoscclient.cpp +++ b/libofqf/qoscclient.cpp @@ -19,7 +19,7 @@ #include "qoscclient.h" //#include "qoscclient.moc" -#include +//#include #include #include @@ -30,11 +30,11 @@ QOscClient::QOscClient( const QHostAddress& address, quint16 port, QObject* p ) , _address( address ) , _port( port ) { - qDebug() << "QOscClient::QOscClient(" << address << "," << port << "," << p << ")"; + //qDebug() << "QOscClient::QOscClient(" << address << "," << port << "," << p << ")"; } QOscClient::~QOscClient() { - qDebug() << "QOscClient::~QOscClient()"; + //qDebug() << "QOscClient::~QOscClient()"; } void QOscClient::setAddress( const QHostAddress& address, quint16 port ) { @@ -44,20 +44,7 @@ void QOscClient::setAddress( const QHostAddress& address, quint16 port ) { void QOscClient::sendData( QString path, QVariant data ) { //qDebug() << "QOscClient::sendData(" << path << "," << data << ")"; - /*lo_message msg = lo_message_new(); - if ( data.type() == QVariant::Int ) - lo_message_add_int32( msg, data.toInt() ); - if ( data.type() == QVariant::Double ) - lo_message_add_float( msg, data.toDouble() ); - if ( data.type() == QVariant::String ) - lo_message_add_string( msg, data.toString().toStdString().c_str() ); - size_t charsize=0; - void* chars = lo_message_serialise( msg, path.toStdString().c_str(), 0, &charsize );*/ - //qDebug() << " osc-message at" << chars << " length is" << charsize; QByteArray out = oscMessage( path, data ); - //qDebug() << " own message has size" << out.size(); - //for ( int i=0; i( chars )[ i ] /*<< "\"" << static_cast( chars )[ i ] << "\""*/ << "\t :" << quint8( out[ i ] ) << "\t\"" << out[ i ] << "\""; socket()->writeDatagram( out, _address, _port ); } void QOscClient::sendData( QString path, QList data ) { diff --git a/libofqf/qoscserver.cpp b/libofqf/qoscserver.cpp index eaf65e4..df89f7b 100644 --- a/libofqf/qoscserver.cpp +++ b/libofqf/qoscserver.cpp @@ -18,27 +18,27 @@ #include "qoscserver.h" -#include +//#include #include #include QOscServer::QOscServer( quint16 port, QObject* p ) : QOscBase( p ) { - qDebug() << "QOscServer::QOscServer(" << port << "," << p << ")"; - qDebug() << " socket() gives" << socket(); + //qDebug() << "QOscServer::QOscServer(" << port << "," << p << ")"; + //qDebug() << " socket() gives" << socket(); socket()->bind( QHostAddress::Any, port ); connect( socket(), SIGNAL( readyRead() ), this, SLOT( readyRead() ) ); } QOscServer::QOscServer( QHostAddress address, quint16 port, QObject* p ) : QOscBase( p ) { - qDebug() << "QOscServer::QOscServer(" << address << "," << port << "," << p << ")"; + //qDebug() << "QOscServer::QOscServer(" << address << "," << port << "," << p << ")"; socket()->bind( address, port ); } QOscServer::~QOscServer() { - qDebug() << "QOscServer::~QOscServer()"; + //qDebug() << "QOscServer::~QOscServer()"; } void QOscServer::registerPathObject( PathObject* p ) { @@ -51,15 +51,12 @@ void QOscServer::unregisterPathObject( PathObject* p ) { #define BUFFERSIZE 255 void QOscServer::readyRead() { - qDebug() << "QOscServer::readyRead()"; + //qDebug() << "QOscServer::readyRead()"; while ( socket()->hasPendingDatagrams() ) { QByteArray data( BUFFERSIZE, char( 0 ) ); - //data.resize( BUFFERSIZE ); int size = socket()->readDatagram( data.data(), BUFFERSIZE ); - qDebug() << " read" << size << "(" << data.size() << ") bytes:" << data; + //qDebug() << " read" << size << "(" << data.size() << ") bytes:" << data; - //for ( int i=0; i( static_cast( data.data() ) )[ i ]; QString path; QString args; QVariant arguments; @@ -109,7 +106,7 @@ void QOscServer::readyRead() { arguments = list; } } - qDebug() << "path seems to be" << path << "args are" << args << ":" << arguments; + //qDebug() << "path seems to be" << path << "args are" << args << ":" << arguments; QMap replacements; replacements[ "!" ] = "^"; @@ -122,7 +119,7 @@ void QOscServer::readyRead() { foreach( QString rep, replacements.keys() ) path.replace( rep, replacements[ rep ] ); - qDebug() << " after transformation to OSC-RegExp path is" << path; + //qDebug() << " after transformation to OSC-RegExp path is" << path; QRegExp exp( path ); foreach( PathObject* obj, paths ) { diff --git a/libofqf/qosctypes.cpp b/libofqf/qosctypes.cpp index efb4da6..69d8fd4 100644 --- a/libofqf/qosctypes.cpp +++ b/libofqf/qosctypes.cpp @@ -22,7 +22,6 @@ #include #include -#include #include QOscBase::QOscBase( QObject* p ) @@ -75,8 +74,6 @@ QByteArray QOscBase::fromFloat( float f ) { return reverseQByteArray( tmp ); } QString QOscBase::toString( const QByteArray& b ) { - //QByteArray tmp = b.left( b.indexOf( char( 0 ) ) ); - //return QString( tmp ); return QString( b.data() ); } qint32 QOscBase::toInt32( const QByteArray& b ) { @@ -157,7 +154,6 @@ void PathObject::send( double d ) { send( QVariant( d ) ); } void PathObject::send() { send( QVariant() ); } void PathObject::signalData( QVariant v ) { - qDebug() << "PathObject::signalData(" << v << ")"; if ( v.type() == _type ) { if ( _type == QVariant::Invalid ) emit data(); From 889527dd9702a518940229f57c40d0bcfdae1c21 Mon Sep 17 00:00:00 2001 From: Arnold Krille Date: Thu, 19 Apr 2007 22:11:42 +0000 Subject: [PATCH 03/12] Use QtGui only for the samples --- SConstruct | 2 +- oscqlient/SConscript | 2 +- oscserver/SConscript | 2 +- qtuiobleep/SConscript | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SConstruct b/SConstruct index f5354d7..e81d8e8 100644 --- a/SConstruct +++ b/SConstruct @@ -62,7 +62,7 @@ def CheckPKGConfig( context, pkgname, version="", all=False ): conf = Configure( env, custom_tests={'CheckPKGConfig' : CheckPKGConfig }, conf_dir='.cache', log_file='.cache/config.log' ) conf.CheckPKGConfig( 'QtCore', "4.2", True ) -conf.CheckPKGConfig( 'QtGui', "4.2", True ) +conf.CheckPKGConfig( 'QtGui', "4.2" ) conf.CheckPKGConfig( 'QtNetwork', "4.2", True ) env = conf.Finish() diff --git a/oscqlient/SConscript b/oscqlient/SConscript index 8a5427a..ae936c7 100644 --- a/oscqlient/SConscript +++ b/oscqlient/SConscript @@ -10,6 +10,6 @@ env.AppendUnique( CPPPATH=[ "#/libofqf" ] ) env.AppendUnique( LIBPATH=[ "#/libofqf" ] ) #env.AppendUnique( LIBPATH=env['jack_PATHS'] ) #env.AppendUnique( LIBPATH=env['lash10_PATHS'] ) -env.AppendUnique( LIBS=[ "ofqf" ] ) +env.AppendUnique( LIBS=[ "ofqf", env['QtGui_LIBS'] ] ) env.Program( target="oscqlient", source=["main.cpp"] ) diff --git a/oscserver/SConscript b/oscserver/SConscript index e143d45..d27bacd 100644 --- a/oscserver/SConscript +++ b/oscserver/SConscript @@ -10,6 +10,6 @@ env.AppendUnique( CPPPATH=[ "#/libofqf" ] ) env.AppendUnique( LIBPATH=[ "#/libofqf" ] ) #env.AppendUnique( LIBPATH=env['jack_PATHS'] ) #env.AppendUnique( LIBPATH=env['lash10_PATHS'] ) -env.AppendUnique( LIBS=[ "ofqf" ] ) +env.AppendUnique( LIBS=[ "ofqf", env['QtGui_LIBS'] ] ) env.Program( target="oscserver", source=["main.cpp","servergui_base.ui"] ) diff --git a/qtuiobleep/SConscript b/qtuiobleep/SConscript index 1130c64..b7feb59 100644 --- a/qtuiobleep/SConscript +++ b/qtuiobleep/SConscript @@ -10,6 +10,6 @@ env.AppendUnique( CPPPATH=[ "#/libofqf" ] ) env.AppendUnique( LIBPATH=[ "#/libofqf" ] ) #env.AppendUnique( LIBPATH=env['jack_PATHS'] ) #env.AppendUnique( LIBPATH=env['lash10_PATHS'] ) -env.AppendUnique( LIBS=[ "ofqf" ] ) +env.AppendUnique( LIBS=[ "ofqf", env['QtGui_LIBS'] ] ) env.Program( target="qtuiobleep", source=["main.cpp",'tuiobleep_gui.ui'] ) From 7793f9f309793072d55530d7d6e842854701fc39 Mon Sep 17 00:00:00 2001 From: Arnold Krille Date: Mon, 23 Apr 2007 19:16:35 +0000 Subject: [PATCH 04/12] Backport the includepath. Fixes #53... --- libofqf/SConscript | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libofqf/SConscript b/libofqf/SConscript index 370a5e4..6a68fc0 100644 --- a/libofqf/SConscript +++ b/libofqf/SConscript @@ -4,6 +4,8 @@ Import( 'env' ) env = env.Copy() +env.AppendUnique( CPPPATH=["."] ) + libofqf = env.SharedLibrary( target="ofqf", source= ['qoscclient.cpp','qosctypes.cpp','qoscserver.cpp'] ) env.InstallAs( env['PREFIX_LIB']+ '/libofqf.so.0.1', libofqf ) From 134f680c88de310ba2b9dd19f101a13733b261c3 Mon Sep 17 00:00:00 2001 From: Arnold Krille Date: Wed, 29 Aug 2007 19:16:08 +0000 Subject: [PATCH 05/12] fix pkg-config path --- SConstruct | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SConstruct b/SConstruct index e81d8e8..9948526 100644 --- a/SConstruct +++ b/SConstruct @@ -96,5 +96,5 @@ env['QT_UICCOM'] = [ env.SConscript( dirs=['libofqf','oscqlient','oscserver','qtuiobleep'], exports="env" ) pkgconfig = env.ScanReplace('ofqf.pc.in') -env.Install( env['PREFIX_LIB'] + '/pkg-config', pkgconfig ) +env.Install( env['PREFIX_LIB'] + '/pkgconfig', pkgconfig ) From 01e0abd69ece8c3079b02ccf49d857744520ee2d Mon Sep 17 00:00:00 2001 From: Arnold Krille Date: Thu, 6 Sep 2007 14:51:59 +0000 Subject: [PATCH 06/12] fix pkgconfig --- Doxyfile | 2 +- ofqf.pc.in | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Doxyfile b/Doxyfile index 07b1342..d64b4b8 100644 --- a/Doxyfile +++ b/Doxyfile @@ -82,7 +82,7 @@ WARN_LOGFILE = #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- -INPUT = /home/arnold/programme/ofqf/libofqf +INPUT = libofqf FILE_PATTERNS = *.c \ *.cc \ *.cxx \ diff --git a/ofqf.pc.in b/ofqf.pc.in index 5a1f414..775ad52 100644 --- a/ofqf.pc.in +++ b/ofqf.pc.in @@ -1,8 +1,8 @@ # This is a comment prefix=$PREFIX # this defines a variable -exec_prefix=${prefix} # defining another variable in terms of the first -libdir=${exec_prefix}/lib -includedir=${prefix}/include/ofqf +exec_prefix=${PREFIX} # defining another variable in terms of the first +libdir=${PREFIX}/lib +includedir=${PREFIX}/include/ofqf Name: libofqf # human-readable name Description: Native OSC for Qt4 # human-readable description From b5d23bd6b9a849f053ca55e0633dd04a1f483afa Mon Sep 17 00:00:00 2001 From: Arnold Krille Date: Thu, 6 Sep 2007 14:52:59 +0000 Subject: [PATCH 07/12] version bump --- ofqf.pc.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ofqf.pc.in b/ofqf.pc.in index 775ad52..d4a117f 100644 --- a/ofqf.pc.in +++ b/ofqf.pc.in @@ -6,7 +6,7 @@ includedir=${PREFIX}/include/ofqf Name: libofqf # human-readable name Description: Native OSC for Qt4 # human-readable description -Version: 0.1 +Version: 0.1.1 URL: http://www.arnoldarts.de/drupal/?q=ofqf Requires: QtNetwork >= 4.2 QtCore >= 4.2 #Conflicts: foobar <= 4.5 From c4de7fd97ff5f355258afaba92016b44b6f186b2 Mon Sep 17 00:00:00 2001 From: Arnold Krille Date: Thu, 6 Sep 2007 20:30:35 +0000 Subject: [PATCH 08/12] actually next released version will be 0.1.2 --- ofqf.pc.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ofqf.pc.in b/ofqf.pc.in index d4a117f..5c5f5db 100644 --- a/ofqf.pc.in +++ b/ofqf.pc.in @@ -6,7 +6,7 @@ includedir=${PREFIX}/include/ofqf Name: libofqf # human-readable name Description: Native OSC for Qt4 # human-readable description -Version: 0.1.1 +Version: 0.1.2 URL: http://www.arnoldarts.de/drupal/?q=ofqf Requires: QtNetwork >= 4.2 QtCore >= 4.2 #Conflicts: foobar <= 4.5 From b489bccc3cf53ca2d015700e779aaefcaab915c6 Mon Sep 17 00:00:00 2001 From: Arnold Krille Date: Tue, 11 Sep 2007 12:58:33 +0000 Subject: [PATCH 09/12] More message --- SConstruct | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/SConstruct b/SConstruct index 9948526..9416ce0 100644 --- a/SConstruct +++ b/SConstruct @@ -70,7 +70,10 @@ env = conf.Finish() env['PREFIX'] = ARGUMENTS.get('PREFIX', '/usr/local') if not env.has_key('PREFIX'): - print "No Prefix set! Will assume /usr/local. To change it use 'scons PREFIX=...'" + print """\ +No Prefix set! Will assume /usr/local. To change it use 'scons PREFIX=' +Note that Date: Tue, 11 Sep 2007 12:58:50 +0000 Subject: [PATCH 10/12] More message --- SConstruct | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SConstruct b/SConstruct index 9416ce0..204cbd3 100644 --- a/SConstruct +++ b/SConstruct @@ -96,7 +96,7 @@ env['QT_UICCOM'] = [ CLVar('touch ${TARGETS[2]}') ] ## target processing is done in the subdirectory -env.SConscript( dirs=['libofqf','oscqlient','oscserver','qtuiobleep'], exports="env" ) +env.SConscript( dirs=['libofqf','oscqlient','oscserver'], exports="env" ) pkgconfig = env.ScanReplace('ofqf.pc.in') env.Install( env['PREFIX_LIB'] + '/pkgconfig', pkgconfig ) From 1f8e7954953fff3ed04da992168ed72f57e09e34 Mon Sep 17 00:00:00 2001 From: Arnold Krille Date: Tue, 11 Sep 2007 12:59:27 +0000 Subject: [PATCH 11/12] remove qtuiobleep. The version in trunk is _much_ nicer and will be released with ofqf0.2... --- qtuiobleep/SConscript | 15 ---- qtuiobleep/main.cpp | 46 ----------- qtuiobleep/main.h | 48 ------------ qtuiobleep/tuiobleep_gui.ui | 150 ------------------------------------ 4 files changed, 259 deletions(-) delete mode 100644 qtuiobleep/SConscript delete mode 100644 qtuiobleep/main.cpp delete mode 100644 qtuiobleep/main.h delete mode 100644 qtuiobleep/tuiobleep_gui.ui diff --git a/qtuiobleep/SConscript b/qtuiobleep/SConscript deleted file mode 100644 index b7feb59..0000000 --- a/qtuiobleep/SConscript +++ /dev/null @@ -1,15 +0,0 @@ -#! /usr/bin/env python - -Import( 'env' ) - -env = env.Copy() - -env.AppendUnique( CPPPATH=[ "#/libofqf" ] ) -#env.AppendUnique( CPPPATH=env['jack_CFLAGS'] ) -#env.AppendUnique( CPPPATH=env['lash10_CFLAGS'] ) -env.AppendUnique( LIBPATH=[ "#/libofqf" ] ) -#env.AppendUnique( LIBPATH=env['jack_PATHS'] ) -#env.AppendUnique( LIBPATH=env['lash10_PATHS'] ) -env.AppendUnique( LIBS=[ "ofqf", env['QtGui_LIBS'] ] ) -env.Program( target="qtuiobleep", source=["main.cpp",'tuiobleep_gui.ui'] ) - diff --git a/qtuiobleep/main.cpp b/qtuiobleep/main.cpp deleted file mode 100644 index ecdffff..0000000 --- a/qtuiobleep/main.cpp +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright ( C ) 2007 Arnold Krille - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or ( at your option ) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "main.h" -#include "qoscclient.h" - -#include -#include - -QTuioBleep::QTuioBleep( QWidget* p ) : QWidget( p ) { - setupUi( this ); - client = new QOscClient( QHostAddress( QHostAddress::LocalHost ), 3333, this ); -} -void QTuioBleep::on_angle_valueChanged( double d ) { _angle = d; updateOsc(); } -void QTuioBleep::on_xSlider_valueChanged( int d ) { _x = d; updateOsc(); } -void QTuioBleep::on_ySlider_valueChanged( int d ) { _y = d; updateOsc(); } - -void QTuioBleep::updateOsc() { - client->sendData( "/tuio/2Dobj", QList() << "set" << 1 << 1 << _x /* x */<< _y /* y */ << _angle/* angle */ << 0.0 /* x-move */ << 0.0 /* y-move */ << 0.0 /* angle-move */ << 0.0 /* accel */ << 0.0 /* rotation-accel */ ); -} - -int main( int argc, char** argv ) -{ - QApplication* app = new QApplication( argc, argv ); - - QTuioBleep* w = new QTuioBleep( 0 ); - w->show(); - - return app->exec(); -}; - diff --git a/qtuiobleep/main.h b/qtuiobleep/main.h deleted file mode 100644 index 8a40940..0000000 --- a/qtuiobleep/main.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright ( C ) 2007 Arnold Krille - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or ( at your option ) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef MAIN_H -#define MAIN_H - -#include - -#include "tuiobleep_gui.h" - -class QOscClient; - -class QTuioBleep : public QWidget, private Ui_TuioBleep -{ - Q_OBJECT - public: - QTuioBleep( QWidget* ); - - public slots: - void on_angle_valueChanged( double ); - void on_xSlider_valueChanged( int ); - void on_ySlider_valueChanged( int ); - - void updateOsc(); - private: - double _angle; - double _x; - double _y; - QOscClient* client; -}; - -#endif // MAIN_H - diff --git a/qtuiobleep/tuiobleep_gui.ui b/qtuiobleep/tuiobleep_gui.ui deleted file mode 100644 index 3a6ccf5..0000000 --- a/qtuiobleep/tuiobleep_gui.ui +++ /dev/null @@ -1,150 +0,0 @@ - - TuioBleep - - - - 0 - 0 - 210 - 159 - - - - Form - - - - 9 - - - 6 - - - - - Angle - - - angle - - - - - - - Qt::Horizontal - - - - - - - Y - - - ySlider - - - - - - - 0 - - - 6 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - &Quit - - - - - - - - - Qt::Horizontal - - - - - - - X - - - xSlider - - - - - - - Qt::Horizontal - - - - - - - 10.000000000000000 - - - -10.000000000000000 - - - 0.100000000000000 - - - - - - - Qt::Vertical - - - - 10 - 10 - - - - - - - - - - btnQuit - clicked() - TuioBleep - close() - - - 374 - 203 - - - 210 - 113 - - - - - From 2412c7ac0514b4bd324f537fd7a716127142df68 Mon Sep 17 00:00:00 2001 From: Arnold Krille Date: Tue, 11 Sep 2007 13:01:17 +0000 Subject: [PATCH 12/12] Fix the message --- SConstruct | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SConstruct b/SConstruct index 204cbd3..67da2e5 100644 --- a/SConstruct +++ b/SConstruct @@ -69,9 +69,9 @@ env = conf.Finish() env['PREFIX'] = ARGUMENTS.get('PREFIX', '/usr/local') -if not env.has_key('PREFIX'): +if not ARGUMENTS.has_key('PREFIX'): print """\ -No Prefix set! Will assume /usr/local. To change it use 'scons PREFIX=' +\nNo Prefix set! Will assume /usr/local. To change it use 'scons PREFIX=' Note that