Skip to content

Feature/iphone #260

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Feature/iphone #260

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
15392c4
makefile
tatsuya-ogawa Apr 27, 2023
0e1b506
for arm
tatsuya-ogawa Apr 27, 2023
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
10 changes: 8 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 =
Expand Down
4 changes: 4 additions & 0 deletions Src/JPEG.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <jpeglib.h>
#include <jerror.h>
Expand Down
2 changes: 2 additions & 0 deletions Src/PoissonRecon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down