Mercurial > repos > blastem

comparison Makefile @ 745:daa31ee7d8cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Get windows build compiling again post-merge
author Michael Pavone <pavone@retrodev.com>
date Thu, 28 May 2015 22:31:21 -0700
parents fc68992cf18d
children 9d4d40f833d0
comparison
equal deleted inserted replaced
744:fc68992cf18d 745:daa31ee7d8cd
7 7
8 MEM:=mem_win.o 8 MEM:=mem_win.o
9 BLASTEM:=blastem.exe 9 BLASTEM:=blastem.exe
10 10
11 CC:=wine gcc.exe 11 CC:=wine gcc.exe
12 CFLAGS:=-O2 -std=gnu99 -Wreturn-type -Werror=return-type -Werror= 12 CFLAGS:=-g -std=gnu99 -Wreturn-type -Werror=return-type -Werror=implicit-function-declaration -I"C:/MinGW/usr/include/SDL2" -DGLEW_STATIC
13 LDFLAGS:= -L"C:/MinGW/usr/lib" -lm -lmingw32 -lSDLmain -lSDL -mwindows 13 LDFLAGS:= -L"C:/MinGW/usr/lib" -lm -lmingw32 -lSDL2main -lSDL2 -lopengl32 -lglu32 -mwindows
14 CPU:=i686 14 CPU:=i686
15 15
16 else 16 else
17 17
18 MEM:=mem.o 18 MEM:=mem.o
61 61
62 ifeq ($(OS),Darwin) 62 ifeq ($(OS),Darwin)
63 LDFLAGS+= -framework OpenGL 63 LDFLAGS+= -framework OpenGL
64 endif 64 endif
65 65
66 TRANSOBJS=gen.o backend.o mem.o 66 TRANSOBJS=gen.o backend.o $(MEM)
67 M68KOBJS=68kinst.o m68k_core.o 67 M68KOBJS=68kinst.o m68k_core.o
68 ifeq ($(CPU),x86_64) 68 ifeq ($(CPU),x86_64)
69 M68KOBJS+= m68k_core_x86.o 69 M68KOBJS+= m68k_core_x86.o
70 TRANSOBJS+= gen_x86.o backend_x86.o 70 TRANSOBJS+= gen_x86.o backend_x86.o
71 else 71 else
95 CFLAGS+=-DNO_Z80 95 CFLAGS+=-DNO_Z80
96 else 96 else
97 MAINOBJS+= $(Z80OBJS) 97 MAINOBJS+= $(Z80OBJS)
98 endif 98 endif
99 99
100 ifdef WINDOWS 100 ifeq ($(OS),Windows)
101 MAINOBJS+= glew32s.lib 101 MAINOBJS+= glew32s.lib
102 endif 102 endif
103 103
104 all : dis zdis stateview vgmplay blastem 104 all : dis zdis stateview vgmplay blastem
105 105