Merge pull request #3 from WalrusRPG/build_redux

Major repo overhaul

.gitignore

@@ -3,11 +3,6 @@
 bin
 *.elf
 *.gdb
-art/sprites.c
-art/sprites.h
-art/*.cspr
-src/version.c
-include/version.h
 
 .ycm_extra_conf.pyc
 

Makefile

@@ -2,7 +2,7 @@ NAME = WalrusRPG
 
 DEBUG = FALSE
 
-CFLAGS_COMMON = -Wall -W -marm -fdiagnostics-color=always
+CFLAGS_COMMON = -Wall -W -marm $(addprefix -I,$(INCLUDE))
 
 ifeq ($(DEBUG),FALSE)
 	CFLAGS_COMMON += -Ofast -flto
@@ -21,55 +21,28 @@ LDFLAGS = $(CFLAGS_COMMON) -Wl,--gc-sections
 ZEHN = genzehn
 ZEHNFLAGS = --name "$(NAME)" --compress
 
-SRCDIR = src
-
-SOURCES_C = art/sprites.c src/version.c $(wildcard $(SRCDIR)/*.c)
-SOURCES_CPP = $(wildcard $(SRCDIR)/*.cpp)
-OBJS = $(patsubst %.c,%.o,$(SOURCES_C)) $(patsubst %.cpp,%.o,$(SOURCES_CPP))
-INCLUDE = -I include -I art -I external/tinystl/include
+SRCS_C :=
+SRCS_CPP :=
+OBJS = $(SRCS_C:%.c=%.o) $(SRCS_CPP:%.cpp=%.o)
+INCLUDE :=
+BUILT_SRCS :=
 
 DISTDIR = bin
 ELF = $(DISTDIR)/$(NAME).elf
 EXE = $(DISTDIR)/$(NAME).tns
 
-all: versionning sprites $(EXE)
-
-.PHONY: format clean sprites all run versionning
-
-versionning:
-	@bash versionning.bash
-
-sprites:
-	@$(MAKE) -C art/
-
-art/sprites.c: sprites
-
-%.o: %.c| sprites versionning
-	@echo "CC: $@"
-	@$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
-
-%.o: %.cpp| sprites versionning
-	@echo "CPP: $@"
-	@$(CPP) $(CPPFLAGS) $(INCLUDE) -c $< -o $@
-
-
-$(ELF): $(OBJS) |sprites
-	@mkdir -p $(DISTDIR)
-	@echo "CCLD: $@"
-	@+$(CC) $(LDFLAGS) $^ -o $(ELF)
-
-$(EXE): $(ELF)
-	@mkdir -p $(DISTDIR)
-	@echo "ZEHN: $@"
-	@$(ZEHN) --input $(ELF) --output $(EXE) $(ZEHNFLAGS)
-
-clean:
-	rm -rf $(DISTDIR)
-	rm -f $(OBJS)
-	@$(MAKE) -C art/ clean
-
-format:
-	clang-format -i -style=file src/*.c src/*.cpp include/*.h
-
-run: all
-	tilp -ns $(EXE) > /dev/null
+CLEAN_SPEC :=
+
+# Figure out where we are.
+define whereami
+$(strip \
+  $(eval LOCAL_MODULE_MAKEFILE := $$(lastword $$(MAKEFILE_LIST))) \
+  $(if $(filter $(BUILD_SYSTEM)/% $(OUT_DIR)/%,$(LOCAL_MODULE_MAKEFILE)), \
+    $(error my-dir must be called before including any other makefile.) \
+   , \
+    $(patsubst %/,%,$(dir $(LOCAL_MODULE_MAKEFILE))) \
+   ) \
+ )
+endef
+
+include rules.mk

art/.gitignore

@@ -0,0 +1,3 @@
+*.cspr
+sprites.c
+sprites.h

art/Makefile

@@ -1,20 +0,0 @@
-SPRITES = $(wildcard *.png)
-SPR_DATA = $(patsubst %.png,%.cspr,$(SPRITES))
-
-%.cspr: %.png
-	@echo "Converting : $<"
-	@ConvertImg --format n2dlib $< > $@
-
-all: sprites.c sprites.h
-	
-sprites.c: | $(SPR_DATA)
-	@echo "Catting sprites into sprites.c"
-	@rm -f sprites.c
-	@cat  $(SPR_DATA)  | sed "s/^static uint16_t/unsigned short/" >> sprites.c
-
-sprites.h: sprites.c
-	@echo "Making header sprites.h"
-	@cat sprites.c | grep "=" | sed -e "s/ =.*/;/" -e "s/^/extern /" > sprites.h
-
-clean:
-	rm -f $(SPR_DATA) sprites.c sprites.h

art/rules.mk

