From c146d86af79929665f859a713cfa1b5b460df026 Mon Sep 17 00:00:00 2001 From: Stephen Seo Date: Sun, 30 Jul 2023 21:43:18 +0900 Subject: [PATCH] Some minor fixes to build process --- Makefile | 7 +++++-- src/main.cc | 7 ++++--- wasm_build/Makefile | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 723fa9f..b00473d 100644 --- a/Makefile +++ b/Makefile @@ -12,9 +12,11 @@ OBJDIR = objdir SOURCES = \ src/main.cc +HEADERS = + OBJECTS = $(addprefix ${OBJDIR}/,$(subst .cc,.cc.o,${SOURCES})) -all: demo_0 +all: | format demo_0 demo_0: ${OBJECTS} ${CXX} -o demo_0 ${LINKER_FLAGS} $^ @@ -25,7 +27,8 @@ clean: rm -rf ${OBJDIR} rm -f demo_0 -.SECONDEXPANSION: +format: + clang-format -i --style=google ${HEADERS} ${SOURCES} ${OBJDIR}/%.cc.o: %.cc @mkdir -p $(dir $@) diff --git a/src/main.cc b/src/main.cc index efa4526..18ea0ac 100644 --- a/src/main.cc +++ b/src/main.cc @@ -1,8 +1,9 @@ // emscripten includes #ifdef __EMSCRIPTEN__ -#include "ems.h" #include #include + +#include "ems.h" #else #include #endif @@ -22,8 +23,8 @@ EM_BOOL resize_event_callback(int event_type, const EmscriptenUiEvent *event, //((GameRenderer *)ud)->screen_size_changed(); } return false; -} // resize_event_callback(...) -} // extern "C" +} // resize_event_callback(...) +} // extern "C" #endif // Main loop frame diff --git a/wasm_build/Makefile b/wasm_build/Makefile index c58f556..4fa1364 100644 --- a/wasm_build/Makefile +++ b/wasm_build/Makefile @@ -33,4 +33,4 @@ clean: rm -f jumpartifact.com_demo_0.data format: - clang-format -i --style=file ${SOURCES} ${HEADERS} + clang-format -i --style=google ${SOURCES} ${HEADERS}