Merge pull request #1635 from gforney/master

move getdata.c and color2rgb.c and headers to the Source shared direc…

Build/smokediff/Makefile

@@ -11,7 +11,7 @@ include ../../scripts/intel_compiler.mak
 
 SMV_TESTFLAG=
 
-VPATH = $(SOURCE_DIR)/smokediff ../../../../FDS/Source $(SOURCE_DIR)/shared $(SOURCE_DIR)/smokeview
+VPATH = $(SOURCE_DIR)/smokediff $(SOURCE_DIR)/shared
 bin = .
 
 ifeq ($(shell echo "check_quotes"),"check_quotes")
@@ -37,7 +37,7 @@ GNU_COMPINFO=-Dpp_COMPVER=\"$(GNU_COMPVERSION)\"
 
 obj = assert.o dmalloc.o histogram.o IOdboundary.o IOdplot.o IOdslice.o main.o readsmv.o\
       file_util.o string_util.o utilities.o  md5.o sha1.o sha256.o stdio_buffer.o\
-      gsmv.o getdata.o color2rgb.o
+      getdata.o color2rgb.o
 objwin = $(obj:.o=.obj)
 
 #*** General Purpose Rules ***

Build/smokezip/Makefile

@@ -14,7 +14,7 @@ OPT =
 
 SMV_TESTFLAG=
 
-VPATH = $(SOURCE_DIR)/smokezip ../../../../FDS/Source $(SOURCE_DIR)/shared $(SOURCE_DIR)/smokeview
+VPATH = $(SOURCE_DIR)/smokezip $(SOURCE_DIR)/shared
 bin = .
 
 ifeq ($(shell echo "check_quotes"),"check_quotes")
@@ -39,7 +39,7 @@ GNU_COMPINFO=-Dpp_COMPVER=\"$(GNU_COMPVERSION)\"
 # Definition of the object variables
 
 obj =    assert.o CNV3dsmoke.o CNVboundary.o CNVpart.o CNVplot3d.o CNVslice.o  \
-         color2rgb.o compress.o csphere.o dmalloc.o file_util.o getdata.o gsmv.o histogram.o \
+         color2rgb.o compress.o csphere.o dmalloc.o file_util.o getdata.o histogram.o \
          isobox.o lightsmoke.o main.o md5.o readfiles.o sha1.o sha256.o stdio_buffer.o \
          string_util.o threader.o utilities.o 
 

CMakeLists.txt

@@ -185,9 +185,8 @@ add_executable(smokeview
     Source/shared/sha256.c
     Source/shared/stdio_m.c
     Source/shared/stdio_buffer.c
-    Source/smokeview/gsmv.c
-    Source/smokeview/getdata.c
-    Source/smokeview/color2rgb.c
+    Source/shared/getdata.c
+    Source/shared/color2rgb.c
     Source/smokeview/colortable.c
     Source/smokeview/command_args.c
 )
@@ -379,9 +378,8 @@ add_executable(smokediff
     Source/shared/sha1.c
     Source/shared/sha256.c
     Source/shared/stdio_buffer.c
-    Source/smokeview/gsmv.c
-    Source/smokeview/getdata.c
-    Source/smokeview/color2rgb.c
+    Source/shared/getdata.c
+    Source/shared/color2rgb.c
 )
 target_include_directories(smokediff PRIVATE
     Source/smokediff
@@ -428,8 +426,7 @@ add_executable(smokezip
     Source/shared/sha1.c
     Source/shared/sha256.c
     Source/shared/stdio_buffer.c
-    Source/smokeview/gsmv.c
-    Source/smokeview/getdata.c
+    Source/shared/getdata.c
 )
 
 target_include_directories(smokezip PRIVATE

Source/smokediff/IOdboundary.c

@@ -5,7 +5,7 @@
 #include "svdiff.h"
 #include "MALLOCC.h"
 #include "file_util.h"
-#include "../smokeview/getdata.h"
+#include "getdata.h"
 
 /* ------------------ setup_slice ------------------------ */
 

Source/smokediff/IOdplot.c

@@ -7,7 +7,7 @@
 #include "MALLOCC.h"
 #include "datadefs.h"
 #include "file_util.h"
-#include "../smokeview/getdata.h"
+#include "getdata.h"
 
 /* ------------------ SetupPlot3D ------------------------ */
 

Source/smokediff/IOdslice.c

@@ -7,7 +7,7 @@
 #include "MALLOCC.h"
 #include "datadefs.h"
 #include "file_util.h"
-#include "../smokeview/getdata.h"
+#include "getdata.h"
 
 /* ------------------ setup_slice ------------------------ */
 

Source/smokediff/readsmv.c

@@ -5,8 +5,7 @@
 #include <math.h>
 #include "svdiff.h"
 #include "MALLOCC.h"
-// TODO: Fix this by moving to shared
-#include "../smokeview/getdata.h"
+#include "getdata.h"
 
 /* ------------------ ReadSMV ------------------------ */