@@ -0,0 +1,23 @@
+art_LOCAL_PATH := $(call whereami)
+
+art_SPRITES := $(wildcard $(art_LOCAL_PATH)/*.png)
+art_SPR_DATA := $(patsubst %.png,%.cspr,$(art_SPRITES))
+
+SRCS_C += $(art_LOCAL_PATH)/sprites.c
+INCLUDE += $(art_LOCAL_PATH)
+BUILT_SRCS += $(art_LOCAL_PATH)/sprites.h
+
+CLEAN_SPEC += $(art_SPR_DATA) $(art_LOCAL_PATH)/sprites.c $(art_LOCAL_PATH)/sprites.h
+
+%.cspr: %.png
+	@echo "Converting : $<"
+	@ConvertImg --format n2dlib $< > $@
+
+$(art_LOCAL_PATH)/sprites.c: $(art_SPR_DATA)
+	@echo "Catting sprites into sprites.c"
+	@rm -f $@
+	@cat $^ | sed "s/^static uint16_t/unsigned short/" >> $@
+
+$(art_LOCAL_PATH)/sprites.h: $(art_LOCAL_PATH)/sprites.c
+	@echo "Making header sprites.h"
+	@cat $< | grep "=" | sed -e "s/ =.*/;/" -e "s/^/extern /" > $@

external/rules.mk

@@ -0,0 +1,5 @@
+external_LOCAL_PATH := $(call whereami)
+
+include $(wildcard $(external_LOCAL_PATH)/*/rules.mk)
+
+INCLUDE += $(external_LOCAL_PATH)/tinystl/include

rules.mk

@@ -0,0 +1,41 @@
+.PHONY: format clean all run versionning
+
+all: $(EXE)
+
+include $(wildcard */rules.mk)
+
+%.o: %.c | $(BUILT_SRCS)
+	@echo "CC: $@"
+	@$(CC) $(CFLAGS) -c $< -o $@
+
+%.o: %.cpp | $(BUILT_SRCS)
+	@echo "CPP: $@"
+	@$(CPP) $(CPPFLAGS) -c $< -o $@
+
+$(ELF): $(OBJS)
+	@mkdir -p $(DISTDIR)
+	@echo "CCLD: $@"
+	@+$(CC) $(LDFLAGS) $^ -o $(ELF)
+
+$(EXE): $(ELF)
+	@mkdir -p $(DISTDIR)
+	@echo "ZEHN: $@"
+	@$(ZEHN) --input $(ELF) --output $(EXE) $(ZEHNFLAGS)
+
+clean:
+	@echo "Removing dist"
+	@rm -rf $(DISTDIR)
+	@echo "Removing object files"
+	@rm -f $(OBJS)
+	@echo "Removing other build artifacts"
+	@rm -f $(CLEAN_SPEC)
+
+format:
+	@echo "Formatting source using clang-format"
+	@clang-format -i -style=file $(SRCS_C) $(SRCS_CPP) $(wildcard $(addsuffix /*.h,$(INCLUDE)))
+
+run: all
+	@echo "Sending $(EXE) to calculator"
+	@tilp -ns $(EXE) > /dev/null
+
+.FORCE:

src/rules.mk

@@ -0,0 +1,7 @@
+src_LOCAL_PATH := $(call whereami)
+
+include $(wildcard $(src_LOCAL_PATH)/*/rules.mk)
+
+SRCS_C += $(wildcard $(src_LOCAL_PATH)/*/*.c)
+SRCS_CPP += $(wildcard $(src_LOCAL_PATH)/*/*.cpp)
+INCLUDE += $(shell find $(src_LOCAL_PATH) -mindepth 1 -maxdepth 1 -type d)

version/.gitignore

@@ -0,0 +1 @@
+version.c

version/rules.mk

@@ -0,0 +1,9 @@
+version_LOCAL_PATH := $(call whereami)
+
+SRCS_C += $(version_LOCAL_PATH)/version.c
+INCLUDE += $(version_LOCAL_PATH)
+
+CLEAN_SPEC += $(version_LOCAL_PATH)/version.c
+
+$(version_LOCAL_PATH)/version.c: .FORCE
+	@./$(version_LOCAL_PATH)/version.bash

version/version.bash

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+COMMIT_NUMBER=$(git describe --always)
+BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)
+VERSION="$BRANCH_NAME-$COMMIT_NUMBER"
+
+DIRNAME=$(dirname "$0")
+
+source=$(cat <<EOF
+#include "version.h"
+
+const char git_version[] = "$VERSION";
+EOF
+)
+
+diff $DIRNAME/version.c <(echo "$source") > /dev/null 2>&1
+if [[ $? -ne 0 ]]
+  then
+  echo "Updating version source"
+  echo "$source" > $DIRNAME/version.c
+fi

version/version.h

@@ -0,0 +1,4 @@
+#ifndef INCLUDE_VERSION_H
+#define INCLUDE_VERSION_H
+extern const char git_version[];
+#endif

versionning.bash

@@ -1,33 +0,0 @@
-#!/bin/bash
-
-COMMIT_NUMBER=$(git describe --always)
-BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)
-VERSION="$BRANCH_NAME-$COMMIT_NUMBER"
-
-source=$(cat <<EOF
-#include "version.h"
-
-const char git_version[] = "$VERSION";
-EOF
-)
-
-include=$(cat <<EOF
-#ifndef INCLUDE_VERSION_H
-#define INCLUDE_VERSION_H
-extern const char git_version[];
-#endif
-EOF
-)
-
-diff src/version.c <(echo "$source") > /dev/null 2>&1
-if [[ $? -ne 0 ]]
-  then
-  echo "Updating version source"
-  echo "$source" > src/version.c
-fi
-diff include/version.h <(echo "$include") > /dev/null 2>&1
-if [[ $? -ne 0 ]]
-  then
-  echo "Updating version include"
-  echo "$include" > include/version.h
-fi