From df52ecacecd2f1f1ef0feb1ba2349376a34a890f Mon Sep 17 00:00:00 2001 From: sida Date: Tue, 7 Jan 2020 12:22:17 -0500 Subject: [PATCH 1/2] use relative path so no need to do `make installusr` in the previous step --- _voxcad/voxelyzeMain/Makefile | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/_voxcad/voxelyzeMain/Makefile b/_voxcad/voxelyzeMain/Makefile index e09d978..0a2bfc2 100644 --- a/_voxcad/voxelyzeMain/Makefile +++ b/_voxcad/voxelyzeMain/Makefile @@ -2,11 +2,11 @@ LIBRARY_ROOT_PATH = $(HOME) VOXELYZE_VERSION = voxelyze.0.9 -VOXELYZE_LIB_NAME = lib$(VOXELYZE_VERSION).a -VOXELYZE_INC_PATH = $(LIBRARY_ROOT_PATH)/include/$(VOXELYZE_VERSION)/ +# VOXELYZE_LIB_NAME = lib$(VOXELYZE_VERSION).a +VOXELYZE_PATH = ../Voxelyze/ LIBRARY_INCLUDES = \ - -I$(VOXELYZE_INC_PATH) + -I$(VOXELYZE_PATH) @@ -37,7 +37,7 @@ CPPFLAGS= $(CFLAGS) LINK = \ - -L$(LIBRARY_ROOT_PATH)/lib -l$(VOXELYZE_VERSION) \ + -L$(VOXELYZE_PATH) -l$(VOXELYZE_VERSION) \ -lm -lstdc++ @@ -46,15 +46,14 @@ all: voxelyze -voxelyze: main.o $(LIBRARY_ROOT_PATH)/lib/lib$(VOXELYZE_VERSION).a +voxelyze: main.o $(CC) $(CFLAGS) main.o $(LINK) -o voxelyze main.o: main.cpp $(CC) $(CFLAGS) -c main.cpp -oa_ex1: main.o \ - $(LIBRARY_ROOT_PATH)/lib/lib$(OPTALG_VERSION).a +oa_ex1: main.o $(CC) $(CFLAGS) main.o $(LINK) -o oa_ex1 From 179b7bfc1f35691b64b5ce9621c58341208d9e88 Mon Sep 17 00:00:00 2001 From: sida Date: Tue, 7 Jan 2020 12:23:54 -0500 Subject: [PATCH 2/2] let voxelyzeMain use relative path so no need to do `make installusr` in this step --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 064dbbd..f3bec57 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,6 @@ Install the voxelyze library. cd Voxelyze make - make installusr cd ../voxelyzeMain/ make