Compile using aligned_alloc() provided by Boost.

Useful for MacOS < 10.15 (Catalina).

Author: m000

Makefile

@@ -16,11 +16,15 @@ DEBUG?=0
 PROFILE?=0
 SAVE_ASM?=0
 WINDOWS?=0
+MACOS?=0
+BOOST?=0
 
 # VARIABLES
 CFLAGS+=-std=c11 -pedantic
 CFLAGS+=-msse2 -mfpmath=sse
 CFLAGS+=-g
+CXXFLAGS+=-msse2 -mfpmath=sse -std=c++17
+CXXFLAGS+=-g
 WARN_FLAGS+=-Wall -Wextra -Winline -Wshadow
 NO_WARN_FLAGS+=-w
 ifeq ($(CC),)
@@ -70,6 +74,19 @@ CFLAGS+=-mstackrealign # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=48659
 RES+=icon.rc.o
 endif
 
+ifeq ($(MACOS),1)
+HOMEBREW:=$(shell brew --prefix)
+CPPFLAGS+=-I$(HOMEBREW)/include
+LDFLAGS+=-L$(HOMEBREW)/lib
+
+ifeq ($(BOOST),1)
+HOMEBREW_BOOST:=$(shell brew --prefix boost)
+CPPFLAGS+=-DBOOST_ALIGNED_ALLOC -I$(HOMEBREW_BOOST)/include
+LDFLAGS+=-L$(HOMEBREW_BOOST)/lib
+OBJS+=boost_aligned_alloc.o
+endif
+endif
+
 ifeq ($(SAVE_ASM),1)
 CFLAGS+=-save-temps -masm=intel -fverbose-asm
 endif
@@ -82,15 +99,22 @@ LDFLAGS+=$(BFLAGS)
 all: jpeg2png$(EXE)
 
 jpeg2png$(EXE): $(OBJS) $(RES) Makefile
+ifeq ($(BOOST),0)
 	$(CC) $(OBJS) $(RES) -o $@ $(LDFLAGS) $(LIBS)
+else
+	$(CXX) $(OBJS) $(RES) -o $@ $(CXXFLAGS) $(LDFLAGS) $(LIBS)
+endif
 
 -include $(OBJS:.o=.d)
 
 gopt/gopt.o: gopt/gopt.c gopt/gopt.h Makefile
-	$(CC) $< -c -o $@ $(CFLAGS) $(NO_WARN_FLAGS)
+	$(CC) $< -c -o $@ $(CFLAGS) $(CPPFLAGS) $(NO_WARN_FLAGS)
 
 %.o: %.c Makefile
-	$(CC) -MP -MMD $< -c -o $@ $(CFLAGS) $(WARN_FLAGS)
+	$(CC) -MP -MMD $< -c -o $@ $(CFLAGS) $(CPPFLAGS) $(WARN_FLAGS)
+
+%.o: %.cpp Makefile
+	$(CXX) -MP -MMD $< -c -o $@ $(CXXFLAGS) $(CPPFLAGS) $(WARN_FLAGS)
 
 %.rc.o: %.rc Makefile
 	$(WINDRES) $< $@

boost_aligned_alloc.cpp

@@ -0,0 +1,13 @@
+#include <boost/align.hpp>
+#include <boost/align/aligned_alloc.hpp>
+#include "utils.h"
+
+void *boost_aligned_alloc(size_t alignment, size_t size) {
+	return boost::alignment::aligned_alloc(alignment, size);
+}
+
+
+void boost_aligned_free(void *p) {
+	boost::alignment::aligned_free(p);
+}
+

utils.h

@@ -19,6 +19,11 @@ clock_t start_timer(const char *name);
 void stop_timer(clock_t t, const char *n);
 void compare(const char *name, unsigned w, unsigned h, float *bnew, float *bold);
 
+#ifdef BOOST_ALIGNED_ALLOC
+void *boost_aligned_alloc(size_t alignment, size_t size);
+void boost_aligned_free(void *p);
+#endif
+
 // Convenience macros
 #define MIN(a, b)  (((a) < (b)) ? (a) : (b))
 #define MAX(a, b)  (((a) > (b)) ? (a) : (b))
@@ -93,8 +98,12 @@ static inline float sqf(float x) {
 static inline void *alloc_simd(size_t n) {
 #if defined(_WIN32)
         void *p = _aligned_malloc(n, 16);
+#else
+#if defined BOOST_ALIGNED_ALLOC
+        void *p = boost_aligned_alloc(16, n);
 #else
         void *p = aligned_alloc(16, n);
+#endif
 #endif
         if(!p) { die("allocation error"); }
         ASSUME_ALIGNED(p);
@@ -104,9 +113,13 @@ static inline void *alloc_simd(size_t n) {
 static inline void free_simd(void *p) {
 #ifdef _WIN32
         _aligned_free(p);
+#else
+#if defined BOOST_ALIGNED_ALLOC
+        boost_aligned_free(p);
 #else
         free(p);
 #endif
+#endif
 }
 
 #ifdef __cplusplus