From d40aab48ea1aabd45b84e3543b4335ffe55130fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Tue, 19 Jan 2016 01:25:14 +0100
Subject: [PATCH] Split resources form core lua

---
 Makefile                                      | 11 +++++++----
 include/luares.h                              |  1 -
 include/res.h                                 |  4 ++++
 {src/lua/core => resources}/eepromDefault.lua |  0
 src/c/modules.c                               |  4 +++-
 5 files changed, 14 insertions(+), 6 deletions(-)
 create mode 100644 include/res.h
 rename {src/lua/core => resources}/eepromDefault.lua (100%)

diff --git a/Makefile b/Makefile
index 4db8a30..f25b03b 100644
--- a/Makefile
+++ b/Makefile
@@ -9,10 +9,12 @@ BUILD = bin/
 SOURCE = src/c/
 
 CORELUA = src/lua/core
+RESOURCES = resources
 LIBS=-lm
 
-GENERATED=include/luares.h src/c/gen/luares.c
+GENERATED=include/luares.h src/c/gen/luares.c include/res.h src/c/gen/res.c
 LUAPARAMS = $(CORELUA) include/luares.h src/c/gen/luares.c lua_
+RESPARAMS = $(RESOURCES) include/res.h src/c/gen/res.c res_
 LDFLAGS=-static
 
 SRCDIRECTORIES = $(shell find $(SOURCE) -type d)
@@ -27,7 +29,7 @@ $(BUILDDIRECTORIES):
 	mkdir -p $@
 
 #Build
-all: smallclean $(BUILDDIRECTORIES) luaresources $(BUILD)lupi
+all: smallclean $(BUILDDIRECTORIES) resources $(BUILD)lupi
 
 build: clean all
 
@@ -38,8 +40,9 @@ $(BUILD)%.c.o: $(SOURCE)%.c
 	$(CC) -c $(CFLAGS) -I /usr/include -I src/c -I src/c/lib/lua $< -o $@
 
 #Resources
-luaresources: cleanresourcues
+resources: cleanresourcues
 	scripts/txt2c $(LUAPARAMS)
+	scripts/txt2c $(RESPARAMS)
 
 #Clean rules
 cleanresourcues:
@@ -56,4 +59,4 @@ smallclean:
 
 # Other
 
-.PHONY: clean cleanresourcues luaresources build smallclean all
\ No newline at end of file
+.PHONY: clean cleanresourcues resources build smallclean all
\ No newline at end of file
diff --git a/include/luares.h b/include/luares.h
index c420e98..92ee895 100644
--- a/include/luares.h
+++ b/include/luares.h
@@ -3,7 +3,6 @@
 extern char lua_boot[];
 extern char lua_component[];
 extern char lua_computer[];
-extern char lua_eepromDefault[];
 extern char lua_eeprom[];
 extern char lua_filesystem[];
 extern char lua_init[];
diff --git a/include/res.h b/include/res.h
new file mode 100644
index 0000000..c117410
--- /dev/null
+++ b/include/res.h
@@ -0,0 +1,4 @@
+#ifndef RES_H
+#define RES_H
+extern char res_eepromDefault[];
+#endif
diff --git a/src/lua/core/eepromDefault.lua b/resources/eepromDefault.lua
similarity index 100%
rename from src/lua/core/eepromDefault.lua
rename to resources/eepromDefault.lua
diff --git a/src/c/modules.c b/src/c/modules.c
index bd6d451..c6a2bd1 100644
--- a/src/c/modules.c
+++ b/src/c/modules.c
@@ -1,4 +1,5 @@
 #include "luares.h"
+#include "res.h"
 #include "lupi.h"
 #include <lua.h>
 #include <lualib.h>
@@ -12,7 +13,6 @@ void setup_modules(lua_State *L) {
   pushstuple(L, "component", lua_component);
   pushstuple(L, "computer", lua_computer);
   pushstuple(L, "eeprom", lua_eeprom);
-  pushstuple(L, "eepromDefault", lua_eepromDefault);
   pushstuple(L, "filesystem", lua_filesystem);
   pushstuple(L, "sandbox", lua_sandbox);
   pushstuple(L, "textgpu", lua_textgpu);
@@ -21,5 +21,7 @@ void setup_modules(lua_State *L) {
   pushstuple(L, "utf8data", lua_utf8_utf8data);
   pushstuple(L, "utf8", lua_utf8_utf8);
 
+  pushstuple(L, "eepromDefault", res_eepromDefault);
+
   lua_setglobal(L, "moduleCode");
 }
\ No newline at end of file