From bc2a3aad8f28e1a47d27cd90f6b4c1030edccf41 Mon Sep 17 00:00:00 2001 From: suhrke Date: Thu, 6 Apr 2017 18:23:47 -0700 Subject: [PATCH] updated for linux --- ReflexToQ3/.gitignore | 3 +++ ReflexToQ3/Makefile | 12 ++++++++++++ ReflexToQ3/includes/libraries.h | 6 +++--- ReflexToQ3/makefile | 12 ------------ 4 files changed, 18 insertions(+), 15 deletions(-) create mode 100644 ReflexToQ3/Makefile delete mode 100644 ReflexToQ3/makefile diff --git a/ReflexToQ3/.gitignore b/ReflexToQ3/.gitignore index 1913e0b..d8171e6 100644 --- a/ReflexToQ3/.gitignore +++ b/ReflexToQ3/.gitignore @@ -4,3 +4,6 @@ *.exe *.log + +# executables +reflex2q3_* diff --git a/ReflexToQ3/Makefile b/ReflexToQ3/Makefile new file mode 100644 index 0000000..b85d6a8 --- /dev/null +++ b/ReflexToQ3/Makefile @@ -0,0 +1,12 @@ +EXV6=reflex2q3_v6 +EXV8=reflex2q3_v8 +CC=g++ +CFLAGS=-std=c++11 -I"includes" -I"/usr/include/eigen3" + +all: v6 v8 + +v6: + $(CC) includes/mapparser.cpp main.cpp $(CFLAGS) -o $(EXV6) 2>error6.log + +v8: + $(CC) includes/v8mapparser.cpp main.cpp $(CFLAGS) -o $(EXV8) 2>error8.log diff --git a/ReflexToQ3/includes/libraries.h b/ReflexToQ3/includes/libraries.h index ca44d42..5016049 100644 --- a/ReflexToQ3/includes/libraries.h +++ b/ReflexToQ3/includes/libraries.h @@ -15,8 +15,8 @@ // Platform Libraries #define NOMINMAX -#define WIN32_LEAN_AND_MEAN -#include +//#define WIN32_LEAN_AND_MEAN +//#include /* // Chronokun Libraries #include "ckmath/ckmath.h" */ @@ -44,4 +44,4 @@ #define Y 1 #define Z 2 -#endif \ No newline at end of file +#endif diff --git a/ReflexToQ3/makefile b/ReflexToQ3/makefile deleted file mode 100644 index 83ae8b9..0000000 --- a/ReflexToQ3/makefile +++ /dev/null @@ -1,12 +0,0 @@ -EXV6=reflex2q3_v6 -EXV8=reflex2q3_v8 -CC=g++ -CFLAGS=-std=c++11 -I"includes" - -all: V6 V8 - -V6: - $(CC) includes/mapparser.cpp main.cpp $(CFLAGS) -o $(EXV6) 2>error6.log - -V8: - $(CC) includes/mapparser.cpp main.cpp $(CFLAGS) -o $(EXV8) 2>error8.log \ No newline at end of file