summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-10-21 15:50:32 +0000
committerDavid Robillard <d@drobilla.net>2011-10-21 15:50:32 +0000
commit4957c342b592ac1cc2c8983d1acfe957def8b3c6 (patch)
tree8872dae307c3e13f7efdabd033afd548e5351163 /src/gui
parentbcc2b2a1032306711591ae59205b81ed67d08387 (diff)
downloadingen-4957c342b592ac1cc2c8983d1acfe957def8b3c6.tar.gz
ingen-4957c342b592ac1cc2c8983d1acfe957def8b3c6.tar.bz2
ingen-4957c342b592ac1cc2c8983d1acfe957def8b3c6.zip
Use modern terser waf syntax.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3556 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/SubpatchModule.cpp3
-rw-r--r--src/gui/wscript50
2 files changed, 27 insertions, 26 deletions
diff --git a/src/gui/SubpatchModule.cpp b/src/gui/SubpatchModule.cpp
index 3cadb506..2c5c968a 100644
--- a/src/gui/SubpatchModule.cpp
+++ b/src/gui/SubpatchModule.cpp
@@ -21,8 +21,9 @@
#include "ingen/ServerInterface.hpp"
#include "ingen/client/PatchModel.hpp"
+#include "shared/LV2URIMap.hpp"
+
#include "App.hpp"
-#include "LV2URIMap.hpp"
#include "NodeControlWindow.hpp"
#include "NodeModule.hpp"
#include "PatchCanvas.hpp"
diff --git a/src/gui/wscript b/src/gui/wscript
index ca254d45..bac2127d 100644
--- a/src/gui/wscript
+++ b/src/gui/wscript
@@ -3,7 +3,30 @@ from waflib.extras import autowaf as autowaf
import waflib.Utils as Utils
def build(bld):
- obj = bld(features = 'cxx cxxshlib')
+ obj = bld(features = 'cxx cxxshlib',
+ export_includes = ['../../include'],
+ includes = ['..', '../..', '../../include'],
+ name = 'libingen_gui',
+ target = 'ingen_gui',
+ install_path = '${LIBDIR}',
+ use = 'libingen_shared libingen_client libingen_serialisation')
+ autowaf.use_lib(bld, obj, '''
+ CURL
+ FLOWCANVAS
+ GLADEMM
+ GLIBMM
+ GNOMECANVASMM
+ GTKMM
+ LILV
+ LV2CORE
+ RAUL
+ SIGCPP
+ SORD
+ SOUP
+ SUIL
+ WEBKIT
+ ''')
+
obj.source = '''
App.cpp
BreadCrumbs.cpp
@@ -42,33 +65,10 @@ def build(bld):
if bld.is_defined('HAVE_CURL'):
obj.source += 'UploadPatchWindow.cpp'
- obj.export_includes = ['.']
- obj.includes = ['.', '..', '../..', '../../include', '../client', '../module']
- obj.name = 'libingen_gui'
- obj.target = 'ingen_gui'
- obj.install_path = '${LIBDIR}'
- obj.use = 'libingen_shared libingen_client libingen_serialisation'
- autowaf.use_lib(bld, obj, '''
- CURL
- FLOWCANVAS
- GLADEMM
- GLIBMM
- GNOMECANVASMM
- GTKMM
- LILV
- LV2CORE
- RAUL
- SIGCPP
- SORD
- SOUP
- SUIL
- WEBKIT
- ''')
-
# XML UI definition
bld(features = 'subst',
source = 'ingen_gui.ui',
target = '../../ingen_gui.ui',
install_path = '${DATADIR}/ingen',
chmod = Utils.O755,
- INGEN_VERSION = bld.env['INGEN_VERSION'])
+ INGEN_VERSION = bld.env['INGEN_VERSION'])