Skip to content
Snippets Groups Projects
Commit a5deb387 authored by Anders Blomdell's avatar Anders Blomdell
Browse files

Various OSX fixes.

parent 571541d7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
lib/c/Makefile
+ 2
− 1
View file @ a5deb387
...@@ -8,9 +8,10 @@ ifeq ($(UNAME_S),Linux) ...@@ -8,9 +8,10 @@ ifeq ($(UNAME_S),Linux)
MAKESHARED=gcc -o $1 -shared -Wl,-soname,$2 $3 -lc -lrt MAKESHARED=gcc -o $1 -shared -Wl,-soname,$2 $3 -lc -lrt
else ifeq ($(UNAME_S),Darwin) else ifeq ($(UNAME_S),Darwin)
CC=clang CC=clang
CFLAGS=-g -Wall -Werror -O3 -I. -Itest CFLAGS=-g -Wall -Werror -O3 -I. -Itest \
-DLABCOMM_COMPAT=\"labcomm_compat_osx.h\" \ -DLABCOMM_COMPAT=\"labcomm_compat_osx.h\" \
-Wno-tautological-compare -Wno-unused-function -Wno-tautological-compare -Wno-unused-function
LDFLAGS=-L.
LDLIBS=-llabcomm LDLIBS=-llabcomm
MAKESHARED=clang -o $1 -shared -Wl,-install_name,$2 $3 -lc MAKESHARED=clang -o $1 -shared -Wl,-install_name,$2 $3 -lc
else else
......
lib/c/labcomm_compat_osx.h
+ 1
− 1
View file @ a5deb387
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include <mach/mach.h> #include <mach/mach.h>
#define CLOCK_REALTIME 0 #define CLOCK_REALTIME 0
static void clock_gettime(int garbage, struct timespec *ts) static inline void clock_gettime(int garbage, struct timespec *ts)
{ {
(void) garbage; (void) garbage;
clock_serv_t cclock; clock_serv_t cclock;
......
lib/c/liblabcomm.so deleted 100755 → 0
+ 1
− 1
View file @ 571541d7
INPUT(liblabcomm.so.1)
lib/c/liblabcomm.so 0 → 120000
+ 1
− 1
View file @ a5deb387
liblabcomm.so.1
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment