From 9dd4f36886b13ad0efee37a156531b00f54fafdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?IOhannes=20m=20zm=C3=B6lnig?= Date: Wed, 30 May 2018 23:34:25 +0200 Subject: [PATCH 1/3] Removed trailing whitespace --- Makefile.pdlibbuilder | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.pdlibbuilder b/Makefile.pdlibbuilder index f81edfe..aa84935 100644 --- a/Makefile.pdlibbuilder +++ b/Makefile.pdlibbuilder @@ -450,7 +450,7 @@ ifeq ($(uname), Darwin) system = Darwin endif -ifeq ($(filter MINGW% MSYS%, $(uname)), $(uname)) +ifeq ($(filter MINGW% MSYS%, $(uname)), $(uname)) system = Windows endif @@ -514,11 +514,11 @@ else ifeq ($(target.arch), armv7l) # Intel 32 bit, build with SSE and SSE2 instructions else ifeq ($(findstring $(target.arch), i386 i686), $(target.arch)) arch.c.flags = -march=pentium4 -mfpmath=sse -msse -msse2 - + # Intel/AMD 64 bit, build with SSE, SSE2 and SSE3 instructions else ifeq ($(findstring $(target.arch), x86_64), $(target.arch)) arch.c.flags = -march=core2 -mfpmath=sse -msse -msse2 -msse3 - + # if none of the above architectures detected else arch.c.flags = From ece8e6b8b7faa4ace36d495c76dbcd7b9b23374a Mon Sep 17 00:00:00 2001 From: katjav Date: Wed, 1 Aug 2018 10:32:57 +0200 Subject: [PATCH 2/3] Fix omission of flag for minimum OSX version This commit fixes a regression bug introduced with commit 48c4127 for v0.4.1. If minimum OSX version is not specified the compiler will assume the version of the build machine and the build may not be fully compatible with older OSX versions. --- Makefile.pdlibbuilder | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile.pdlibbuilder b/Makefile.pdlibbuilder index aa84935..6b4483b 100644 --- a/Makefile.pdlibbuilder +++ b/Makefile.pdlibbuilder @@ -574,11 +574,14 @@ ifeq ($(system), Darwin) ifeq ($(target.arch), i386) cxx.flags := -fcheck-new arch := ppc i386 x86_64 - version.flag ?= -mmacosx-version-min=10.4 + version.flag = -mmacosx-version-min=10.4 endif ifeq ($(target.arch), x86_64) arch := i386 x86_64 - version.flag ?= -mmacosx-version-min=10.5 + version.flag = -mmacosx-version-min=10.5 + endif + ifneq ($(filter -mmacosx-version-min=%, $(cflags)),) + version.flag := $(filter -mmacosx-version-min=%, $(cflags)) endif arch.c.flags := $(addprefix -arch , $(arch)) $(version.flag) arch.ld.flags := $(arch.c.flags) From 1137cca2fadffc1fbb8f0086165ab1076d5100ef Mon Sep 17 00:00:00 2001 From: katjav Date: Wed, 20 Mar 2019 13:53:59 +0100 Subject: [PATCH 3/3] Specify minimum OSX version 10.6 instead of 10.5 OSX 10.14.3 can not build for 10.5 and stalls the build. Specifying 10.6 as minimum solves the issue (#49). For building with OSX on i386 architectures, minimum OSX version remains unchanged (10.4). --- Makefile.pdlibbuilder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.pdlibbuilder b/Makefile.pdlibbuilder index 6b4483b..a0194b2 100644 --- a/Makefile.pdlibbuilder +++ b/Makefile.pdlibbuilder @@ -578,7 +578,7 @@ ifeq ($(system), Darwin) endif ifeq ($(target.arch), x86_64) arch := i386 x86_64 - version.flag = -mmacosx-version-min=10.5 + version.flag = -mmacosx-version-min=10.6 endif ifneq ($(filter -mmacosx-version-min=%, $(cflags)),) version.flag := $(filter -mmacosx-version-min=%, $(cflags))