mingw fixes

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@4832 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Lee Salzman
2010-05-10 22:48:40 +00:00
parent a4fc196cd1
commit 3e4f81818a
2 changed files with 2 additions and 2 deletions
+1 -2
View File
@@ -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)
+1
View File
@@ -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