Merge branch 'fundies:master' into updet

Author: fundies

enigma/Android.mk

@@ -11,7 +11,7 @@ LOCAL_MODULE := enigma
 LOCAL_C_INCLUDES := $(ENIGMA_SHELL) $(ENIGMA_SHELL)/Graphics_Systems/OpenGLES/wrappers $(EXTERNAL)/hacks $(EXTERNAL)/libepoxy/include/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES) 
 
-LOCAL_C_INCLUDES += $(ENIGMA_ROOT)/shared $(ENIGMA_SHELL)/Bridges/OpenGLES/ $(EXTERNAL)/SDL2/include/ $(EXTERNAL)/glad/gles2/include $(EXTERNAL)/glm $(ENIGMA_SHELL)/Platforms/SDL/fileio /tmp/ENIGMA
+LOCAL_C_INCLUDES += $(ENIGMA_ROOT)/shared $(ENIGMA_SHELL)/Bridges/OpenGLES/ $(EXTERNAL)/SDL2/include/ $(EXTERNAL)/glad/gles2/include $(EXTERNAL)/glm $(ENIGMA_SHELL)/Platforms/SDL/fileio $(CODEGEN)
 LOCAL_CFLAGS := -DDEBUG_MODE -DENIGMA_PLATFORM_SDL
 LOCAL_CPPFLAGS := -stdlib=libc++ -std=c++17