Hi once again.
Disregard that last patch. This one compiles AND links correctly (on
Linux at least.) You need only specify qtdir=/path/to/qt (without a
trailing slash) to SCons and it takes care of the rest.
Sean
<<--------------------------------------------------------------------------------->>
This E-Mail message has been scanned for viruses
and cleared by >>SmartMail<< from Smarter Technology, Inc.
<<--------------------------------------------------------------------------------->>
Index: src/SConscript
===================================================================
--- src/SConscript (revision 2458)
+++ src/SConscript (working copy)
@@ -400,12 +400,30 @@
Exit(1)
else:
#Grabs the QT4 include paths
+ """
env.ParseConfig('pkg-config QtCore --silence-errors --cflags --libs')
env.ParseConfig('pkg-config Qt3Support --silence-errors --cflags') #QT3 support breaks the build
env.ParseConfig('pkg-config QtGui --silence-errors --cflags --libs')
env.ParseConfig('pkg-config QtXml --silence-errors --cflags --libs')
env.ParseConfig('pkg-config QtOpenGL --silence-errors --cflags --libs')
- # Might be missing $QTDIR/include/Qt still...
+ """
+ #Try using David's qt4.py's Qt4-module finding thingy instead of pkg-config.
+ #(This hopefully respects our qtdir=blah flag while linking now.)
+ """
+ env.EnableQt4Modules([
+ 'QtCore',
+ 'QtGui',
+ 'QtOpenGL',
+ 'Qt3Support',
+ 'QtXml',
+ 'QtSvg',
+ #'QtUiTools',
+ #'QtDesigner',
+ #'QtWebKit',
+ ],
+ debug=False,
+ )
+ """
#Check for libasound (libasound2?) (needed for ALSA seq MIDI support)
if not conf.CheckLib('asound') and not conf.CheckForPKG('alsa', '1.0.10'):
@@ -519,13 +537,14 @@
env.Append(CXXFLAGS = '-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS -DQT_THREAD_SUPPORT -DQT_SHARED -DQT_TABLET_SUPPORT') #Stolen from Mixxx's build output
-# Manually add the include paths for win32 and OS X (we use pkg-config on Linux)
+env.Append(CXXFLAGS = '-I$QTDIR/include/Qt3Support -I$QTDIR/include/QtCore -I$QTDIR/include/QtGui -I$QTDIR/include/QtXml -I$QTDIR/include/QtOpenGL -I$QTDIR/include/Qt')
+
if not platform == 'linux':
- env.Append(CXXFLAGS = '-I$QTDIR/include/Qt3Support -I$QTDIR/include/QtCore -I$QTDIR/include/QtGui -I$QTDIR/include/QtXml -I$QTDIR/include/QtOpenGL -I$QTDIR/include/Qt -I"$VCINSTALLDIR/include/atl"')
+ env.Append(CXXFLAGS = '-I"$VCINSTALLDIR/include/atl"')
if not platform == 'win32':
env.Append(CCFLAGS = Split(""" -pipe -Wall -W -g -D_REENTRANT """)) # omghax
- env.Append(LINKFLAGS = Split(""" -pipe -Wall -W -g"""))
+ env.Append(LINKFLAGS = Split(""" -pipe -Wall -W -g -Wl,-rpath,$QTDIR/lib"""))
if platform == 'win32':
env.Append(CXXFLAGS = '-DWIN32 -D__WIN__ -DUNICODE -D_WINDOWS') #for soundtouch
env.Append(CCFLAGS = '-DWIN32 -D__WIN__ -DUNICODE -D_WINDOWS') #for soundtouch
@@ -750,7 +769,7 @@
env.Append(LIBS = 'QtScript4')
else:
env.Append(LIBS = 'QtScript')
- print "SuperCoolAwesomeScript (name contest pending)... enabled"
+ print "MixxxScript (QtScript)... enabled"
build_flags += 'script '
sources += Split("""script/scriptengine.cpp script/scriptcontrolqueue.cpp
script/scriptstudio.cpp script/scriptrecorder.cpp
Index: src/qt4.py
===================================================================
--- src/qt4.py (revision 2458)
+++ src/qt4.py (working copy)
@@ -243,7 +243,7 @@
# TODO: 'Replace' should be 'SetDefault'
# env.SetDefault(
env.Replace(
- QTDIR = _detect(env),
+# QTDIR = _detect(env),
QT4_BINPATH = os.path.join('$QTDIR', 'bin'),
QT4_CPPPATH = os.path.join('$QTDIR', 'include'),
QT4_LIBPATH = os.path.join('$QTDIR', 'lib'),
------------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It is the best place to buy or sell services for
just about anything Open Source.
http://p.sf.net/sfu/Xq1LFB
_______________________________________________
Mixxx-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mixxx-devel
