diff --git a/Makefile b/Makefile index edc0a33..72d9f3a 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ CC=gcc CXX=g++ -CFLAGS=-Wall -Wextra +CFLAGS=-Wall -Wextra -fno-sanitize=address +LD_FLAGS=-fno-sanitize=address TARGET=libcarbon.so BASE_PATH=./src/main/org/neoflock/NeoNucleus @@ -18,7 +19,7 @@ all: java $(TARGET) $(TARGET): $(OBJS) $(CXX) -shared -o ${BASE_NPATH}/$(TARGET) \ - $(OBJS) ${BASE_NPATH}/libneonucleus.a $(TLA_PATH)/libtla.a -lc + $(OBJS) ${BASE_NPATH}/libneonucleus.a $(TLA_PATH)/libtla.a -lc $(LD_FLAGS) %.o: %.cpp $(CXX) -c -fPIC -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux $(CFLAGS) \ $< -o $@ diff --git a/NeoNucleus b/NeoNucleus index 3b04fd4..7c086f6 160000 --- a/NeoNucleus +++ b/NeoNucleus @@ -1 +1 @@ -Subproject commit 3b04fd45c7695ae007d6aed4dfda1f0063a32952 +Subproject commit 7c086f6b8eaae7a9009f2aab02efc070b99456ef diff --git a/README.md b/README.md index ea2c9c7..bbca66d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # Carbon Hydrogen NeoNucleus JNI bindings. ### Dev Setup Notes -Java expects libcarbon.so on the src/native directory. This is the default unless you're not using the Makefile. \ No newline at end of file +Java expects libcarbon.so on the src/native directory. This is the default unless you're not using the Makefile. Make *sure* to build NeoNucleus with `make lib MODE=release`, and place the libneonucleus.a on src/native. \ No newline at end of file