From 0ba2803f26cad4aa5ecae32275f060c961f9aa57 Mon Sep 17 00:00:00 2001 From: Thomas Frauendorfer Date: Tue, 1 Sep 2009 00:11:34 +0200 Subject: [PATCH] OTHER: revert change to build resources as static library If resources are build as static libraries they have to be initializes manually I have to add some code do that automatically --- data/CleanAMP.qrc | 1 - src/wscript | 2 +- wscript | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/data/CleanAMP.qrc b/data/CleanAMP.qrc index 842cbbb..d24cf9b 100644 --- a/data/CleanAMP.qrc +++ b/data/CleanAMP.qrc @@ -6,7 +6,6 @@ CleanAMP/monoster.png CleanAMP/PLEDIT.TXT CleanAMP/ReadMe.txt - CleanAMP/Thumbs.db CleanAMP/VIDEO.png CleanAMP/Volume.png CleanAMP/balance.png diff --git a/src/wscript b/src/wscript index 8a978b3..f1c0825 100644 --- a/src/wscript +++ b/src/wscript @@ -100,7 +100,7 @@ def build(bld): obj.target = 'promoe' obj.includes = incdirs obj.source = sources - obj.uselib_local = 'promoe_lib promoe_data' + obj.uselib_local = 'promoe_lib' obj.uselib = 'QTCORE QTGUI AVAHI-CLIENT AVAHI-QT4' pass diff --git a/wscript b/wscript index 1bf71ba..f4808e5 100644 --- a/wscript +++ b/wscript @@ -65,7 +65,7 @@ def configure(conf): os.path.join(conf.env['PROMOE_DATADIR'], 'Skins')) conf.sub_config('lib') - conf.sub_config('data') +# conf.sub_config('data') conf.sub_config('src') conf.write_config_header('promoe_config.h') @@ -75,7 +75,7 @@ def configure(conf): def build(bld): bld.add_subdirs('lib') - bld.add_subdirs('data') +# bld.add_subdirs('data') bld.add_subdirs('src') bld.install_files('${MANDIR}/man1', 'promoe.1')