Blob Blame History Raw
diff -up ags-v.3.4.4.1/Common/font/ttffontrenderer.cpp.alfont ags-v.3.4.4.1/Common/font/ttffontrenderer.cpp
--- ags-v.3.4.4.1/Common/font/ttffontrenderer.cpp.alfont	2019-09-25 18:48:18.000000000 +0200
+++ ags-v.3.4.4.1/Common/font/ttffontrenderer.cpp	2019-10-02 11:51:57.716766800 +0200
@@ -108,22 +108,6 @@ bool TTFFontRenderer::LoadFromDiskEx(int
   if (alfptr == NULL)
     return false;
 
-  // TODO: move this somewhere, should not be right here
-#if !defined(WINDOWS_VERSION)
-  // FIXME: (!!!) this fix should be done differently:
-  // 1. Find out which OUTLINE font was causing troubles;
-  // 2. Replace outline method ONLY if that troublesome font is used as outline.
-  // 3. Move this fix somewhere else!! (right after game load routine?)
-  //
-  // Check for the LucasFan font since it comes with an outline font that
-  // is drawn incorrectly with Freetype versions > 2.1.3.
-  // A simple workaround is to disable outline fonts for it and use
-  // automatic outline drawing.
-  if (get_font_outline(fontNumber) >=0 &&
-      strcmp(alfont_get_name(alfptr), "LucasFan-Font") == 0)
-      set_font_outline(fontNumber, FONT_OUTLINE_AUTO);
-#endif
-
   if (fontSize > 0)
     alfont_set_font_size(alfptr, fontSize);
 
diff -up ags-v.3.4.4.1/Engine/Makefile.alfont ags-v.3.4.4.1/Engine/Makefile
--- ags-v.3.4.4.1/Engine/Makefile.alfont	2019-10-02 11:51:57.716766800 +0200
+++ ags-v.3.4.4.1/Engine/Makefile	2019-10-02 11:52:34.423037996 +0200
@@ -13,7 +13,7 @@ include Makefile-defs.linux
 endif
 
 include Makefile-objs
-OBJS_C_CPP = $(ALFONT) $(ALMP3) $(ALOGG) $(APEG) $(AASTR) $(HQ2X3X) $(AL_MIDI_PATCH) $(CDA) $(GLAD) $(PLUGINS) $(BASE) $(BASE_PLATFORM)
+OBJS_C_CPP = $(ALMP3) $(ALOGG) $(APEG) $(AASTR) $(HQ2X3X) $(AL_MIDI_PATCH) $(CDA) $(GLAD) $(PLUGINS) $(BASE) $(BASE_PLATFORM)
 OBJS_C = $(OBJS_C_CPP:.cpp=.o)
 OBJS = $(OBJS_C:.c=.o)
 
diff -up ags-v.3.4.4.1/Engine/Makefile-defs.linux.alfont ags-v.3.4.4.1/Engine/Makefile-defs.linux
--- ags-v.3.4.4.1/Engine/Makefile-defs.linux.alfont	2019-09-25 18:48:18.000000000 +0200
+++ ags-v.3.4.4.1/Engine/Makefile-defs.linux	2019-10-02 11:51:57.717766808 +0200
@@ -4,6 +4,7 @@ CFLAGS := -O2 -g -fsigned-char -Wfatal-e
 CXXFLAGS := -fno-rtti -Wno-write-strings $(CXXFLAGS)
 LIBS := -rdynamic -laldmb -ldumb -Wl,-Bdynamic
 LIBS += $(shell pkg-config --libs allegro)
+LIBS += -lalfont
 LIBS += $(shell pkg-config --libs x11)
 LIBS += $(shell pkg-config --libs ogg)
 LIBS += $(shell pkg-config --libs theora)
diff -up ags-v.3.4.4.1/Engine/Makefile-objs.alfont ags-v.3.4.4.1/Engine/Makefile-objs
--- ags-v.3.4.4.1/Engine/Makefile-objs.alfont	2019-09-25 18:48:18.000000000 +0200
+++ ags-v.3.4.4.1/Engine/Makefile-objs	2019-10-02 11:51:57.717766808 +0200
@@ -59,8 +59,6 @@ PLUGINS = ../Plugins/AGSflashlight/agsfl
 
 HQ2X3X = libsrc/hq2x/hq2x3x.cpp
 
-ALFONT = libsrc/alfont-2.0.9/alfont.c
-
 ALMP3 = libsrc/almp3/almp3.c libsrc/almp3-2.0.5/decoder/common.c libsrc/almp3-2.0.5/decoder/dct64_i386.c libsrc/almp3-2.0.5/decoder/decode_i386.c libsrc/almp3-2.0.5/decoder/interface.c libsrc/almp3-2.0.5/decoder/layer2.c libsrc/almp3-2.0.5/decoder/layer3.c libsrc/almp3-2.0.5/decoder/tabinit.c
 
 ALOGG = libsrc/alogg/alogg.c