brian/promoe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed build system again

Browse source
This commit is contained in:
Brian Hrebec 2013-03-19 15:07:28 -07:00
parent 998125919d
commit 3880262046
3 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
backend_xmmsclient++/wscript
View file

@ -53,10 +53,9 @@ def build(bld):
obj = bld.new_task_gen(features='qt4 cstaticlib cxx') obj = bld.new_task_gen(features='qt4 cstaticlib cxx')
obj.target = 'backend_lib' obj.target = 'backend_lib'
obj.install_path = 0 # Don't install obj.install_path = 0 # Don't install
obj.includes = ['.', '/usr/include/QtGui', '/usr/include/QtCore', '/usr/include/xmms2'] obj.includes = '.'
obj.source = lib_source obj.source = lib_source
obj.uselib = 'libQtCore libQtGui XMMS2-CLIENT-CPP' obj.uselib = 'QTCORE QTGUI XMMS2-CLIENT-CPP'
obj.export_incdirs = '.' obj.export_incdirs = '.'
print dir(obj)
pass pass

2
dir_iterator/wscript
View file

@ -57,7 +57,7 @@ def build(bld):
obj = bld.new_task_gen(features='qt4 cstaticlib cxx') obj = bld.new_task_gen(features='qt4 cstaticlib cxx')
obj.target = 'dir_iterator' obj.target = 'dir_iterator'
obj.install_path = 0 # Don't install obj.install_path = 0 # Don't install
obj.includes = ['.', '/usr/include/QtCore', '/usr/include/QtGui'] obj.includes = '.'
obj.source = sources obj.source = sources
obj.uselib = 'QTCORE QTGUI LIBARCHIVE' obj.uselib = 'QTCORE QTGUI LIBARCHIVE'
obj.export_incdirs = '.' obj.export_incdirs = '.'

10
src/wscript
View file

@ -60,8 +60,8 @@ def files_subdirs(subdirs, filters = ['.cpp', '.ui'], basedir='.'):
for dir in subdirs: for dir in subdirs:
d = os.path.join(basedir, dir) d = os.path.join(basedir, dir)
for file in os.listdir(d): for file in os.listdir(d):
for filt in filters: for filter in filters:
if file.endswith(filt): if file.endswith(filter):
ret.append(os.path.join(dir, file)) ret.append(os.path.join(dir, file))
return ret return ret
@ -92,10 +92,6 @@ def build(bld):
incdirs = bld_subdirs incdirs = bld_subdirs
incdirs.append('.') incdirs.append('.')
incdirs.append('/usr/include/QtCore')
incdirs.append('/usr/include/QtGui')
incdirs.append('/usr/include/QtNetwork')
incdirs.append('/usr/include/xmms2')
obj = bld.new_task_gen(features='qt4 cprogram cxx') obj = bld.new_task_gen(features='qt4 cprogram cxx')
obj.target = 'promoe' obj.target = 'promoe'
@ -103,6 +99,6 @@ def build(bld):
obj.source = sources obj.source = sources
obj.uselib_local = 'backend_lib dir_iterator' obj.uselib_local = 'backend_lib dir_iterator'
obj.add_objects = 'promoe_data' obj.add_objects = 'promoe_data'
obj.uselib = 'QtCore QtGui AVAHI-CLIENT AVAHI-QT4' obj.uselib = 'QTCORE QTGUI AVAHI-CLIENT AVAHI-QT4'
pass pass