Skip to content

Commit c636376

Browse files
author
Mischa Spiegelmock
authored
#378 fix aligned alloc on macOS when building without XCode (#384)
1 parent b7818e6 commit c636376

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

configure.ac

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
AC_INIT([projectM], [3.1.5], [[email protected]], [projectM], [https://github.com/projectM-visualizer/projectm/])
1+
AC_INIT([projectM], [3.1.6], [[email protected]], [projectM], [https://github.com/projectM-visualizer/projectm/])
22
AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects tar-pax])
33

44
m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
@@ -241,6 +241,7 @@ my_CFLAGS="-Wall -Wchar-subscripts -Wformat-security -Wpointer-arith -Wshadow -W
241241
#my_CFLAGS+="-fsanitize=address -fno-omit-frame-pointer "
242242
my_CFLAGS="${my_CFLAGS} -DDATADIR_PATH=\\\"\"\$(pkgdatadir)\\\"\""
243243
my_CFLAGS="${my_CFLAGS} -I\$(top_srcdir)/vendor"
244+
my_CFLAGS="${my_CFLAGS} -DGL_SILENCE_DEPRECATION"
244245
AC_SUBST([my_CFLAGS])
245246

246247

src/libprojectM/wipemalloc.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ void *wipe_aligned_alloc( size_t align, size_t size )
5555
{
5656
void *mem = NULL;
5757

58-
#if HAVE_ALIGNED_ALLOC==1
58+
#if HAVE_ALIGNED_ALLOC==1 && !__APPLE__
5959

6060
mem = aligned_alloc( align, size );
6161

0 commit comments

Comments
 (0)