Correct include precedence. Update Makefile.

This commit is contained in:
CismonX 2018-12-13 20:52:46 +08:00
parent e136c1b2c0
commit b64418b584
3 changed files with 7 additions and 7 deletions

View File

@ -1,7 +1,7 @@
SOURCES = $(wildcard src/*.cpp)
OBJECTS = $(SOURCES:%.cpp=%.o)
APPLICATION = arma-flow
CXXFLAGS = -Wall -c -O2 -std=c++17 -o
CXXFLAGS = -Wall -c -O2 -std=c++17
LDFLAGS = -larmadillo -ljanus -lstdc++fs
all: ${OBJECTS} ${APPLICATION}
@ -10,7 +10,7 @@ ${APPLICATION}: ${OBJECTS}
${CXX} -o $@ ${OBJECTS} ${LDFLAGS}
${OBJECTS}:
${CXX} ${CXXFLAGS} $@ ${@:%.o=%.cpp}
${CXX} ${CXXFLAGS} -o $@ ${@:%.o=%.cpp}
clean:
rm -f ${APPLICATION} ${OBJECTS}
rm -f ${APPLICATION} ${OBJECTS}

View File

@ -4,10 +4,10 @@
// @author CismonX
//
#include <experimental/filesystem>
#include "reader.hpp"
#include <experimental/filesystem>
namespace flow
{
bool reader::from_csv_file(const std::string& path, bool remove_first_line)

View File

@ -4,6 +4,8 @@
// @author CismonX
//
#include "writer.hpp"
#ifdef _WIN32
#include <Windows.h>
#else
@ -12,8 +14,6 @@
#include <iomanip>
#include <experimental/filesystem>
#include "writer.hpp"
namespace flow
{
int writer::max_elems_per_line()