diff --git a/Makefile b/Makefile index 4c91985..93fef64 100644 --- a/Makefile +++ b/Makefile @@ -50,8 +50,8 @@ LFLAGS_DEBUG = #CFLAGS_RELEASE = -O3 -DRELEASE -funroll-loops -ffast-math -g #LFLAGS_RELEASE = -O3 -g -CFLAGS_RELEASE = -O3 -DRELEASE -funroll-loops -ffast-math -g -LFLAGS_RELEASE = -O3 -g +CFLAGS_RELEASE = -O3 -DRELEASE -ffast-math -g0 +LFLAGS_RELEASE = -O3 -g0 SRC = Src/ BIN = Bin/Linux/ @@ -210,13 +210,13 @@ clean: rm -rf $(RE_OBJECTS) rm -rf $(PTD_OBJECTS) rm -rf $(SN_OBJECTS) - cd PNG && make clean + cd PNG && $(MAKE) clean make_dir: $(MD) -p $(BIN) $(BIN)$(PR_TARGET): $(PR_OBJECTS) - cd PNG && make COMPILER=$(COMPILER) + cd PNG && $(MAKE) COMPILER=$(COMPILER) $(CXX) -pthread -o $@ $(PR_OBJECTS) -L$(BIN) $(LFLAGS) $(LFLAGS_IMG) $(BIN)$(PRC_TARGET): $(PRC_OBJECTS) @@ -226,11 +226,11 @@ $(BIN)$(PRS_TARGET): $(PRS_OBJECTS) $(CXX) -pthread -o $@ $(PRS_OBJECTS) -L$(BIN) -lboost_system $(LFLAGS) $(BIN)$(SR_TARGET): $(SR_OBJECTS) - cd PNG && make COMPILER=$(COMPILER) + cd PNG && $(MAKE) COMPILER=$(COMPILER) $(CXX) -pthread -o $@ $(SR_OBJECTS) -L$(BIN) $(LFLAGS) $(LFLAGS_IMG) $(BIN)$(PI_TARGET): $(PI_OBJECTS) - cd PNG && make COMPILER=$(COMPILER) + cd PNG && $(MAKE) COMPILER=$(COMPILER) $(CXX) -pthread -o $@ $(PI_OBJECTS) -L$(BIN) $(LFLAGS) $(LFLAGS_IMG) $(BIN)$(ST_TARGET): $(ST_OBJECTS) @@ -240,15 +240,15 @@ $(BIN)$(EH_TARGET): $(EH_OBJECTS) $(CXX) -pthread -o $@ $(EH_OBJECTS) $(LFLAGS) $(BIN)$(IS_TARGET): $(IS_OBJECTS) - cd PNG && make COMPILER=$(COMPILER) + cd PNG && $(MAKE) COMPILER=$(COMPILER) $(CXX) -pthread -o $@ $(IS_OBJECTS) -L$(BIN) $(LFLAGS) $(LFLAGS_IMG) $(BIN)$(AV_TARGET): $(AV_OBJECTS) - cd PNG && make COMPILER=$(COMPILER) + cd PNG && $(MAKE) COMPILER=$(COMPILER) $(CXX) -pthread -o $@ $(AV_OBJECTS) -L$(BIN) $(LFLAGS) $(LFLAGS_IMG) $(BIN)$(CP_TARGET): $(CP_OBJECTS) - cd PNG && make COMPILER=$(COMPILER) + cd PNG && $(MAKE) COMPILER=$(COMPILER) $(CXX) -pthread -o $@ $(CP_OBJECTS) -L$(BIN) $(LFLAGS) $(LFLAGS_IMG) $(BIN)$(RE_TARGET): $(RE_OBJECTS) diff --git a/Makefile.macos b/Makefile.macos new file mode 100644 index 0000000..e99ca4a --- /dev/null +++ b/Makefile.macos @@ -0,0 +1,173 @@ +PR_TARGET=PoissonRecon +SR_TARGET=SSDRecon +PI_TARGET=PointInterpolant +ST_TARGET=SurfaceTrimmer +EH_TARGET=EDTInHeat +IS_TARGET=ImageStitching +AV_TARGET=AdaptiveTreeVisualization +CP_TARGET=ChunkPLY +PR_SOURCE=PoissonRecon.cpp +SR_SOURCE=SSDRecon.cpp +PI_SOURCE=PointInterpolant.cpp +ST_SOURCE=SurfaceTrimmer.cpp +EH_SOURCE=EDTInHeat.cpp +IS_SOURCE=ImageStitching.cpp +AV_SOURCE=AdaptiveTreeVisualization.cpp +CP_SOURCE=ChunkPLY.cpp + +COMPILER ?= gcc +CFLAGS += -fopenmp -Wno-deprecated -std=c++14 -pthread -Wno-invalid-offsetof +LFLAGS += -lgomp -lstdc++ -lpthread -L/opt/homebrew/lib + +CFLAGS_DEBUG = -DDEBUG -g3 +LFLAGS_DEBUG = + +#CFLAGS_RELEASE = -O3 -DRELEASE -funroll-loops -ffast-math -g +#LFLAGS_RELEASE = -O3 -g +CFLAGS_RELEASE = -O3 -DRELEASE -ffast-math -g0 +LFLAGS_RELEASE = -O3 -g0 + +SRC = Src/ +BIN = Bin/Linux/ +#INCLUDE = /usr/include/ +INCLUDE = . -I/opt/homebrew/include + +CC=gcc +CXX=$(COMPILER) + + +MD=mkdir + +PR_OBJECTS=$(addprefix $(BIN), $(addsuffix .o, $(basename $(PR_SOURCE)))) +SR_OBJECTS=$(addprefix $(BIN), $(addsuffix .o, $(basename $(SR_SOURCE)))) +PI_OBJECTS=$(addprefix $(BIN), $(addsuffix .o, $(basename $(PI_SOURCE)))) +ST_OBJECTS=$(addprefix $(BIN), $(addsuffix .o, $(basename $(ST_SOURCE)))) +EH_OBJECTS=$(addprefix $(BIN), $(addsuffix .o, $(basename $(EH_SOURCE)))) +IS_OBJECTS=$(addprefix $(BIN), $(addsuffix .o, $(basename $(IS_SOURCE)))) +AV_OBJECTS=$(addprefix $(BIN), $(addsuffix .o, $(basename $(AV_SOURCE)))) +CP_OBJECTS=$(addprefix $(BIN), $(addsuffix .o, $(basename $(CP_SOURCE)))) + + +all: CFLAGS += $(CFLAGS_RELEASE) +all: LFLAGS += $(LFLAGS_RELEASE) +all: make_dir +all: $(BIN)$(PR_TARGET) +all: $(BIN)$(SR_TARGET) +all: $(BIN)$(PI_TARGET) +all: $(BIN)$(ST_TARGET) +all: $(BIN)$(EH_TARGET) +all: $(BIN)$(IS_TARGET) +all: $(BIN)$(AV_TARGET) +all: $(BIN)$(CP_TARGET) + +debug: CFLAGS += $(CFLAGS_DEBUG) +debug: LFLAGS += $(LFLAGS_DEBUG) +debug: make_dir +debug: $(BIN)$(PR_TARGET) +debug: $(BIN)$(SR_TARGET) +debug: $(BIN)$(PI_TARGET) +debug: $(BIN)$(ST_TARGET) +debug: $(BIN)$(EH_TARGET) +debug: $(BIN)$(IS_TARGET) +debug: $(BIN)$(AV_TARGET) +debug: $(BIN)$(CP_TARGET) + +poissonrecon: CFLAGS += $(CFLAGS_RELEASE) +poissonrecon: LFLAGS += $(LFLAGS_RELEASE) +poissonrecon: make_dir +poissonrecon: $(BIN)$(PR_TARGET) + +ssdrecon: CFLAGS += $(CFLAGS_RELEASE) +ssdrecon: LFLAGS += $(LFLAGS_RELEASE) +ssdrecon: make_dir +ssdrecon: $(BIN)$(SR_TARGET) + +pointinterpolant: CFLAGS += $(CFLAGS_RELEASE) +pointinterpolant: LFLAGS += $(LFLAGS_RELEASE) +pointinterpolant: make_dir +pointinterpolant: $(BIN)$(PI_TARGET) + +surfacetrimmer: CFLAGS += $(CFLAGS_RELEASE) +surfacetrimmer: LFLAGS += $(LFLAGS_RELEASE) +surfacetrimmer: make_dir +surfacetrimmer: $(BIN)$(ST_TARGET) + +edtinheat: CFLAGS += $(CFLAGS_RELEASE) +edtinheat: LFLAGS += $(LFLAGS_RELEASE) +edtinheat: make_dir +edtinheat: $(BIN)$(EH_TARGET) + +imagestitching: CFLAGS += $(CFLAGS_RELEASE) +imagestitching: LFLAGS += $(LFLAGS_RELEASE) +imagestitching: make_dir +imagestitching: $(BIN)$(IS_TARGET) + +octreevisualization: CFLAGS += $(CFLAGS_RELEASE) +octreevisualization: LFLAGS += $(LFLAGS_RELEASE) +octreevisualization: make_dir +octreevisualization: $(BIN)$(AV_TARGET) + +chunkply: CFLAGS += $(CFLAGS_RELEASE) +chunkply: LFLAGS += $(LFLAGS_RELEASE) +chunkply: make_dir +chunkply: $(BIN)$(CP_TARGET) + +clean: + rm -rf $(BIN)$(PR_TARGET) + rm -rf $(BIN)$(SR_TARGET) + rm -rf $(BIN)$(PI_TARGET) + rm -rf $(BIN)$(ST_TARGET) + rm -rf $(BIN)$(EH_TARGET) + rm -rf $(BIN)$(IS_TARGET) + rm -rf $(BIN)$(AV_TARGET) + rm -rf $(BIN)$(CP_TARGET) + rm -rf $(PR_OBJECTS) + rm -rf $(SR_OBJECTS) + rm -rf $(PI_OBJECTS) + rm -rf $(ST_OBJECTS) + rm -rf $(EH_OBJECTS) + rm -rf $(IS_OBJECTS) + rm -rf $(AV_OBJECTS) + rm -rf $(CP_OBJECTS) + cd PNG && $(MAKE) clean + + +make_dir: + $(MD) -p $(BIN) + +$(BIN)$(PR_TARGET): $(PR_OBJECTS) + cd PNG && $(MAKE) COMPILER=$(COMPILER) + $(CXX) -pthread -o $@ $(PR_OBJECTS) -L$(BIN) $(LFLAGS) -ljpeg -lmypng -lz + +$(BIN)$(SR_TARGET): $(SR_OBJECTS) + cd PNG && $(MAKE) COMPILER=$(COMPILER) + $(CXX) -pthread -o $@ $(SR_OBJECTS) -L$(BIN) $(LFLAGS) -ljpeg -lmypng -lz + +$(BIN)$(PI_TARGET): $(PI_OBJECTS) + cd PNG && $(MAKE) COMPILER=$(COMPILER) + $(CXX) -pthread -o $@ $(PI_OBJECTS) -L$(BIN) $(LFLAGS) -ljpeg -lmypng -lz + +$(BIN)$(ST_TARGET): $(ST_OBJECTS) + $(CXX) -pthread -o $@ $(ST_OBJECTS) $(LFLAGS) + +$(BIN)$(EH_TARGET): $(EH_OBJECTS) + $(CXX) -pthread -o $@ $(EH_OBJECTS) $(LFLAGS) + +$(BIN)$(IS_TARGET): $(IS_OBJECTS) + cd PNG && $(MAKE) COMPILER=$(COMPILER) + $(CXX) -pthread -o $@ $(IS_OBJECTS) -L$(BIN) $(LFLAGS) -ljpeg -lmypng -lz + +$(BIN)$(AV_TARGET): $(AV_OBJECTS) + cd PNG && $(MAKE) COMPILER=$(COMPILER) + $(CXX) -pthread -o $@ $(AV_OBJECTS) -L$(BIN) $(LFLAGS) -ljpeg -lmypng -lz + +$(BIN)$(CP_TARGET): $(CP_OBJECTS) + cd PNG && $(MAKE) COMPILER=$(COMPILER) + $(CXX) -pthread -o $@ $(CP_OBJECTS) -L$(BIN) $(LFLAGS) -ljpeg -lmypng -lz + +$(BIN)%.o: $(SRC)%.c + $(CC) -c -o $@ -I$(INCLUDE) $< + +$(BIN)%.o: $(SRC)%.cpp + $(CXX) -c -o $@ $(CFLAGS) -I$(INCLUDE) $< + diff --git a/PoissonRecon.vcxproj b/PoissonRecon.vcxproj index 7c3c45c..260e804 100644 --- a/PoissonRecon.vcxproj +++ b/PoissonRecon.vcxproj @@ -83,7 +83,7 @@ Disabled - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + NOMINMAX;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -107,7 +107,7 @@ Disabled - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + NOMINMAX;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -127,14 +127,14 @@ - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + NOMINMAX;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreadedDLL Level3 ProgramDatabase true - %(AdditionalIncludeDirectories) + .;%(AdditionalIncludeDirectories) true @@ -164,7 +164,7 @@ Precise true false - AdvancedVectorExtensions2 + StreamingSIMDExtensions2 true @@ -189,6 +189,11 @@ + + + + +