comparison Makefile @ 799:0b692b5d154b

Merge
author Michael Pavone <pavone@retrodev.com>
date Sun, 26 Jul 2015 13:25:31 -0700
parents bce97fc0bb8a 792be135d3af
children 236a184bf6f0
comparison
equal deleted inserted replaced
798:062a2199daf6 799:0b692b5d154b
9 ifndef GLEW32S_LIB 9 ifndef GLEW32S_LIB
10 GLEW32S_LIB=glew32s.lib 10 GLEW32S_LIB=glew32s.lib
11 endif 11 endif
12 12
13 MEM:=mem_win.o 13 MEM:=mem_win.o
14 TERMINAL:=terminal_win.o
14 BLASTEM:=blastem.exe 15 BLASTEM:=blastem.exe
15 CC:=wine gcc.exe 16 CC:=wine gcc.exe
16 CFLAGS:=-O2 -std=gnu99 -Wreturn-type -Werror=return-type -Werror=implicit-function-declaration -I"$(SDL2_PREFIX)/include/SDL2" -DGLEW_STATIC 17 CFLAGS:=-O2 -std=gnu99 -Wreturn-type -Werror=return-type -Werror=implicit-function-declaration -I"$(SDL2_PREFIX)/include/SDL2" -DGLEW_STATIC
17 LDFLAGS:= $(GLEW32S_LIB) -L"$(SDL2_PREFIX)/lib" -lm -lmingw32 -lSDL2main -lSDL2 -lopengl32 -lglu32 -mwindows 18 LDFLAGS:= $(GLEW32S_LIB) -L"$(SDL2_PREFIX)/lib" -lm -lmingw32 -lSDL2main -lSDL2 -lopengl32 -lglu32 -mwindows
18 CPU:=i686 19 CPU:=i686
19 20
20 else 21 else
21 22
22 MEM:=mem.o 23 MEM:=mem.o
24 TERMINAL:=terminal.o
23 BLASTEM:=blastem 25 BLASTEM:=blastem
24 26
25 ifeq ($(OS),Darwin) 27 ifeq ($(OS),Darwin)
26 LIBS=sdl2 glew 28 LIBS=sdl2 glew
27 else 29 else
103 105
104 Z80OBJS=z80inst.o z80_to_x86.o 106 Z80OBJS=z80inst.o z80_to_x86.o
105 AUDIOOBJS=ym2612.o psg.o wave.o 107 AUDIOOBJS=ym2612.o psg.o wave.o
106 CONFIGOBJS=config.o tern.o util.o 108 CONFIGOBJS=config.o tern.o util.o
107 109
108 MAINOBJS=blastem.o debug.o gdb_remote.o vdp.o render_sdl.o io.o romdb.o $(CONFIGOBJS) gst.o $(M68KOBJS) $(TRANSOBJS) $(AUDIOOBJS) 110 MAINOBJS=blastem.o debug.o gdb_remote.o vdp.o render_sdl.o io.o romdb.o $(TERMINAL) $(CONFIGOBJS) gst.o $(M68KOBJS) $(TRANSOBJS) $(AUDIOOBJS)
109 111
110 ifeq ($(CPU),x86_64) 112 ifeq ($(CPU),x86_64)
111 CFLAGS+=-DX86_64 -m64 113 CFLAGS+=-DX86_64 -m64
112 LDFLAGS+=-m64 114 LDFLAGS+=-m64
113 else 115 else
121 CFLAGS+=-DNO_Z80 123 CFLAGS+=-DNO_Z80
122 else 124 else
123 MAINOBJS+= $(Z80OBJS) 125 MAINOBJS+= $(Z80OBJS)
124 endif 126 endif
125 127
126 all : dis zdis stateview vgmplay $(BLASTEM) 128 ifeq ($(OS),Windows)
129 ALL=$(BLASTEM)
130 else
131 ALL= dis zdis stateview vgmplay blastem termhelper
132 endif
133
134 all : $(ALL)
127 135
128 $(BLASTEM) : $(MAINOBJS) 136 $(BLASTEM) : $(MAINOBJS)
129 $(CC) -o $(BLASTEM) $(MAINOBJS) $(LDFLAGS) 137 $(CC) -o $(BLASTEM) $(MAINOBJS) $(LDFLAGS)
130 $(FIXUP) 138 $(FIXUP)
131 139
188 196
189 %.bin : %.sz8 197 %.bin : %.sz8
190 vasmz80_mot -Fbin -spaces -o $@ $< 198 vasmz80_mot -Fbin -spaces -o $@ $<
191 199
192 clean : 200 clean :
193 rm -rf dis trans stateview test_x86 gen_fib *.o 201 rm -rf $(ALL) trans ztestrun ztestgen *.o