diff --git a/source/src/Makefile b/source/src/Makefile index b31284b8..2737aa0c 100644 --- a/source/src/Makefile +++ b/source/src/Makefile @@ -81,7 +81,6 @@ CLIENT_OBJS= \ bot/ac_bot_ai.o ifneq (,$(findstring MINGW,$(PLATFORM))) CLIENT_OBJS+= ../vcpp/SDL_win32_main.o -CLIENT_OBJS:= $(subst /,\\,$(CLIENT_OBJS)) endif CLIENT_PCH= cube.h.gch @@ -141,7 +140,7 @@ $(SERVER_OBJS): CXXFLAGS += $(SERVER_INCLUDES) $(filter-out $(SERVER_OBJS),$(MASTER_OBJS)): CXXFLAGS += $(SERVER_INCLUDES) ifneq (,$(findstring MINGW,$(PLATFORM))) -..\\vcpp\\%.o: +../vcpp/%.o: $(CXX) $(CXXFLAGS) -c -o $@ $(subst .o,.c,$@) client: $(CLIENT_OBJS) diff --git a/source/src/rendertext.cpp b/source/src/rendertext.cpp index ede3751d..8463ffb8 100644 --- a/source/src/rendertext.cpp +++ b/source/src/rendertext.cpp @@ -217,6 +217,7 @@ void addutf8char(int code) // add to buf font::utf8charinfo charinfo; charinfo.code = code; + charinfo.x = charinfo.y = charinfo.w = charinfo.h = 0; utf8chars.add(charinfo); // update charset