From 2c6acf19880edb41ab0167b8ddf93e8a2f4eba6f Mon Sep 17 00:00:00 2001
From: Couriersud <couriersud@users.noreply.github.com>
Date: Tue, 5 Feb 2008 23:05:55 +0000
Subject: [PATCH] src/build: * removes osdcore.h from file2str.c and verinfo.c
 * removes LIBOCORE from link stage for file2str and verinfo

---
 src/build/build.mak  | 8 ++++----
 src/build/file2str.c | 4 ++--
 src/build/verinfo.c  | 6 ++++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/build/build.mak b/src/build/build.mak
index beab1a9949e..d4cee62faa7 100644
--- a/src/build/build.mak
+++ b/src/build/build.mak
@@ -40,9 +40,9 @@ BUILD += \
 FILE2STROBJS = \
 	$(BUILDOBJ)/file2str.o \
 
-$(FILE2STR): $(FILE2STROBJS) $(LIBOCORE)
+$(FILE2STR): $(FILE2STROBJS)
 	@echo Linking $@...
-	$(LD) $(LDFLAGS) $^ $(LIBS) -o $@
+	$(LD) $(LDFLAGS) $^ -o $@
 
 
 
@@ -66,8 +66,8 @@ VERINFO = $(BUILDOBJ)/verinfo$(EXE)
 VERINFOOBJS = \
 	$(BUILDOBJ)/verinfo.o
 
-$(VERINFO): $(VERINFOOBJS) $(LIBOCORE)
+$(VERINFO): $(VERINFOOBJS)
 	@echo Linking $@...
-	$(LD) $(LDFLAGS) $^ $(LIBS) -o $@
+	$(LD) $(LDFLAGS) $^ -o $@
 
 endif
diff --git a/src/build/file2str.c b/src/build/file2str.c
index e6c2a70d211..c19ca46a513 100644
--- a/src/build/file2str.c
+++ b/src/build/file2str.c
@@ -10,7 +10,7 @@
 ***************************************************************************/
 
 #include <stdio.h>
-#include "osdcore.h"
+#include <stdlib.h>
 
 
 /*-------------------------------------------------
@@ -21,7 +21,7 @@ int main(int argc, char *argv[])
 {
 	const char *srcfile, *dstfile, *varname, *type;
 	FILE *src, *dst;
-	UINT8 *buffer;
+	unsigned char *buffer;
 	int bytes, offs;
 	int terminate = 1;
 
diff --git a/src/build/verinfo.c b/src/build/verinfo.c
index d2ed64b04cd..e737120dff4 100644
--- a/src/build/verinfo.c
+++ b/src/build/verinfo.c
@@ -10,8 +10,10 @@
 #include <stdio.h>
 #include <ctype.h>
 
-#include "osdcore.h"
+#include <string.h>
+#include <stdlib.h>
 
+#define ARRAY_LENGTH(x)            (sizeof(x) / sizeof(x[0]))
 
 //============================================================
 //  TYPE DEFINITIONS
@@ -194,7 +196,7 @@ int main(int argc, char *argv[])
 	if (buffer == NULL)
 	{
 		fclose(f);
-		fprintf(stderr, "Error allocating %d bytes\n", size + 1);
+		fprintf(stderr, "Error allocating %ld bytes\n", (long) size + 1);
 		return 1;
 	}