...

3 files changed, 8 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index 30c91ce..c562e63 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,8 @@
 .PHONY: all clean luajit
-OBJS := oop_example.o nerv.o luaT.o common.o matrix/mmatrix.o matrix/cumatrix.o matrix/init.o matrix/cukernel.o io/init.o io/param.o
+OBJS := nerv.o luaT.o common.o \
+		matrix/mmatrix.o matrix/cumatrix.o matrix/init.o matrix/cukernel.o \
+		io/init.o io/param.o \
+		examples/oop_example.o
 LIBS := libnerv.so
 LUA_LIBS := matrix/init.lua io/init.lua nerv.lua pl/utils.lua pl/compat.lua
 INCLUDE := -I build/luajit-2.0/include/luajit-2.0/ -DLUA_USE_APICHECK
@@ -27,6 +30,7 @@ $(OBJ_DIR):
 	-mkdir -p $(OBJ_DIR)/io
 	-mkdir -p $(LUA_DIR)/io
 	-mkdir -p $(LUA_DIR)/pl
+	-mkdir -p $(OBJ_DIR)/examples
 $(LUA_DIR):
 	-mkdir -p $(LUA_DIR)
 $(OBJ_DIR)/%.o: %.c
diff --git a/examples/oop_example.c b/examples/oop_example.c
index e9a4ffe..89f5994 100644
--- a/examples/oop_example.c
+++ b/examples/oop_example.c
@@ -1,10 +1,7 @@
 #include <math.h>
-#include "lua.h"
-#include "lauxlib.h"
-#include "lualib.h"
-#include "luaT/luaT.h"
 #include <stdio.h>
 #include <stdlib.h>
+#include "../common.h"
 
 const char *point_tname = "nerv.Point";
 
diff --git a/io/param.c b/io/param.c
index 91c4d26..7e776a8 100644
--- a/io/param.c
+++ b/io/param.c
@@ -39,7 +39,7 @@ size_t read_param_header_plain(FILE *fp, int *status) {
     for (i = 0; i < PARAM_HEADER_SIZE; i++)
         if (isdigit(buff[i]))
             size = size * 10 + buff[i] - '0';
-    fprintf(stderr, "header: %d\n", size);
+    fprintf(stderr, "header: %lu\n", size);
     return size;
 }
 
@@ -145,7 +145,7 @@ int nerv_param_file_open_read(lua_State *L, const char *fn) {
         pci = (ParamChunkInfo *)malloc(sizeof(ParamChunkInfo));
         pci->offset = ftello(fp);
         pci->length = param_len - (pci->offset - offset);
-        fprintf(stderr, "%d + %d (skip %d)\n", (int)pci->offset,
+        fprintf(stderr, "%d + %d (skip %lu)\n", (int)pci->offset,
                 (int)pci->length, param_len);
         luaT_pushudata(L, pci, nerv_param_chunk_info_tname);
         lua_setfield(L, -2, "chunk");