Mercurial > repos > blastem
changeset 1795:a02b4ed940b6
Fix Windows build
| author | Michael Pavone <pavone@retrodev.com> |
|---|---|
| date | Sat, 23 Mar 2019 00:05:37 -0700 |
| parents | 4cd226288958 |
| children | 51417bb557b6 |
| files | Makefile |
| diffstat | 1 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Fri Mar 22 09:25:28 2019 -0700 +++ b/Makefile Sat Mar 23 00:05:37 2019 -0700 @@ -3,6 +3,9 @@ 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 @@ 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 @@ 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)