@@ -83,6 +83,18 @@ DATALIST_SRC=$(wildcard src/data/*.dl)
8383
8484DATALIST_CODE =$(patsubst % .dl, $(BUILD ) /% .dl.h, $(notdir $(DATALIST_SRC ) ) )
8585
86+ ZLIB_INC =-I3rd/zlib
87+ ZLIB_FULL =$(wildcard 3rd/zlib/* .c)
88+ ZLIB_C = $(notdir $(ZLIB_FULL ) )
89+ ZLIB_O = $(patsubst % .c,$(BUILD ) /zlib_% .o,$(ZLIB_C ) )
90+ MINIZIP_FULL =\
91+ 3rd\zlib\contrib/minizip/ioapi.c\
92+ 3rd\zlib\contrib/minizip/unzip.c\
93+ 3rd\zlib\contrib/minizip/zip.c\
94+ 3rd\zlib\contrib/minizip/iowin32.c
95+ MINIZIP_C = $(notdir $(MINIZIP_FULL ) )
96+ MINIZIP_O = $(patsubst % .c,$(BUILD ) /minizip_% .o,$(MINIZIP_C ) )
97+
8698$(LTASK_LUACODE ) $(DATALIST_CODE ) : | $(LUA_EXE )
8799
88100$(BUILD ) /% .lua.h : 3rd/ltask/service/% .lua
@@ -121,8 +133,14 @@ YOGASRC:=$(wildcard 3rd/yoga/yoga/*.cpp $(addsuffix *.cpp,$(wildcard 3rd/yoga/yo
121133
122134$(BUILD ) /yoga.o : src/yogaone.cpp $(YOGASRC )
123135 $(CCPP ) $(STDCPP ) $(OUTPUT_O ) $@ $< $(YOGAINC ) $(CFLAGS )
136+
137+ $(BUILD ) /zlib_% .o : 3rd/zlib/% .c
138+ $(COMPILE_C ) $(ZLIB_INC )
139+
140+ $(BUILD ) /minizip_% .o : 3rd/zlib/contrib/minizip/% .c
141+ $(COMPILE_C ) $(ZLIB_INC )
124142
125- $(BIN ) /$(APPNAME ) : $(MAIN_O ) $(LTASK_O ) $(LUA_O ) $(DATALIST_O ) $(BUILD ) /yoga.o
143+ $(BIN ) /$(APPNAME ) : $(MAIN_O ) $(LTASK_O ) $(LUA_O ) $(DATALIST_O ) $(BUILD ) /yoga.o $( ZLIB_O ) $( MINIZIP_O )
126144 $(LD ) $(OUTPUT_EXE ) $@ $^ $(LDFLAGS )
127145
128146clean :
0 commit comments