Mercurial > repos > blastem
diff Makefile @ 1936:2c1c88cd1a3f mame_interp
Merge from default
| author | Michael Pavone <pavone@retrodev.com> |
|---|---|
| date | Sun, 19 Apr 2020 00:59:09 -0700 |
| parents | 374a5ae694e8 f23e70fb6607 |
| children | a7b753e260a2 |
line wrap: on
line diff
--- a/Makefile Sat Apr 18 11:42:53 2020 -0700 +++ b/Makefile Sun Apr 19 00:59:09 2020 -0700 @@ -100,16 +100,17 @@ endif ifeq ($(OS),Darwin) -CFLAGS+= -IFrameworks/SDL2.framework/Headers +SDL_INCLUDE_PATH:=Frameworks/SDL2.framework/Headers LDFLAGS+= -FFrameworks -framework SDL2 -framework OpenGL -framework AppKit FIXUP:=install_name_tool -change @rpath/SDL2.framework/Versions/A/SDL2 @executable_path/Frameworks/SDL2.framework/Versions/A/SDL2 else -CFLAGS+= -Isdl/include +SDL_INCLUDE_PATH:=sdl/include LDFLAGS+= -Wl,-rpath='$$ORIGIN/lib' -Llib -lSDL2 ifndef USE_GLES LDFLAGS+= $(shell pkg-config --libs gl) endif endif #Darwin +CFLAGS+= -I$(SDL_INCLUDE_PATH) else ifeq ($(MAKECMDGOALS),libblastem.$(SO)) @@ -260,6 +261,10 @@ CFLAGS+= -DDATA_PATH='"'$(DATA_PATH)'"' endif +ifdef FONT_PATH +CFLAGS+= -DFONT_PATH='"'$(FONT_PATH)'"' +endif + ALL=dis$(EXE) zdis$(EXE) stateview$(EXE) vgmplay$(EXE) blastem$(EXE) ifneq ($(OS),Windows) ALL+= termhelper