aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoek Le Blansch <loek@pipeframe.xyz>2024-09-21 15:43:14 +0200
committerLoek Le Blansch <loek@pipeframe.xyz>2024-09-21 15:43:20 +0200
commita12702c912ae0ce96c754ffcb2ab5d901c504b65 (patch)
tree98d921c19ca689a4b82d300de9df79b24552e4c5
parent44affb6635359ef2f619562800165ccfff438ae4 (diff)
remove lazy.mk and update readme
-rw-r--r--contributing.md4
-rw-r--r--lazy.mk33
-rw-r--r--makefile2
-rw-r--r--mwe/dynlink/exec/makefile1
-rw-r--r--mwe/dynlink/lib/makefile1
-rw-r--r--readme.md24
-rw-r--r--src/makefile2
-rw-r--r--test/makefile7
8 files changed, 24 insertions, 50 deletions
diff --git a/contributing.md b/contributing.md
index 40e1edd..832667d 100644
--- a/contributing.md
+++ b/contributing.md
@@ -16,8 +16,9 @@
# Code style
-- Formatting nitty-gritty is handled by clang-format/clang-tidy
- ASCII only
+- Formatting nitty-gritty is handled by clang-format/clang-tidy (run `make
+ format` in the root folder of this repository to format all sources files)
- When using libraries of which the header include order is important, make
sure to separate the include statements using a blank line (clang-format may
sort include statements, but does not sort across empty lines).
@@ -32,7 +33,6 @@
# Documentation
- All documentation is written in U.S. English
-- TODO
# Libraries
diff --git a/lazy.mk b/lazy.mk
deleted file mode 100644
index a591fd5..0000000
--- a/lazy.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# NOTE: CMAKE IS THE PRIMARY BUILD SYSTEM FOR THIS PROJECT. THIS FILE IS
-# PROVIDED PURELY FOR CONVENIENCE, AND SHOULD NOT BECOME AN ESSENTIAL PART OF
-# THE BUILD SYSTEM!
-
-BUILD_DIR ?= build
-TARGET ?= $(BUILD_DIR)/main
-
-# always generate fresh build rules when cmake is re-run
-CMFLAGS += --fresh
-# make cmake shut up
-CMFLAGS += --log-level WARNING
-CMFLAGS += -Wno-deprecated
-
-.PHONY: FORCE
-
-all: FORCE $(TARGET)
-
-$(BUILD_DIR)/build.ninja: CMakeLists.txt
- @mkdir -p $(BUILD_DIR)
- @cmake -B $(BUILD_DIR) -G Ninja $(CMFLAGS)
-
-$(TARGET): $(BUILD_DIR)/build.ninja FORCE
- @ninja -C $(BUILD_DIR)
-
-clean: FORCE
- $(RM) -r $(BUILD_DIR)
-
-# Forward any unknown targets to Ninja
-ifneq ($(MAKECMDGOALS),)
-%::
- @ninja -C $(BUILD_DIR) $@
-endif
-
diff --git a/makefile b/makefile
index 3792250..737e7a8 100644
--- a/makefile
+++ b/makefile
@@ -1,5 +1,3 @@
-all: $(TARGET) # TARGET is defined in lazy.mk (build/main)
-
.PHONY: FORCE
doxygen: Doxyfile FORCE
diff --git a/mwe/dynlink/exec/makefile b/mwe/dynlink/exec/makefile
deleted file mode 100644
index eec7c61..0000000
--- a/mwe/dynlink/exec/makefile
+++ /dev/null
@@ -1 +0,0 @@
-include ../../../lazy.mk
diff --git a/mwe/dynlink/lib/makefile b/mwe/dynlink/lib/makefile
deleted file mode 100644
index eec7c61..0000000
--- a/mwe/dynlink/lib/makefile
+++ /dev/null
@@ -1 +0,0 @@
-include ../../../lazy.mk
diff --git a/readme.md b/readme.md
index 4974694..f3aab09 100644
--- a/readme.md
+++ b/readme.md
@@ -1,6 +1,26 @@
# crêpe
-systems programming in c++ minor engine
+This repository contains:
-please read [contributing.md](./contributing.md)
+|folder|content|
+|-|-|
+|`lib/`|third-party libraries as git submodules|
+|`mwe/`|minimal working examples and proof-of-concepts|
+|`src/crepe/`|game engine source code|
+|`test/`|game engine unit tests|
+
+## Compilation
+
+This repository uses CMake (the makefile in the root of this repository is for
+running auxiliary tasks only). Make sure you have initialized and updated the
+submodules before compiling.
+
+## Documentation
+
+API documentation is done using Doxygen. To generate the docs, run `make
+doxygen`.
+
+## Code style
+
+Please read [contributing.md](./contributing.md).
diff --git a/src/makefile b/src/makefile
deleted file mode 100644
index 8352615..0000000
--- a/src/makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../lazy.mk
-
diff --git a/test/makefile b/test/makefile
deleted file mode 100644
index 7aeee34..0000000
--- a/test/makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-TARGET = $(BUILD_DIR)/test
-
-include ../lazy.mk
-
-test: $(TARGET) FORCE
- $(TARGET)
-