Correct include precedence. Update Makefile.
This commit is contained in:
parent
e136c1b2c0
commit
b64418b584
6
Makefile
6
Makefile
|
@ -1,7 +1,7 @@
|
||||||
SOURCES = $(wildcard src/*.cpp)
|
SOURCES = $(wildcard src/*.cpp)
|
||||||
OBJECTS = $(SOURCES:%.cpp=%.o)
|
OBJECTS = $(SOURCES:%.cpp=%.o)
|
||||||
APPLICATION = arma-flow
|
APPLICATION = arma-flow
|
||||||
CXXFLAGS = -Wall -c -O2 -std=c++17 -o
|
CXXFLAGS = -Wall -c -O2 -std=c++17
|
||||||
LDFLAGS = -larmadillo -ljanus -lstdc++fs
|
LDFLAGS = -larmadillo -ljanus -lstdc++fs
|
||||||
|
|
||||||
all: ${OBJECTS} ${APPLICATION}
|
all: ${OBJECTS} ${APPLICATION}
|
||||||
|
@ -10,7 +10,7 @@ ${APPLICATION}: ${OBJECTS}
|
||||||
${CXX} -o $@ ${OBJECTS} ${LDFLAGS}
|
${CXX} -o $@ ${OBJECTS} ${LDFLAGS}
|
||||||
|
|
||||||
${OBJECTS}:
|
${OBJECTS}:
|
||||||
${CXX} ${CXXFLAGS} $@ ${@:%.o=%.cpp}
|
${CXX} ${CXXFLAGS} -o $@ ${@:%.o=%.cpp}
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f ${APPLICATION} ${OBJECTS}
|
rm -f ${APPLICATION} ${OBJECTS}
|
||||||
|
|
|
@ -4,10 +4,10 @@
|
||||||
// @author CismonX
|
// @author CismonX
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <experimental/filesystem>
|
|
||||||
|
|
||||||
#include "reader.hpp"
|
#include "reader.hpp"
|
||||||
|
|
||||||
|
#include <experimental/filesystem>
|
||||||
|
|
||||||
namespace flow
|
namespace flow
|
||||||
{
|
{
|
||||||
bool reader::from_csv_file(const std::string& path, bool remove_first_line)
|
bool reader::from_csv_file(const std::string& path, bool remove_first_line)
|
||||||
|
|
|
@ -4,6 +4,8 @@
|
||||||
// @author CismonX
|
// @author CismonX
|
||||||
//
|
//
|
||||||
|
|
||||||
|
#include "writer.hpp"
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
#include <Windows.h>
|
#include <Windows.h>
|
||||||
#else
|
#else
|
||||||
|
@ -12,8 +14,6 @@
|
||||||
#include <iomanip>
|
#include <iomanip>
|
||||||
#include <experimental/filesystem>
|
#include <experimental/filesystem>
|
||||||
|
|
||||||
#include "writer.hpp"
|
|
||||||
|
|
||||||
namespace flow
|
namespace flow
|
||||||
{
|
{
|
||||||
int writer::max_elems_per_line()
|
int writer::max_elems_per_line()
|
||||||
|
|
Reference in New Issue