refactor dependencies

bin/makefile

@@ -128,7 +128,7 @@ CPPFLAGS = $(CPP_DEFS) $(INC_FLAGS)
 vpath %.cpp ../src:../src/inih/cpp
 vpath %.c ../src/inih
 
-SOURCES := general_io.cpp slabcc_math.cpp vasp.cpp slabcc.cpp stdafx.cpp slabcc_model.cpp slabcc_input.cpp ini.c INIReader.cpp madelung.cpp isolated.cpp
+SOURCES := general_io.cpp slabcc_math.cpp vasp.cpp slabcc.cpp slabcc_model.cpp slabcc_input.cpp ini.c INIReader.cpp madelung.cpp isolated.cpp
 OBJECTS := $(addprefix $(OBJ_PATH)/,$(patsubst %.c,%.o,$(SOURCES:.cpp=.o)))
 LIBRARIES = $(NLOPT_LIB_FILE)
 EXECUTABLE := slabcc

src/general_io.hpp

@@ -8,8 +8,8 @@
 #include "nlopt.hpp"
 #include "sinks/basic_file_sink.h"
 #include "sinks/stdout_color_sinks.h"
+#include "slabcc_info.hpp"
 #include "spdlog.h"
-#include "stdafx.h"
 
 extern int verbosity_level;
 

src/inih/cpp/INIReader.h

@@ -9,12 +9,16 @@
 #define __INIREADER_H__
 
 #include "general_io.hpp"
-#include "stdafx.h"
 #include <armadillo>
 #include <boost/predef.h>
 #include <cctype>
 #include <cstdlib>
 
+#ifdef MKL
+#include "mkl_service.h"
+#include "mkl_types.h"
+#endif
+
 // Read an INI file into easy-to-access name/value pairs.
 class INIReader {
 public:

src/madelung.hpp

@@ -4,7 +4,6 @@
 
 #pragma once
 #include "slabcc_math.hpp"
-#include "stdafx.h"
 
 // returns a matrix of the vectors for the repeated images which are inside the
 // radius in the lattice

src/slabcc.cpp

@@ -2,11 +2,7 @@
 // Copyrights licensed under the 2-Clause BSD License.
 // See the accompanying LICENSE.txt file for terms.
 
-#include "isolated.hpp"
-#include "slabcc_consts.hpp"
-#include "slabcc_model.hpp"
-#include "stdafx.h"
-#include "vasp.hpp"
+#include "slabcc.hpp"
 
 int verbosity_level = 0;
 

src/slabcc.hpp

@@ -0,0 +1,8 @@
+#pragma once
+
+#include <future>
+
+#include "isolated.hpp"
+#include "slabcc_consts.hpp"
+#include "slabcc_model.hpp"
+#include "vasp.hpp"

src/slabcc_info.hpp

@@ -3,26 +3,3 @@
 constexpr auto SLABCC_VERSION_MAJOR = 0;
 constexpr auto SLABCC_VERSION_MINOR = 8;
 constexpr auto SLABCC_VERSION_PATCH = 5;
-
-
-#include "targetver.h"
-
-#include <future>
-
-#include <fstream>
-#include <iomanip>
-#include <iostream>
-#include <sstream>
-#include <stdio.h>
-
-#include <chrono>
-#include <string>
-#include <unordered_map>
-#include <vector>
-
-#include <algorithm>
-
-#ifdef MKL
-#include "mkl_service.h"
-#include "mkl_types.h"
-#endif