aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile17
-rw-r--r--lib/darwin/find-syms.c (renamed from lib/find-syms.c)0
-rw-r--r--lib/darwin/interpose.c (renamed from lib/interpose.c)0
-rw-r--r--lib/darwin/objc-asm.S (renamed from lib/objc-asm.S)0
-rw-r--r--lib/darwin/objc.c (renamed from lib/objc.c)0
-rw-r--r--lib/darwin/objc.h (renamed from lib/objc.h)0
-rw-r--r--lib/darwin/substrate-compat.c (renamed from lib/substrate-compat.c)0
-rw-r--r--test/test-imp-forwarding.m2
8 files changed, 10 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 4004dfd..d8d5cdf 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,10 @@
# todo
CC := clang
CXX := clang++
-CFLAGS := -O3 -Wall -Wextra -Werror -arch x86_64
-override CC := $(CC) $(CFLAGS)
-override CXX := $(CXX) $(CFLAGS) -fno-exceptions -fno-asynchronous-unwind-tables
+ARCH := -arch x86_64
+XCFLAGS := -O3 -Wall -Wextra -Werror -Ilib $(ARCH)
+override CC := $(CC) $(XCFLAGS) $(CFLAGS)
+override CXX := $(CXX) $(XCFLAGS) $(CFLAGS) -fno-exceptions -fno-asynchronous-unwind-tables
LIB_LDFLAGS := -lobjc -dynamiclib -fvisibility=hidden
IMAON2 := /Users/comex/c/imaon2
GEN_JS := node --harmony --harmony_arrow_functions $(IMAON2)/tables/gen.js
@@ -36,11 +37,11 @@ out/jump-dis.o: $(GENERATED)
out/transform-dis.o: $(GENERATED)
LIB_OBJS := \
- out/find-syms.o \
- out/interpose.o \
- out/objc.o \
- out/objc-asm.o \
- out/substrate-compat.o \
+ out/darwin/find-syms.o \
+ out/darwin/interpose.o \
+ out/darwin/objc-asm.o \
+ out/darwin/objc.o \
+ out/darwin/substrate-compat.o \
out/jump-dis.o \
out/transform-dis.o
diff --git a/lib/find-syms.c b/lib/darwin/find-syms.c
index 44adf78..44adf78 100644
--- a/lib/find-syms.c
+++ b/lib/darwin/find-syms.c
diff --git a/lib/interpose.c b/lib/darwin/interpose.c
index 06a357f..06a357f 100644
--- a/lib/interpose.c
+++ b/lib/darwin/interpose.c
diff --git a/lib/objc-asm.S b/lib/darwin/objc-asm.S
index bebce80..bebce80 100644
--- a/lib/objc-asm.S
+++ b/lib/darwin/objc-asm.S
diff --git a/lib/objc.c b/lib/darwin/objc.c
index 398e3e7..398e3e7 100644
--- a/lib/objc.c
+++ b/lib/darwin/objc.c
diff --git a/lib/objc.h b/lib/darwin/objc.h
index 9628c35..9628c35 100644
--- a/lib/objc.h
+++ b/lib/darwin/objc.h
diff --git a/lib/substrate-compat.c b/lib/darwin/substrate-compat.c
index 3658ac7..3658ac7 100644
--- a/lib/substrate-compat.c
+++ b/lib/darwin/substrate-compat.c
diff --git a/test/test-imp-forwarding.m b/test/test-imp-forwarding.m
index 98898e1..94f0d36 100644
--- a/test/test-imp-forwarding.m
+++ b/test/test-imp-forwarding.m
@@ -1,4 +1,4 @@
-#include "../lib/objc.c"
+#include "../lib/darwin/objc.c"
#include <objc/runtime.h>
#include <stdio.h>
#include <assert.h>