From 8702386eb5c41dc6694fd93240ebd498f4e96f31 Mon Sep 17 00:00:00 2001 From: Esteban Lorenzano Date: Tue, 26 Jun 2018 14:56:53 +0200 Subject: [PATCH] split freetype build to win64 (because win32 is more standard) --- build.win64x64/third-party/Makefile.freetype2 | 2 +- third-party/freetype2.spec | 2 +- third-party/freetype2.spec.win64 | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 third-party/freetype2.spec.win64 diff --git a/build.win64x64/third-party/Makefile.freetype2 b/build.win64x64/third-party/Makefile.freetype2 index 8ac4b974c2..0c72545847 100644 --- a/build.win64x64/third-party/Makefile.freetype2 +++ b/build.win64x64/third-party/Makefile.freetype2 @@ -3,7 +3,7 @@ ifndef THIRDPARTYDIR include ../common/Makefile.lib.extra endif -include ../../third-party/freetype2.spec +include ../../third-party/freetype2.spec.win64 MINGWLIBDIR:=/usr/x86_64-w64-mingw32/sys-root/mingw/bin FREETYPE2LIBNAME:=$(freetype2_spec_product_name_windows) diff --git a/third-party/freetype2.spec b/third-party/freetype2.spec index 666f942bbf..bca63fa412 100644 --- a/third-party/freetype2.spec +++ b/third-party/freetype2.spec @@ -3,5 +3,5 @@ freetype2_spec_archive_name:=freetype-2.6.5.tar.gz freetype2_spec_unpack_dir_name:=freetype-2.6.5 freetype2_spec_product_name_macOS:=libfreetype.6.dylib freetype2_spec_product_name_linux:= -freetype2_spec_product_name_windows:=libfreetype-6.dll +freetype2_spec_product_name_windows:=libfreetype.dll freetype2_spec_symlinks_macOS:=libfreetype*.dylib diff --git a/third-party/freetype2.spec.win64 b/third-party/freetype2.spec.win64 new file mode 100644 index 0000000000..3484883484 --- /dev/null +++ b/third-party/freetype2.spec.win64 @@ -0,0 +1 @@ +freetype2_spec_product_name_windows:=libfreetype-6.dll \ No newline at end of file