d96dc05b1d
fix compilation with GCC10 (missing cstdio includes) unbundle freetype fix linking against system libdumb
47 lines
2.3 KiB
Diff
47 lines
2.3 KiB
Diff
diff -up ags-v.3.5.0.25/Common/font/ttffontrenderer.cpp.alfont ags-v.3.5.0.25/Common/font/ttffontrenderer.cpp
|
|
--- ags-v.3.5.0.25/Common/font/ttffontrenderer.cpp.alfont 2020-08-03 01:12:57.187878580 +0200
|
|
+++ ags-v.3.5.0.25/Common/font/ttffontrenderer.cpp 2020-08-03 01:14:56.908761650 +0200
|
|
@@ -15,7 +15,7 @@
|
|
#include <alfont.h>
|
|
#include "core/platform.h"
|
|
|
|
-#define AGS_OUTLINE_FONT_FIX (!AGS_PLATFORM_OS_WINDOWS)
|
|
+#define AGS_OUTLINE_FONT_FIX 0
|
|
|
|
#include "core/assetmanager.h"
|
|
#include "font/ttffontrenderer.h"
|
|
diff -up ags-v.3.5.0.25/Engine/Makefile.alfont ags-v.3.5.0.25/Engine/Makefile
|
|
--- ags-v.3.5.0.25/Engine/Makefile.alfont 2020-08-03 01:12:57.187878580 +0200
|
|
+++ ags-v.3.5.0.25/Engine/Makefile 2020-08-03 01:15:39.585076430 +0200
|
|
@@ -23,7 +23,7 @@ OBJS := $(OBJS:.mm=.o)
|
|
OBJS := $(OBJS:.cpp=.o)
|
|
OBJS := $(OBJS:.c=.o)
|
|
|
|
-OBJS_COMMON := $(COMMON) $(ALFONT) $(FREETYPE)
|
|
+OBJS_COMMON := $(COMMON) $(FREETYPE)
|
|
OBJS_COMMON := $(OBJS_COMMON:.mm=.o)
|
|
OBJS_COMMON := $(OBJS_COMMON:.cpp=.o)
|
|
OBJS_COMMON := $(OBJS_COMMON:.c=.o)
|
|
diff -up ags-v.3.5.0.25/Engine/Makefile-defs.linux.alfont ags-v.3.5.0.25/Engine/Makefile-defs.linux
|
|
--- ags-v.3.5.0.25/Engine/Makefile-defs.linux.alfont 2020-08-03 01:12:57.187878580 +0200
|
|
+++ ags-v.3.5.0.25/Engine/Makefile-defs.linux 2020-08-03 01:16:28.688438622 +0200
|
|
@@ -22,6 +22,7 @@ CXXFLAGS := -std=c++11 -Werror=delete-no
|
|
LIBS := -Wl,-Bdynamic
|
|
LIBS += $(FT_LDFLAGS)
|
|
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.5.0.25/Engine/Makefile-objs.alfont ags-v.3.5.0.25/Engine/Makefile-objs
|
|
--- ags-v.3.5.0.25/Engine/Makefile-objs.alfont 2020-08-03 01:12:57.188878587 +0200
|
|
+++ ags-v.3.5.0.25/Engine/Makefile-objs 2020-08-03 01:16:57.547651489 +0200
|
|
@@ -59,8 +59,6 @@ PLUGINS = ../Plugins/AGSflashlight/agsfl
|
|
|
|
HQ2X3X = libsrc/hq2x/hq2x3x.cpp
|
|
|
|
-ALFONT = ../Common/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
|