diff --git a/Makefile b/Makefile index f0d6c564..9b33ba3e 100644 --- a/Makefile +++ b/Makefile @@ -15,8 +15,11 @@ IS_SOURCE=ImageStitching.cpp AV_SOURCE=AdaptiveTreeVisualization.cpp CP_SOURCE=ChunkPLY.cpp +ifeq ($(shell uname -s),Darwin) +COMPILER ?= clang +else COMPILER ?= gcc -#COMPILER ?= clang +endif ifeq ($(COMPILER),gcc) CFLAGS += -fopenmp -Wno-deprecated -std=c++17 -pthread -Wno-invalid-offsetof @@ -30,8 +33,11 @@ else CFLAGS += -Wno-deprecated -std=c++17 -pthread -Wno-invalid-offsetof -Wno-dangling-else LFLAGS += -lstdc++ endif +ifeq ($(COMPILER),gcc) LFLAGS += -lz -lpng -ljpeg -#LFLAGS += -ljpeg -lmypng -lz +else +LFLAGS += -lmyjpg -lmypng -lz +endif CFLAGS_DEBUG = -DDEBUG -g3 LFLAGS_DEBUG = diff --git a/Src/JPEG.h b/Src/JPEG.h index ed98fbe7..9c4a9dfb 100644 --- a/Src/JPEG.h +++ b/Src/JPEG.h @@ -9,6 +9,10 @@ #include "JPEG/jpeglib.h" #include "JPEG/jerror.h" #include "JPEG/jmorecfg.h" +#elif defined(__APPLE__) +#include "JPEG/jpeglib.h" +#include "JPEG/jerror.h" +#include "JPEG/jmorecfg.h" #else // !_WIN32 #include #include diff --git a/Src/PoissonRecon.cpp b/Src/PoissonRecon.cpp index de3ce401..1071aefe 100644 --- a/Src/PoissonRecon.cpp +++ b/Src/PoissonRecon.cpp @@ -96,6 +96,8 @@ cmdLineParameter< int > MaxMemoryGB( "maxMemory" , 0 ) , #ifdef _OPENMP ParallelType( "parallel" , (int)ThreadPool::OPEN_MP ) , +#elif defined(__arm__) || defined(__aarch64__) + ParallelType( "parallel" , (int)ThreadPool::NONE) , #else // !_OPENMP ParallelType( "parallel" , (int)ThreadPool::THREAD_POOL ) , #endif // _OPENMP