From 79d1513ebdd80b55bf2b13857c659b0bbb2c7533 Mon Sep 17 00:00:00 2001 From: suhrke Date: Wed, 23 Aug 2017 20:30:27 -0700 Subject: [PATCH] Reorganization to more typical project structure --- .gitmodules | 4 ++-- Makefile | 6 +++--- {src => include}/EntityConverter.hpp | 0 {src => include}/brushdef.hpp | 0 {src => include}/oopless-parser.hpp | 0 {src => include}/planes.h | 0 {src => include}/worldspawn.h | 0 {includes => lib}/Catch | 0 {includes => lib}/cxxopts | 0 9 files changed, 5 insertions(+), 5 deletions(-) rename {src => include}/EntityConverter.hpp (100%) rename {src => include}/brushdef.hpp (100%) rename {src => include}/oopless-parser.hpp (100%) rename {src => include}/planes.h (100%) rename {src => include}/worldspawn.h (100%) rename {includes => lib}/Catch (100%) rename {includes => lib}/cxxopts (100%) diff --git a/.gitmodules b/.gitmodules index 7c5b405..2bf1532 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "includes/cxxopts"] - path = includes/cxxopts + path = lib/cxxopts url = https://github.com/jarro2783/cxxopts.git [submodule "includes/Catch"] - path = includes/Catch + path = lib/Catch url = https://github.com/philsquared/Catch.git diff --git a/Makefile b/Makefile index 683a326..fb4ccc1 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,12 @@ EX=reflex2q3 CC=g++ -CFLAGS=-std=c++11 -I"./src" -I"./includes" -I"./includes/Catch/single_include" -I"./includes/cxxopts/include" -I"/usr/include/eigen3" -TESTEX=runtests +CFLAGS=-std=c++11 -I"include" -I"lib/Catch/single_include" -I"lib/cxxopts/include" -I"/usr/include/eigen3" +TESTEX=bin/runtests all: main test main: planes.o brushdef.o oopless-parser.o EntityConverter.o - $(CC) $^ src/main.cpp $(CFLAGS) -o $(EX) #2>error8.log + $(CC) $^ src/main.cpp $(CFLAGS) -o $(EX) test: planes.o brushdef.o oopless-parser.o EntityConverter.o catch.o $(CC) $^ $(CFLAGS) -o $(TESTEX) diff --git a/src/EntityConverter.hpp b/include/EntityConverter.hpp similarity index 100% rename from src/EntityConverter.hpp rename to include/EntityConverter.hpp diff --git a/src/brushdef.hpp b/include/brushdef.hpp similarity index 100% rename from src/brushdef.hpp rename to include/brushdef.hpp diff --git a/src/oopless-parser.hpp b/include/oopless-parser.hpp similarity index 100% rename from src/oopless-parser.hpp rename to include/oopless-parser.hpp diff --git a/src/planes.h b/include/planes.h similarity index 100% rename from src/planes.h rename to include/planes.h diff --git a/src/worldspawn.h b/include/worldspawn.h similarity index 100% rename from src/worldspawn.h rename to include/worldspawn.h diff --git a/includes/Catch b/lib/Catch similarity index 100% rename from includes/Catch rename to lib/Catch diff --git a/includes/cxxopts b/lib/cxxopts similarity index 100% rename from includes/cxxopts rename to lib/cxxopts