From c330c8b76004852132b2b5f97456c52844320d5e Mon Sep 17 00:00:00 2001 From: K Tyl Date: Wed, 3 Jun 2020 01:19:20 +0100 Subject: [PATCH] Generalise build system --- .gitignore | 0 CMakeLists.txt | 7 ++++++- README.md | 0 run.sh | 6 ++++++ colour.h => src/colour.h | 0 main.cpp => src/main.cpp | 0 vec3.h => src/vec3.h | 0 7 files changed, 12 insertions(+), 1 deletion(-) mode change 100644 => 100755 .gitignore mode change 100644 => 100755 CMakeLists.txt mode change 100644 => 100755 README.md rename colour.h => src/colour.h (100%) mode change 100644 => 100755 rename main.cpp => src/main.cpp (100%) mode change 100644 => 100755 rename vec3.h => src/vec3.h (100%) mode change 100644 => 100755 diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/CMakeLists.txt b/CMakeLists.txt old mode 100644 new mode 100755 index 12e2483..43adef0 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,5 +2,10 @@ cmake_minimum_required(VERSION 3.10) project(flark) -add_executable(flark main.cpp vec3.h colour.h) +file(GLOB flark_src + "src/*.h" + "src/*.cpp" +) + +add_executable(flark ${flark_src}) diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/run.sh b/run.sh index a4a3405..aa54cc5 100755 --- a/run.sh +++ b/run.sh @@ -2,6 +2,12 @@ bin=./flark output=image.ppm viewer=$(which feh) +if [ -f $bin ]; +then + echo "Removing old binary" + rm $bin +fi + # generate makefile cmake . diff --git a/colour.h b/src/colour.h old mode 100644 new mode 100755 similarity index 100% rename from colour.h rename to src/colour.h diff --git a/main.cpp b/src/main.cpp old mode 100644 new mode 100755 similarity index 100% rename from main.cpp rename to src/main.cpp diff --git a/vec3.h b/src/vec3.h old mode 100644 new mode 100755 similarity index 100% rename from vec3.h rename to src/vec3.h