Skip to content
Snippets Groups Projects
Commit e4978284 authored by deuce's avatar deuce
Browse files

Fix warnings and build

parent b1157ad1
Branches
Tags
No related merge requests found
......@@ -23,17 +23,17 @@ TARGET = ./bin/vbbs
OBJS = ${O}/v3_basic.o ${O}/v3_hack.o ${O}/v3_io.o ${O}/v3_learn.o ${O}/v3_mail.o ${O}/v3_maint.o ${O}/v3_mci.o ${O}/v3_store.o ${O}/vbbsutil.o ${O}/vbbs.o ${O}/vbbs_db.o ${O}/filewrap.o
LIBS = ../lib/libODoors.a
LIBS = -lODoors
ifeq (${BUILD},debug)
CFLAGS = -g -Wall -O -I. -I../include
CPPFLAGS = -g -Wall -O -I. -I../include
LDFLAGS = -g
CFLAGS = -g -Wall -O -I. -I../include -I../../../odoors -I../../../xpdev -DHAS_INTTYPES_H
CPPFLAGS = -g -Wall -O -I. -I../include -I../../../odoors -I../../../xpdev -DHAS_INTTYPES_H
LDFLAGS = -g -L../../../odoors/libs-`uname`
QUIET :=
else
CFLAGS = -O2 -Wall -fno-common -fomit-frame-pointer -I. -I../include
CPPFLAGS = -O2 -Wall -fno-common -fomit-frame-pointer -fno-exceptions -fno-rtti -I. -I../include
LDFLAGS =
CFLAGS = -O2 -Wall -fno-common -fomit-frame-pointer -I. -I../include -I../../../odoors -I../../../xpdev -DHAS_INTTYPES_H
CPPFLAGS = -O2 -Wall -fno-common -fomit-frame-pointer -fno-exceptions -fno-rtti -I. -I../include -I../../../odoors -I../../../xpdev -DHAS_INTTYPES_H
LDFLAGS = -L../../../odoors/libs-`uname`
QUIET := @
endif
......@@ -48,7 +48,7 @@ bin:
obj:
mkdir obj
${TARGET}: bin obj ${OBJS} ${LIBS}
${TARGET}: bin obj ${OBJS}
@echo linking $@
${QUIET}${LD} ${LDFLAGS} ${OBJS} ${LIBS} -o ${TARGET}
${QUIET}${CP} ${TARGET} ../build
......@@ -61,6 +61,10 @@ ${O}/%.o : %.c
@echo Compiling $<
${QUIET}${CC} -c ${CFLAGS} $< -o $@
${O}/%.o : ../../../xpdev/%.c
@echo Compiling $<
${QUIET}${CC} -c ${CFLAGS} $< -o $@
${O}/%.o : %.cpp
@echo $<
${QUIET}${CC} -c ${CPPFLAGS} $< -o $@
......@@ -527,12 +527,12 @@ void u32_2A(int numa, u32 lnum)
#else // VBBS_WIN32 && VBBS_LINUX
void s32_2A(int numa, s32 lnum)
{
sprintf(A[numa], "%d", lnum);
sprintf(A[numa], "%d", (int32_t)lnum);
}
void u32_2A(int numa, u32 lnum)
{
sprintf(A[numa], "%u", lnum);
sprintf(A[numa], "%u", (uint32_t)lnum);
}
#endif
......
......@@ -442,7 +442,7 @@ void buy_computer()
char ch1, kys[23]="Q";
for(i=1;i<23;i++)
kys[i] = (char)NULL;
kys[i] = 0;
text("0740");
for(i=0;i<MAX_CPU;i++)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment