File tree 4 files changed +14
-3
lines changed
4 files changed +14
-3
lines changed Original file line number Diff line number Diff line change @@ -28,6 +28,7 @@ LIBNAMEFLAG=$(shell sh platform.sh libnameflag $(MAJOR) $(INSTALLLIB))
28
28
CFLAGS? =-pipe -O2 $(WARNFLAGS )
29
29
CFLAGS+ =-g # TODO(sissel): Comment before release
30
30
CFLAGS+=$(CPPFLAGS )
31
+ CFLAGS+ =$(shell sh cflags.sh)
31
32
32
33
DEFAULT_LIBS =-L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXtst -lXinerama -lxkbcommon
33
34
DEFAULT_INC =-I/usr/X11R6/include -I/usr/local/include
Original file line number Diff line number Diff line change
1
+ #! /bin/sh
2
+
3
+ osxver=` sw_vers -productVersion 2> /dev/null`
4
+ if [ $? -eq 0 ] ; then
5
+ minor=` echo " $osxver " | cut -d. -f2`
6
+ if [ " $minor " -le 11 ] ; then
7
+ # Versions of OSX before 10.12 (aka "macOS Sierra") did not have clock_gettime()
8
+ echo " -DMISSING_CLOCK_GETTIME"
9
+ fi
10
+ fi
Original file line number Diff line number Diff line change 4
4
#include <time.h> /* for clock_gettime */
5
5
#include <sys/time.h> /* for timeradd and friends */
6
6
7
- #if defined(__APPLE__ ) && defined( __MACH__ )
7
+ #if defined(MISSING_CLOCK_GETTIME )
8
8
/* http://code.google.com/p/semicomplete/issues/detail?id=37
9
- * OS X doesn't support clock_gettime (in at least OSX <= 10.6 ) */
10
- # include "osx_hacks .h"
9
+ * OS X doesn't support clock_gettime (in at least OSX <= 10.11 ) */
10
+ # include "patch_clock_gettime .h"
11
11
#endif
12
12
13
13
/* TODO(sissel): Refactor the madness.
File renamed without changes.
You can’t perform that action at this time.
0 commit comments