Attachment #398758 for bug #496654

Lines 8-18 Link Here

(-)work.orig/src/osd/modules/font/font_sdl.c (-4 lines)
8		8
9	#if defined(SDLMAME_UNIX) && (!defined(SDLMAME_MACOSX)) && (!defined(SDLMAME_SOLARIS)) && (!defined(SDLMAME_HAIKU)) && (!defined(SDLMAME_EMSCRIPTEN))	9	#if defined(SDLMAME_UNIX) && (!defined(SDLMAME_MACOSX)) && (!defined(SDLMAME_SOLARIS)) && (!defined(SDLMAME_HAIKU)) && (!defined(SDLMAME_EMSCRIPTEN))
10		10
11	#if (SDLMAME_SDL2)
12	#include <SDL2/SDL_ttf.h>
13	#else
14	#include <SDL/SDL_ttf.h>	11	#include <SDL/SDL_ttf.h>
15	#endif
16	#ifndef SDLMAME_HAIKU	12	#ifndef SDLMAME_HAIKU
17	#include <fontconfig/fontconfig.h>	13	#include <fontconfig/fontconfig.h>
18	#endif	14	#endif

Lines 649-659 Link Here

(-)work.orig/src/osd/sdl/sdl.mak (-4 lines)
649	endif	649	endif
650	LIBS += $(FONTCONFIGLIBS)	650	LIBS += $(FONTCONFIGLIBS)
651		651
652	ifeq ($(SDL_LIBVER),sdl2)
653	LIBS += -lSDL2_ttf
654	else
655	LIBS += -lSDL_ttf	652	LIBS += -lSDL_ttf
656	endif
657		653
658	# FIXME: should be dealt with elsewhere	654	# FIXME: should be dealt with elsewhere
659	# libs that Haiku doesn't want but are mandatory on *IX	655	# libs that Haiku doesn't want but are mandatory on *IX

Return to bug 496654