diff options
| author | ultramn <dchapm2@umbc.edu> | 2017-03-16 17:17:07 -0700 |
|---|---|---|
| committer | ultramn <dchapm2@umbc.edu> | 2017-03-16 17:17:07 -0700 |
| commit | 768a06613e38194e58d37ab3b1c5bb4a326f0e2b (patch) | |
| tree | ab10dbf78337cb12bd142091efb845ba57d57768 | |
| parent | a46654cb58a1f4e1971395a4b4364e1b5a0df8d3 (diff) | |
| download | libsurvive-768a06613e38194e58d37ab3b1c5bb4a326f0e2b.tar.gz libsurvive-768a06613e38194e58d37ab3b1c5bb4a326f0e2b.tar.bz2 | |
Almost compiles on Apple (not quite there)
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | redist/json_helpers.c | 2 | ||||
| -rwxr-xr-x | src/survive.c | 4 | ||||
| -rw-r--r-- | src/survive_config.c | 2 | ||||
| -rwxr-xr-x | src/survive_vive.c | 2 |
5 files changed, 8 insertions, 4 deletions
@@ -3,7 +3,7 @@ all : lib data_recorder test calibrate calibrate_client CC:=gcc CFLAGS:=-Iinclude/libsurvive -I. -fPIC -g -O3 -Iredist -flto -DUSE_DOUBLE -std=gnu99 -rdynamic -LDFLAGS:=-lpthread -lusb-1.0 -lz -lX11 -lm -flto -g +LDFLAGS:=-L/usr/local/lib -lpthread -lusb-1.0 -lz -lX11 -lm -flto -g POSERS:=src/poser_dummy.o src/poser_daveortho.o src/poser_charlesslow.o REDISTS:=redist/json_helpers.o redist/linmath.o redist/jsmn.o diff --git a/redist/json_helpers.c b/redist/json_helpers.c index 7690318..e0b86f4 100644 --- a/redist/json_helpers.c +++ b/redist/json_helpers.c @@ -7,7 +7,7 @@ #include <string.h> #include "json_helpers.h" #include <jsmn.h> -#ifndef __FreeBSD__ +#if !defined(__FreeBSD__) && !defined(__APPLE__) #include <malloc.h> #endif diff --git a/src/survive.c b/src/survive.c index 81c45c3..9554d9c 100755 --- a/src/survive.c +++ b/src/survive.c @@ -9,6 +9,10 @@ #include "survive_config.h" +#ifdef __APPLE__ +#define z_const const +#endif + #ifdef RUNTIME_SYMNUM #include <symbol_enumerator.h> static int did_runtime_symnum; diff --git a/src/survive_config.c b/src/survive_config.c index 07b9326..5458ef0 100644 --- a/src/survive_config.c +++ b/src/survive_config.c @@ -3,7 +3,7 @@ #include <assert.h> #include "survive_config.h" #include <json_helpers.h> -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__APPLE__) #include <stdlib.h> #else #include <malloc.h> //for alloca diff --git a/src/survive_vive.c b/src/survive_vive.c index 1929b1a..5a76d24 100755 --- a/src/survive_vive.c +++ b/src/survive_vive.c @@ -18,7 +18,7 @@ #include <string.h> #include <sys/stat.h> #include <os_generic.h> -#ifndef __FreeBSD__ +#if !defined(__FreeBSD__) && !defined(__APPLE__) #include <malloc.h> // for alloca #endif |