Skip to content

edit Makefiles for voxelyzeMain so make the README one step easier #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
liusida wants to merge 2 commits into
base: master
Choose a base branch
from
Open

edit Makefiles for voxelyzeMain so make the README one step easier #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df52eca
use relative path so no need to do `make installusr` in the previous …
Jan 7, 2020
179b7bf
let voxelyzeMain use relative path so no need to do `make installusr`…
Jan 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ Install the voxelyze library.

cd Voxelyze
make
make installusr
cd ../voxelyzeMain/
make

Expand Down
13 changes: 6 additions & 7 deletions _voxcad/voxelyzeMain/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)



Expand Down Expand Up @@ -37,7 +37,7 @@ CPPFLAGS= $(CFLAGS)


LINK = \
-L$(LIBRARY_ROOT_PATH)/lib -l$(VOXELYZE_VERSION) \
-L$(VOXELYZE_PATH) -l$(VOXELYZE_VERSION) \
-lm -lstdc++


Expand All @@ -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


Expand Down