Updated Toy, fixed build process

box/makefile

@@ -8,7 +8,7 @@ ODIR = obj
 SRC = $(wildcard *.c)
 OBJ = $(addprefix $(ODIR)/,$(SRC:.c=.o))
 
-TOYLIBS = $(wildcard ../Toy/repl/lib*) $(wildcard ../Toy/repl/repl_tools.*)
+REPLLIBS = $(wildcard ../Toy/repl/lib*) $(wildcard ../Toy/repl/repl_tools.*)
 
 OUTNAME=box
 
@@ -27,15 +27,15 @@ else
 	exit 1
 endif
 
-library: libs $(OBJ)
+library: repllibs $(OBJ)
 	$(CC) -DBOX_EXPORT $(CFLAGS) -shared -o $(OUT) $(LIBLINE) -L../$(LIBDIR) $(LIBS)
 
-static: libs $(OBJ)
+static: repllibs $(OBJ)
 	ar crs $(BOX_OUTDIR)/lib$(OUTNAME).a $(OBJ) -L../$(LIBDIR) $(LIBS)
 
 #copy the stuff from Toy/repl that is needed
-libs:
+repllibs:
-	cp $(TOYLIBS) .
+	cp $(REPLLIBS) .
 
 $(OBJ): | $(ODIR)
 
@@ -47,5 +47,5 @@ $(ODIR)/%.o: %.c
 
 .PHONY: clean
 
-clean-libs:
+clean-repllibs:
-	$(RM) $(notdir $(TOYLIBS))
+	$(RM) $(notdir $(REPLLIBS))

box/repl_tools.c

@@ -94,7 +94,7 @@ const unsigned char* Toy_compileString(const char* source, size_t* size) {
 	}
 
 	//get the bytecode dump
-	const unsigned char* tb = Toy_collateCompiler(&compiler, (int*)(size));
+	const unsigned char* tb = Toy_collateCompiler(&compiler, size);
 
 	//cleanup
 	Toy_freeCompiler(&compiler);

makefile

@@ -20,7 +20,8 @@ toy: $(LIBDIR)
 	$(MAKE) -j8 -C Toy/source
 
 box: $(LIBDIR)
-	$(MAKE) -j8 -C box
+	$(MAKE) -j8 -C box repllibs
+	$(MAKE) -j8 -C box library
 
 $(OUTDIR):
 	mkdir $(OUTDIR)