From 410f09ef6b5e79622cc9f968ce9f3c23b0121196 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Sun, 11 Oct 2015 18:41:43 +0100 Subject: [PATCH] Updated workflow. Much nicer now! --- Makefile | 9 ++++----- src/main.cpp | 2 +- src/{libs => }/strings/strings.cpp | 0 3 files changed, 5 insertions(+), 6 deletions(-) rename src/{libs => }/strings/strings.cpp (100%) diff --git a/Makefile b/Makefile index fc9f503..6c7ff21 100644 --- a/Makefile +++ b/Makefile @@ -1,17 +1,16 @@ -BUILD_ARGS = -Wall -Werror -Isrc/libs/ +BUILD_ARGS = -Wall -Werror -Isrc/ -build: libraries +build: g++ src/main.cpp -Ldist/* $(BUILD_ARGS) -o enigma libraries: mkdir -p dist/ - for dir in src/libs/*; do\ - echo "cd into" $$dir; \ + for dir in src/*/; do\ cd $$dir; \ g++ -c *.cpp ; \ - mv *.o ../../../dist/ ; \ + mv *.o ../../dist/ ; \ done diff --git a/src/main.cpp b/src/main.cpp index 33fda9e..4c6ed4e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2,6 +2,6 @@ #include "strings/strings.cpp" int main() { - std::cout << getString(); + std::cout << getString() << std::endl; return 0; } \ No newline at end of file diff --git a/src/libs/strings/strings.cpp b/src/strings/strings.cpp similarity index 100% rename from src/libs/strings/strings.cpp rename to src/strings/strings.cpp