m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable libSDL2-ttf with Mac OS X again.

Browse Source 
Tested with Mac OS X 10.9.5
This commit is contained in:
Thomas BERNARD 2018-11-27 11:19:29 +01:00 committed by Thomas Bernard
parent 4dfd12c346
commit 8a3e5da6a1
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Makefile
View File

@ -198,6 +198,8 @@ ifeq ($(API),sdl2)
SDLCOPT = $(shell sdl2-config --cflags) SDLCOPT = $(shell sdl2-config --cflags)
SDLLOPT = $(shell sdl2-config --libs) $(shell pkg-config --libs SDL2_image) SDLLOPT = $(shell sdl2-config --libs) $(shell pkg-config --libs SDL2_image)
SDLLOPT += -Wl,-framework,Cocoa SDLLOPT += -Wl,-framework,Cocoa
#TTFCOPT = $(shell pkg-config --cflags SDL2_ttf)
TTFLOPT = $(shell pkg-config --libs SDL2_ttf)
endif endif
# these are for use with macports # these are for use with macports
@ -224,6 +226,7 @@ ifdef MACOSX_LION
LOPT = $(SDLLOPT) $(LUALOPT) -framework libpng14 -lz LOPT = $(SDLLOPT) $(LUALOPT) -framework libpng14 -lz
else else
LOPT = $(SDLLOPT) $(LUALOPT) LOPT = $(SDLLOPT) $(LUALOPT)
LOPT += $(TTFLOPT)
LIBPNGCONFIG := $(shell libpng-config) LIBPNGCONFIG := $(shell libpng-config)
ifneq ($(LIBPNGCONFIG), ) ifneq ($(LIBPNGCONFIG), )
COPT += $(shell libpng-config --cflags) COPT += $(shell libpng-config --cflags)
@ -246,7 +249,7 @@ ifeq ($(API),sdl)
endif endif
FCLOPT = FCLOPT =
MACAPPEXE = Grafx2.app/Contents/MacOS/Grafx2 MACAPPEXE = Grafx2.app/Contents/MacOS/Grafx2
NOTTF = 1 #NOTTF = 1
else else
ifeq ($(PLATFORM),AROS) # 3 ifeq ($(PLATFORM),AROS) # 3
#AROS specific #AROS specific

6
src/text.c
View File

@ -32,11 +32,7 @@
// TrueType // TrueType
#ifndef NOTTF #ifndef NOTTF
#if defined(__macosx__) #include <SDL_ttf.h>
#include <SDL_ttf/SDL_ttf.h>
#else
#include <SDL_ttf.h>
#endif
#if defined(__CAANOO__) || defined(__WIZ__) || defined(__GP2X__) #if defined(__CAANOO__) || defined(__WIZ__) || defined(__GP2X__)
// No fontconfig // No fontconfig