Browse Source

Upgrade waf to 2.0.18

Closes #253
tags/non-daw-v1.3.0
Jonathan Moore Liles 1 year ago
parent
commit
d958df0486
4 changed files with 29 additions and 8 deletions
  1. +1
    -1
      lib/ntk
  2. +18
    -0
      tools.waf/ntk_fluid.py
  3. +9
    -6
      waf
  4. +1
    -1
      wscript

+ 1
- 1
lib/ntk

@@ -1 +1 @@
Subproject commit 71a410b2e1f79f89b453c91ead3c5d668f6a7d97
Subproject commit dae177189b12f74ea01ac2389b76326c06d9be78

+ 18
- 0
tools.waf/ntk_fluid.py View File

@@ -0,0 +1,18 @@
from waflib import Task
from waflib.TaskGen import extension

class ntk_fluid(Task.Task):
color = 'BLUE'
ext_out = ['.h']
run_str = '${NTK_FLUID} -c -o ${TGT[0].abspath()} -h ${TGT[1].abspath()} ${SRC}'

@extension('.fl')
def fluid(self, node):
"""add the .fl to the source list; the cxx file generated will be compiled when possible"""
cpp = node.change_ext('.C')
hpp = node.change_ext('.H')
self.create_task('ntk_fluid', node, [cpp, hpp])

if 'cxx' in self.features:
self.source.append(cpp)


+ 9
- 6
waf
File diff suppressed because it is too large
View File


+ 1
- 1
wscript View File

@@ -31,7 +31,7 @@ def configure(conf):
conf.load('compiler_c')
conf.load('compiler_cxx')
conf.load('gnu_dirs')
conf.load('ntk_fluid')
conf.load('ntk_fluid',tooldir='tools.waf')
conf.load('gccdeps')
conf.line_just = 52



Loading…
Cancel
Save