From a2eed4d72417b2d2831310c93c142bc45beece39 Mon Sep 17 00:00:00 2001 From: Michael Pavone Date: Sat, 23 Mar 2019 00:05:37 -0700 Subject: Fix Windows build --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 55fc6d2..b1fa48a 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,9 @@ OS:=$(shell uname -s) endif FIXUP:=true +BUNDLED_LIBZ:=zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/gzclose.o zlib/gzlib.o zlib/gzread.o\ + zlib/gzwrite.o zlib/infback.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o zlib/uncompr.o zlib/zutil.o + ifeq ($(OS),Windows) ifndef SDL2_PREFIX SDL2_PREFIX:="sdl/i686-w64-mingw32" @@ -23,6 +26,7 @@ CC:=i686-w64-mingw32-gcc-win32 CFLAGS:=-std=gnu99 -Wreturn-type -Werror=return-type -Werror=implicit-function-declaration -I"$(SDL2_PREFIX)/include/SDL2" -I"$(GLEW_PREFIX)/include" -DGLEW_STATIC LDFLAGS:= $(GLEW32S_LIB) -L"$(SDL2_PREFIX)/lib" -lm -lmingw32 -lSDL2main -lSDL2 -lws2_32 -lopengl32 -lglu32 -mwindows CPU:=i686 +LIBZOBJS=$(BUNDLED_LIBZ) else @@ -60,8 +64,7 @@ ifdef HOST_ZLIB LIBS+= zlib LIBZOBJS= else -LIBZOBJS=zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/gzclose.o zlib/gzlib.o zlib/gzread.o\ - zlib/gzwrite.o zlib/infback.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o zlib/uncompr.o zlib/zutil.o +LIBZOBJS=$(BUNDLED_LIBZ) endif ifeq ($(OS),Darwin) -- cgit v1.2.3