comparison Makefile @ 1840:3d0b20e9a187

Merge
author Michael Pavone <pavone@retrodev.com>
date Thu, 18 Apr 2019 19:48:04 -0700
parents 0c1491818f4b 37afb9cf58be
children 4c322abd9fa5
comparison
equal deleted inserted replaced
1838:0c1491818f4b 1840:3d0b20e9a187
8 8
9 BUNDLED_LIBZ:=zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/gzclose.o zlib/gzlib.o zlib/gzread.o\ 9 BUNDLED_LIBZ:=zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/gzclose.o zlib/gzlib.o zlib/gzread.o\
10 zlib/gzwrite.o zlib/infback.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o zlib/uncompr.o zlib/zutil.o 10 zlib/gzwrite.o zlib/infback.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o zlib/uncompr.o zlib/zutil.o
11 11
12 ifeq ($(OS),Windows) 12 ifeq ($(OS),Windows)
13 ifndef SDL2_PREFIX 13
14 SDL2_PREFIX:="sdl/i686-w64-mingw32"
15 endif
16 ifndef GLEW_PREFIX
17 GLEW_PREFIX:=glew 14 GLEW_PREFIX:=glew
18 endif
19 ifndef GLEW32S_LIB
20 GLEW32S_LIB:=$(GLEW_PREFIX)/lib/Release/Win32/glew32s.lib
21 endif
22
23 MEM:=mem_win.o 15 MEM:=mem_win.o
24 TERMINAL:=terminal_win.o 16 TERMINAL:=terminal_win.o
25 FONT:=nuklear_ui/font_win.o 17 FONT:=nuklear_ui/font_win.o
26 NET:=net_win.o 18 NET:=net_win.o
27 EXE:=.exe 19 EXE:=.exe
28 SO:=dll 20 SO:=dll
29 CPU:=i686 21 CPU:=i686
30 ifeq ($(CPU),i686) 22 ifeq ($(CPU),i686)
31 CC:=i686-w64-mingw32-gcc-win32 23 CC:=i686-w64-mingw32-gcc-win32
24 WINDRES:=i686-w64-mingw32-windres
25 GLUDIR:=Win32
26 SDL2_PREFIX:="sdl/i686-w64-mingw32"
32 else 27 else
33 CC:=x86_64-w64-mingw32-gcc-win32 28 CC:=x86_64-w64-mingw32-gcc-win32
34 endif 29 WINDRES:=x86_64-w64-mingw32-windres
30 SDL2_PREFIX:="sdl/x86_64-w64-mingw32"
31 GLUDIR:=x64
32 endif
33 GLEW32S_LIB:=$(GLEW_PREFIX)/lib/Release/$(GLUDIR)/glew32s.lib
35 CFLAGS:=-std=gnu99 -Wreturn-type -Werror=return-type -Werror=implicit-function-declaration 34 CFLAGS:=-std=gnu99 -Wreturn-type -Werror=return-type -Werror=implicit-function-declaration
36 LDFLAGS:=-lm -lmingw32 -lws2_32 -mwindows 35 LDFLAGS:=-lm -lmingw32 -lws2_32 -mwindows
37 ifneq ($(MAKECMDGOALS),libblastem.dll) 36 ifneq ($(MAKECMDGOALS),libblastem.dll)
38 CFLAGS+= -I"$(SDL2_PREFIX)/include/SDL2" -I"$(GLEW_PREFIX)/include" -DGLEW_STATIC 37 CFLAGS+= -I"$(SDL2_PREFIX)/include/SDL2" -I"$(GLEW_PREFIX)/include" -DGLEW_STATIC
39 LDFLAGS+= $(GLEW32S_LIB) -L"$(SDL2_PREFIX)/lib" -lSDL2main -lSDL2 -lopengl32 -lglu32 38 LDFLAGS+= $(GLEW32S_LIB) -L"$(SDL2_PREFIX)/lib" -lSDL2main -lSDL2 -lopengl32 -lglu32
149 PROFFLAGS:= -Wl,--no-as-needed -lprofiler -Wl,--as-needed 148 PROFFLAGS:= -Wl,--no-as-needed -lprofiler -Wl,--as-needed
150 CFLAGS+= -g3 149 CFLAGS+= -g3
151 endif 150 endif
152 ifdef NOGL 151 ifdef NOGL
153 CFLAGS+= -DDISABLE_OPENGL 152 CFLAGS+= -DDISABLE_OPENGL
154 NONUKLEAR:=1
155 endif 153 endif
156 154
157 ifdef M68030 155 ifdef M68030
158 CFLAGS+= -DM68030 156 CFLAGS+= -DM68030
159 endif 157 endif
368 vasmm68k_mot -Fbin -m68000 -no-opt -spaces -o $@ -L $@.list $< 366 vasmm68k_mot -Fbin -m68000 -no-opt -spaces -o $@ -L $@.list $<
369 367
370 %.bin : %.sz8 368 %.bin : %.sz8
371 vasmz80_mot -Fbin -spaces -o $@ $< 369 vasmz80_mot -Fbin -spaces -o $@ $<
372 res.o : blastem.rc 370 res.o : blastem.rc
373 i686-w64-mingw32-windres blastem.rc res.o 371 $(WINDRES) blastem.rc res.o
374 372
375 arrow.tiles : arrow.png 373 arrow.tiles : arrow.png
376 cursor.tiles : cursor.png 374 cursor.tiles : cursor.png
377 font_interlace_variable.tiles : font_interlace_variable.png 375 font_interlace_variable.tiles : font_interlace_variable.png
378 button.tiles : button.png 376 button.tiles : button.png