Mercurial > repos > blastem

comparison Makefile @ 1546:1a09422b87a5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Get Windows build working again. MegaWiFi code probably needs more work before it will actually work on Windows, but at least it doesn't break the build now
author Michael Pavone <pavone@retrodev.com>
date Mon, 26 Mar 2018 21:25:40 -0700
parents bed941c9bc86
children 430dd12e4010
comparison
equal deleted inserted replaced
1545:3faf917bab56 1546:1a09422b87a5
15 endif 15 endif
16 16
17 MEM:=mem_win.o 17 MEM:=mem_win.o
18 TERMINAL:=terminal_win.o 18 TERMINAL:=terminal_win.o
19 FONT:=nuklear_ui/font_win.o 19 FONT:=nuklear_ui/font_win.o
20 NET:=net_win.o
20 EXE:=.exe 21 EXE:=.exe
21 CC:=i686-w64-mingw32-gcc-win32 22 CC:=i686-w64-mingw32-gcc-win32
22 CFLAGS:=-std=gnu99 -Wreturn-type -Werror=return-type -Werror=implicit-function-declaration -I"$(SDL2_PREFIX)/include/SDL2" -I"$(GLEW_PREFIX)/include" -DGLEW_STATIC 23 CFLAGS:=-std=gnu99 -Wreturn-type -Werror=return-type -Werror=implicit-function-declaration -I"$(SDL2_PREFIX)/include/SDL2" -I"$(GLEW_PREFIX)/include" -DGLEW_STATIC
23 LDFLAGS:= $(GLEW32S_LIB) -L"$(SDL2_PREFIX)/lib" -lm -lmingw32 -lSDL2main -lSDL2 -lws2_32 -lopengl32 -lglu32 -mwindows 24 LDFLAGS:= $(GLEW32S_LIB) -L"$(SDL2_PREFIX)/lib" -lm -lmingw32 -lSDL2main -lSDL2 -lws2_32 -lopengl32 -lglu32 -mwindows
24 CPU:=i686 25 CPU:=i686
25 26
26 else 27 else
27 28
28 MEM:=mem.o 29 MEM:=mem.o
29 TERMINAL:=terminal.o 30 TERMINAL:=terminal.o
31 NET:=net.o
30 EXE:= 32 EXE:=
31 33
32 ifeq ($(OS),Darwin) 34 ifeq ($(OS),Darwin)
33 LIBS=sdl2 glew 35 LIBS=sdl2 glew
34 FONT:=nuklear_ui/font_mac.o 36 FONT:=nuklear_ui/font_mac.o
144 else 146 else
145 RENDEROBJS+= $(LIBZOBJS) png.o 147 RENDEROBJS+= $(LIBZOBJS) png.o
146 endif 148 endif
147 149
148 MAINOBJS=blastem.o system.o genesis.o debug.o gdb_remote.o vdp.o $(RENDEROBJS) io.o romdb.o hash.o menu.o xband.o \ 150 MAINOBJS=blastem.o system.o genesis.o debug.o gdb_remote.o vdp.o $(RENDEROBJS) io.o romdb.o hash.o menu.o xband.o \
149 realtec.o i2c.o nor.o sega_mapper.o multi_game.o megawifi.o net.o serialize.o $(TERMINAL) $(CONFIGOBJS) gst.o \ 151 realtec.o i2c.o nor.o sega_mapper.o multi_game.o megawifi.o $(NET) serialize.o $(TERMINAL) $(CONFIGOBJS) gst.o \
150 $(M68KOBJS) $(TRANSOBJS) $(AUDIOOBJS) saves.o zip.o 152 $(M68KOBJS) $(TRANSOBJS) $(AUDIOOBJS) saves.o zip.o
151 153
152 ifdef NONUKLEAR 154 ifdef NONUKLEAR
153 CFLAGS+= -DDISABLE_NUKLEAR 155 CFLAGS+= -DDISABLE_NUKLEAR
154 else 156 else