src/build:

* removes osdcore.h from file2str.c and verinfo.c
* removes LIBOCORE from link stage for file2str and verinfo
This commit is contained in:
Couriersud 2008-02-05 23:05:55 +00:00
parent 88940550a1
commit 2c6acf1988
3 changed files with 10 additions and 8 deletions

View File

@ -40,9 +40,9 @@ BUILD += \
FILE2STROBJS = \ FILE2STROBJS = \
$(BUILDOBJ)/file2str.o \ $(BUILDOBJ)/file2str.o \
$(FILE2STR): $(FILE2STROBJS) $(LIBOCORE) $(FILE2STR): $(FILE2STROBJS)
@echo Linking $@... @echo Linking $@...
$(LD) $(LDFLAGS) $^ $(LIBS) -o $@ $(LD) $(LDFLAGS) $^ -o $@
@ -66,8 +66,8 @@ VERINFO = $(BUILDOBJ)/verinfo$(EXE)
VERINFOOBJS = \ VERINFOOBJS = \
$(BUILDOBJ)/verinfo.o $(BUILDOBJ)/verinfo.o
$(VERINFO): $(VERINFOOBJS) $(LIBOCORE) $(VERINFO): $(VERINFOOBJS)
@echo Linking $@... @echo Linking $@...
$(LD) $(LDFLAGS) $^ $(LIBS) -o $@ $(LD) $(LDFLAGS) $^ -o $@
endif endif

View File

@ -10,7 +10,7 @@
***************************************************************************/ ***************************************************************************/
#include <stdio.h> #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; const char *srcfile, *dstfile, *varname, *type;
FILE *src, *dst; FILE *src, *dst;
UINT8 *buffer; unsigned char *buffer;
int bytes, offs; int bytes, offs;
int terminate = 1; int terminate = 1;

View File

@ -10,8 +10,10 @@
#include <stdio.h> #include <stdio.h>
#include <ctype.h> #include <ctype.h>
#include "osdcore.h" #include <string.h>
#include <stdlib.h>
#define ARRAY_LENGTH(x) (sizeof(x) / sizeof(x[0]))
//============================================================ //============================================================
// TYPE DEFINITIONS // TYPE DEFINITIONS
@ -194,7 +196,7 @@ int main(int argc, char *argv[])
if (buffer == NULL) if (buffer == NULL)
{ {
fclose(f); fclose(f);
fprintf(stderr, "Error allocating %d bytes\n", size + 1); fprintf(stderr, "Error allocating %ld bytes\n", (long) size + 1);
return 1; return 1;
} }