Merge master.

[dcpomatic.git] / src / wscript

diff --git a/src/wscript b/src/wscript
index 3216dc07a81469a0475bba2de23feb92f29f7244..f3a6a8c7beab1d8480273ee29099a99e4fb6888b 100644 (file)
--- a/src/wscript
+++ b/src/wscript
@@ -1,12 +1,20 @@
 def configure(conf):
-    conf.recurse('lib')
-    conf.recurse('asdcplib')
+    conf.recurse('tools')
     if not conf.env.DISABLE_GUI:
-        conf.recurse('gtk')
+        conf.recurse('wx')
 
 def build(bld):
     bld.recurse('lib')
     bld.recurse('tools')
-    bld.recurse('asdcplib')
     if not bld.env.DISABLE_GUI:
-        bld.recurse('gtk')
+        bld.recurse('wx')
+
+def pot(bld):
+    bld.recurse('lib')
+    bld.recurse('wx')
+    bld.recurse('tools')
+
+def pot_merge(bld):
+    bld.recurse('lib')
+    bld.recurse('wx')
+    bld.recurse('tools')