Some minor fixes to build process

diff --git a/Makefile b/Makefile
index 723fa9f2be55888c83bcd9033f83a03ab17a9edd..b00473d252481eb92b177fe6ef79d14b60ce9d49 100644 (file)
--- 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 efa45261f7d8dd1af00dc8f32f92970dcf9c9ad3..18ea0acbdae4228118c01056ccde8adb6df5df83 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,8 +1,9 @@
 // emscripten includes
 #ifdef __EMSCRIPTEN__
-#include "ems.h"
 #include <emscripten.h>
 #include <emscripten/html5.h>
+
+#include "ems.h"
 #else
 #include <random>
 #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 c58f5563e5bee823bc55df538b87f9eccd0bf9d0..4fa1364fec94c831b271c3a921d7813336a3b8f1 100644 (file)
--- 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}