Mercurial > repos > blastem
comparison Makefile @ 1795:a02b4ed940b6
Fix Windows build
author | Michael Pavone <pavone@retrodev.com> |
---|---|
date | Sat, 23 Mar 2019 00:05:37 -0700 |
parents | 3a8c4ee68568 |
children | 243f3a7247f9 |
comparison
equal
deleted
inserted
replaced
1794:4cd226288958 | 1795:a02b4ed940b6 |
---|---|
1 ifndef OS | 1 ifndef OS |
2 OS:=$(shell uname -s) | 2 OS:=$(shell uname -s) |
3 endif | 3 endif |
4 FIXUP:=true | 4 FIXUP:=true |
5 | |
6 BUNDLED_LIBZ:=zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/gzclose.o zlib/gzlib.o zlib/gzread.o\ | |
7 zlib/gzwrite.o zlib/infback.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o zlib/uncompr.o zlib/zutil.o | |
5 | 8 |
6 ifeq ($(OS),Windows) | 9 ifeq ($(OS),Windows) |
7 ifndef SDL2_PREFIX | 10 ifndef SDL2_PREFIX |
8 SDL2_PREFIX:="sdl/i686-w64-mingw32" | 11 SDL2_PREFIX:="sdl/i686-w64-mingw32" |
9 endif | 12 endif |
21 EXE:=.exe | 24 EXE:=.exe |
22 CC:=i686-w64-mingw32-gcc-win32 | 25 CC:=i686-w64-mingw32-gcc-win32 |
23 CFLAGS:=-std=gnu99 -Wreturn-type -Werror=return-type -Werror=implicit-function-declaration -I"$(SDL2_PREFIX)/include/SDL2" -I"$(GLEW_PREFIX)/include" -DGLEW_STATIC | 26 CFLAGS:=-std=gnu99 -Wreturn-type -Werror=return-type -Werror=implicit-function-declaration -I"$(SDL2_PREFIX)/include/SDL2" -I"$(GLEW_PREFIX)/include" -DGLEW_STATIC |
24 LDFLAGS:= $(GLEW32S_LIB) -L"$(SDL2_PREFIX)/lib" -lm -lmingw32 -lSDL2main -lSDL2 -lws2_32 -lopengl32 -lglu32 -mwindows | 27 LDFLAGS:= $(GLEW32S_LIB) -L"$(SDL2_PREFIX)/lib" -lm -lmingw32 -lSDL2main -lSDL2 -lws2_32 -lopengl32 -lglu32 -mwindows |
25 CPU:=i686 | 28 CPU:=i686 |
29 LIBZOBJS=$(BUNDLED_LIBZ) | |
26 | 30 |
27 else | 31 else |
28 | 32 |
29 MEM:=mem.o | 33 MEM:=mem.o |
30 TERMINAL:=terminal.o | 34 TERMINAL:=terminal.o |
58 | 62 |
59 ifdef HOST_ZLIB | 63 ifdef HOST_ZLIB |
60 LIBS+= zlib | 64 LIBS+= zlib |
61 LIBZOBJS= | 65 LIBZOBJS= |
62 else | 66 else |
63 LIBZOBJS=zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/gzclose.o zlib/gzlib.o zlib/gzread.o\ | 67 LIBZOBJS=$(BUNDLED_LIBZ) |
64 zlib/gzwrite.o zlib/infback.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o zlib/uncompr.o zlib/zutil.o | |
65 endif | 68 endif |
66 | 69 |
67 ifeq ($(OS),Darwin) | 70 ifeq ($(OS),Darwin) |
68 #This should really be based on whether or not the C compiler is clang rather than based on the OS | 71 #This should really be based on whether or not the C compiler is clang rather than based on the OS |
69 CFLAGS+= -Wno-logical-op-parentheses | 72 CFLAGS+= -Wno-logical-op-parentheses |