diff options
| author | gregory guy <[email protected]> | 2020-06-13 16:09:24 +0200 |
|---|---|---|
| committer | gregory guy <[email protected]> | 2020-06-13 16:09:24 +0200 |
| commit | 2c9bc9b806f533df7b8f5349467d0f4be95314a4 (patch) | |
| tree | 15f82ae94dd430374f3d939958912c4fb2855326 /scons | |
| parent | 38eaf7209a322a622e1b898eaa5477568ca9c6b6 (diff) | |
| download | codeine-2c9bc9b806f533df7b8f5349467d0f4be95314a4.tar.gz codeine-2c9bc9b806f533df7b8f5349467d0f4be95314a4.zip | |
Conversion qt3 -> tqt3
Signed-off-by: gregory guy <[email protected]>
Diffstat (limited to 'scons')
| -rw-r--r-- | scons/codeine.py | 4 | ||||
| -rw-r--r-- | scons/kde.py | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/scons/codeine.py b/scons/codeine.py index 742cc78..f65d97c 100644 --- a/scons/codeine.py +++ b/scons/codeine.py @@ -16,7 +16,7 @@ def generate( env ): if 'configure' in env['TARGS']: xine_lib_test_source_file = """ - #include <qstring.h> + #include <ntqstring.h> #include <xine.h> int main( int argc, char **argv ) @@ -58,7 +58,7 @@ def generate( env ): # this seems to import the user's CXXFLAGS, etc., which may break confenv = env.Copy() configure = confenv.Configure(custom_tests = {'CheckXineLib' : CheckXineLib, 'CheckKdeLibs' : CheckKdeLibs}, log_file='configure.log') - confenv.AppendUnique(LIBS = 'qt-mt') + confenv.AppendUnique(LIBS = 'tqt-mt') confenv.AppendUnique(LINKFLAGS = '-L/usr/X11R6/lib') if not configure.CheckKdeLibs(): diff --git a/scons/kde.py b/scons/kde.py index 8fa492b..33f9f3a 100644 --- a/scons/kde.py +++ b/scons/kde.py @@ -146,15 +146,15 @@ def detect_kde(env): ## check for the qt and kde includes print "Checking for the qt includes : ", - if qtincludes and os.path.isfile(qtincludes + "/qlayout.h"): + if qtincludes and os.path.isfile(qtincludes + "/ntqlayout.h"): # The user told where to look for and it looks valid print GREEN + "ok " + qtincludes + NORMAL else: - if os.path.isfile(qtdir + "/include/qlayout.h"): + if os.path.isfile(qtdir + "/include/ntqlayout.h"): # Automatic detection print GREEN + "ok " + qtdir + "/include/ " + NORMAL qtincludes = qtdir + "/include/" - elif os.path.isfile("/usr/include/qt3/qlayout.h"): + elif os.path.isfile("/usr/include/qt3/ntqlayout.h"): # Debian probably print YELLOW + "the qt headers were found in /usr/include/qt3/ " + NORMAL qtincludes = "/usr/include/qt3" @@ -448,7 +448,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt env['QT_UIC_HFLAGS'] = '-L $QTPLUGINS -nounload' env['QT_UIC_CFLAGS'] = '$QT_UIC_HFLAGS -tr tr2i18n' - env['QT_LIBS'] = 'qt-mt' + env['QT_LIBS'] = 'tqt-mt' env['LIBTOOL_FLAGS'] = '--silent --mode=compile --tag=CXX' |