Merge branch 'feature/upstream' into develop

6 files changed, 3 insertions, 0 deletions

diff --git a/namedc/Jamfile b/namedc/Jamfile
index 62d4c7e..af70dee 100644..100755
--- a/namedc/Jamfile
+++ b/namedc/Jamfile
@@ -13,6 +13,8 @@ Library libnamedc : namedc.c ;
 LINKLIBS = ./libnamedc ../xicc/libxicc ../spectro/libconv ../icc/libicc ../cgats/libcgats
            ../plot/libplot ../numlib/libui ../numlib/libnum ../xml/libmxml ;
 
+LINKFLAGS += $(GUILINKFLAGS) ;
+
 # Individual stand alone test of namedc
 MainVariant namedc : namedc.c : : STANDALONE_TEST ;
 
diff --git a/namedc/License.txt b/namedc/License.txt
index a871fcf..a871fcf 100644..100755
--- a/namedc/License.txt
+++ b/namedc/License.txt
diff --git a/namedc/afiles b/namedc/afiles
index cd1bf61..cd1bf61 100644..100755
--- a/namedc/afiles
+++ b/namedc/afiles
diff --git a/namedc/namedc.c b/namedc/namedc.c
index 2fc7796..2fc7796 100644..100755
--- a/namedc/namedc.c
+++ b/namedc/namedc.c
diff --git a/namedc/namedc.h b/namedc/namedc.h
index cc8917d..cc8917d 100644..100755
--- a/namedc/namedc.h
+++ b/namedc/namedc.h
diff --git a/namedc/txt2iccnc.c b/namedc/txt2iccnc.c
index 3ea1bc9..cd6fb6e 100644..100755
--- a/namedc/txt2iccnc.c
+++ b/namedc/txt2iccnc.c
@@ -32,6 +32,7 @@
 #else
 #include "numsup.h"
 #endif
+#include "cgats.h"
 #include "xspect.h"
 #include "ui.h"