Skip to content

Commit 9f917b9

Browse files
committed
Merge branch '290' into ODM
2 parents eea22ab + 97caa6d commit 9f917b9

File tree

3 files changed

+192
-14
lines changed

3 files changed

+192
-14
lines changed

Makefile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ LFLAGS_DEBUG =
5050

5151
#CFLAGS_RELEASE = -O3 -DRELEASE -funroll-loops -ffast-math -g
5252
#LFLAGS_RELEASE = -O3 -g
53-
CFLAGS_RELEASE = -O3 -DRELEASE -funroll-loops -ffast-math -g
54-
LFLAGS_RELEASE = -O3 -g
53+
CFLAGS_RELEASE = -O3 -DRELEASE -ffast-math -g0
54+
LFLAGS_RELEASE = -O3 -g0
5555

5656
SRC = Src/
5757
BIN = Bin/Linux/
@@ -210,13 +210,13 @@ clean:
210210
rm -rf $(RE_OBJECTS)
211211
rm -rf $(PTD_OBJECTS)
212212
rm -rf $(SN_OBJECTS)
213-
cd PNG && make clean
213+
cd PNG && $(MAKE) clean
214214

215215
make_dir:
216216
$(MD) -p $(BIN)
217217

218218
$(BIN)$(PR_TARGET): $(PR_OBJECTS)
219-
cd PNG && make COMPILER=$(COMPILER)
219+
cd PNG && $(MAKE) COMPILER=$(COMPILER)
220220
$(CXX) -pthread -o $@ $(PR_OBJECTS) -L$(BIN) $(LFLAGS) $(LFLAGS_IMG)
221221

222222
$(BIN)$(PRC_TARGET): $(PRC_OBJECTS)
@@ -226,11 +226,11 @@ $(BIN)$(PRS_TARGET): $(PRS_OBJECTS)
226226
$(CXX) -pthread -o $@ $(PRS_OBJECTS) -L$(BIN) -lboost_system $(LFLAGS)
227227

228228
$(BIN)$(SR_TARGET): $(SR_OBJECTS)
229-
cd PNG && make COMPILER=$(COMPILER)
229+
cd PNG && $(MAKE) COMPILER=$(COMPILER)
230230
$(CXX) -pthread -o $@ $(SR_OBJECTS) -L$(BIN) $(LFLAGS) $(LFLAGS_IMG)
231231

232232
$(BIN)$(PI_TARGET): $(PI_OBJECTS)
233-
cd PNG && make COMPILER=$(COMPILER)
233+
cd PNG && $(MAKE) COMPILER=$(COMPILER)
234234
$(CXX) -pthread -o $@ $(PI_OBJECTS) -L$(BIN) $(LFLAGS) $(LFLAGS_IMG)
235235

236236
$(BIN)$(ST_TARGET): $(ST_OBJECTS)
@@ -240,15 +240,15 @@ $(BIN)$(EH_TARGET): $(EH_OBJECTS)
240240
$(CXX) -pthread -o $@ $(EH_OBJECTS) $(LFLAGS)
241241

242242
$(BIN)$(IS_TARGET): $(IS_OBJECTS)
243-
cd PNG && make COMPILER=$(COMPILER)
243+
cd PNG && $(MAKE) COMPILER=$(COMPILER)
244244
$(CXX) -pthread -o $@ $(IS_OBJECTS) -L$(BIN) $(LFLAGS) $(LFLAGS_IMG)
245245

246246
$(BIN)$(AV_TARGET): $(AV_OBJECTS)
247-
cd PNG && make COMPILER=$(COMPILER)
247+
cd PNG && $(MAKE) COMPILER=$(COMPILER)
248248
$(CXX) -pthread -o $@ $(AV_OBJECTS) -L$(BIN) $(LFLAGS) $(LFLAGS_IMG)
249249

250250
$(BIN)$(CP_TARGET): $(CP_OBJECTS)
251-
cd PNG && make COMPILER=$(COMPILER)
251+
cd PNG && $(MAKE) COMPILER=$(COMPILER)
252252
$(CXX) -pthread -o $@ $(CP_OBJECTS) -L$(BIN) $(LFLAGS) $(LFLAGS_IMG)
253253

254254
$(BIN)$(RE_TARGET): $(RE_OBJECTS)

Makefile.macos

Lines changed: 173 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,173 @@
1+
PR_TARGET=PoissonRecon
2+
SR_TARGET=SSDRecon
3+
PI_TARGET=PointInterpolant
4+
ST_TARGET=SurfaceTrimmer
5+
EH_TARGET=EDTInHeat
6+
IS_TARGET=ImageStitching
7+
AV_TARGET=AdaptiveTreeVisualization
8+
CP_TARGET=ChunkPLY
9+
PR_SOURCE=PoissonRecon.cpp
10+
SR_SOURCE=SSDRecon.cpp
11+
PI_SOURCE=PointInterpolant.cpp
12+
ST_SOURCE=SurfaceTrimmer.cpp
13+
EH_SOURCE=EDTInHeat.cpp
14+
IS_SOURCE=ImageStitching.cpp
15+
AV_SOURCE=AdaptiveTreeVisualization.cpp
16+
CP_SOURCE=ChunkPLY.cpp
17+
18+
COMPILER ?= gcc
19+
CFLAGS += -fopenmp -Wno-deprecated -std=c++14 -pthread -Wno-invalid-offsetof
20+
LFLAGS += -lgomp -lstdc++ -lpthread -L/opt/homebrew/lib
21+
22+
CFLAGS_DEBUG = -DDEBUG -g3
23+
LFLAGS_DEBUG =
24+
25+
#CFLAGS_RELEASE = -O3 -DRELEASE -funroll-loops -ffast-math -g
26+
#LFLAGS_RELEASE = -O3 -g
27+
CFLAGS_RELEASE = -O3 -DRELEASE -ffast-math -g0
28+
LFLAGS_RELEASE = -O3 -g0
29+
30+
SRC = Src/
31+
BIN = Bin/Linux/
32+
#INCLUDE = /usr/include/
33+
INCLUDE = . -I/opt/homebrew/include
34+
35+
CC=gcc
36+
CXX=$(COMPILER)
37+
38+
39+
MD=mkdir
40+
41+
PR_OBJECTS=$(addprefix $(BIN), $(addsuffix .o, $(basename $(PR_SOURCE))))
42+
SR_OBJECTS=$(addprefix $(BIN), $(addsuffix .o, $(basename $(SR_SOURCE))))
43+
PI_OBJECTS=$(addprefix $(BIN), $(addsuffix .o, $(basename $(PI_SOURCE))))
44+
ST_OBJECTS=$(addprefix $(BIN), $(addsuffix .o, $(basename $(ST_SOURCE))))
45+
EH_OBJECTS=$(addprefix $(BIN), $(addsuffix .o, $(basename $(EH_SOURCE))))
46+
IS_OBJECTS=$(addprefix $(BIN), $(addsuffix .o, $(basename $(IS_SOURCE))))
47+
AV_OBJECTS=$(addprefix $(BIN), $(addsuffix .o, $(basename $(AV_SOURCE))))
48+
CP_OBJECTS=$(addprefix $(BIN), $(addsuffix .o, $(basename $(CP_SOURCE))))
49+
50+
51+
all: CFLAGS += $(CFLAGS_RELEASE)
52+
all: LFLAGS += $(LFLAGS_RELEASE)
53+
all: make_dir
54+
all: $(BIN)$(PR_TARGET)
55+
all: $(BIN)$(SR_TARGET)
56+
all: $(BIN)$(PI_TARGET)
57+
all: $(BIN)$(ST_TARGET)
58+
all: $(BIN)$(EH_TARGET)
59+
all: $(BIN)$(IS_TARGET)
60+
all: $(BIN)$(AV_TARGET)
61+
all: $(BIN)$(CP_TARGET)
62+
63+
debug: CFLAGS += $(CFLAGS_DEBUG)
64+
debug: LFLAGS += $(LFLAGS_DEBUG)
65+
debug: make_dir
66+
debug: $(BIN)$(PR_TARGET)
67+
debug: $(BIN)$(SR_TARGET)
68+
debug: $(BIN)$(PI_TARGET)
69+
debug: $(BIN)$(ST_TARGET)
70+
debug: $(BIN)$(EH_TARGET)
71+
debug: $(BIN)$(IS_TARGET)
72+
debug: $(BIN)$(AV_TARGET)
73+
debug: $(BIN)$(CP_TARGET)
74+
75+
poissonrecon: CFLAGS += $(CFLAGS_RELEASE)
76+
poissonrecon: LFLAGS += $(LFLAGS_RELEASE)
77+
poissonrecon: make_dir
78+
poissonrecon: $(BIN)$(PR_TARGET)
79+
80+
ssdrecon: CFLAGS += $(CFLAGS_RELEASE)
81+
ssdrecon: LFLAGS += $(LFLAGS_RELEASE)
82+
ssdrecon: make_dir
83+
ssdrecon: $(BIN)$(SR_TARGET)
84+
85+
pointinterpolant: CFLAGS += $(CFLAGS_RELEASE)
86+
pointinterpolant: LFLAGS += $(LFLAGS_RELEASE)
87+
pointinterpolant: make_dir
88+
pointinterpolant: $(BIN)$(PI_TARGET)
89+
90+
surfacetrimmer: CFLAGS += $(CFLAGS_RELEASE)
91+
surfacetrimmer: LFLAGS += $(LFLAGS_RELEASE)
92+
surfacetrimmer: make_dir
93+
surfacetrimmer: $(BIN)$(ST_TARGET)
94+
95+
edtinheat: CFLAGS += $(CFLAGS_RELEASE)
96+
edtinheat: LFLAGS += $(LFLAGS_RELEASE)
97+
edtinheat: make_dir
98+
edtinheat: $(BIN)$(EH_TARGET)
99+
100+
imagestitching: CFLAGS += $(CFLAGS_RELEASE)
101+
imagestitching: LFLAGS += $(LFLAGS_RELEASE)
102+
imagestitching: make_dir
103+
imagestitching: $(BIN)$(IS_TARGET)
104+
105+
octreevisualization: CFLAGS += $(CFLAGS_RELEASE)
106+
octreevisualization: LFLAGS += $(LFLAGS_RELEASE)
107+
octreevisualization: make_dir
108+
octreevisualization: $(BIN)$(AV_TARGET)
109+
110+
chunkply: CFLAGS += $(CFLAGS_RELEASE)
111+
chunkply: LFLAGS += $(LFLAGS_RELEASE)
112+
chunkply: make_dir
113+
chunkply: $(BIN)$(CP_TARGET)
114+
115+
clean:
116+
rm -rf $(BIN)$(PR_TARGET)
117+
rm -rf $(BIN)$(SR_TARGET)
118+
rm -rf $(BIN)$(PI_TARGET)
119+
rm -rf $(BIN)$(ST_TARGET)
120+
rm -rf $(BIN)$(EH_TARGET)
121+
rm -rf $(BIN)$(IS_TARGET)
122+
rm -rf $(BIN)$(AV_TARGET)
123+
rm -rf $(BIN)$(CP_TARGET)
124+
rm -rf $(PR_OBJECTS)
125+
rm -rf $(SR_OBJECTS)
126+
rm -rf $(PI_OBJECTS)
127+
rm -rf $(ST_OBJECTS)
128+
rm -rf $(EH_OBJECTS)
129+
rm -rf $(IS_OBJECTS)
130+
rm -rf $(AV_OBJECTS)
131+
rm -rf $(CP_OBJECTS)
132+
cd PNG && $(MAKE) clean
133+
134+
135+
make_dir:
136+
$(MD) -p $(BIN)
137+
138+
$(BIN)$(PR_TARGET): $(PR_OBJECTS)
139+
cd PNG && $(MAKE) COMPILER=$(COMPILER)
140+
$(CXX) -pthread -o $@ $(PR_OBJECTS) -L$(BIN) $(LFLAGS) -ljpeg -lmypng -lz
141+
142+
$(BIN)$(SR_TARGET): $(SR_OBJECTS)
143+
cd PNG && $(MAKE) COMPILER=$(COMPILER)
144+
$(CXX) -pthread -o $@ $(SR_OBJECTS) -L$(BIN) $(LFLAGS) -ljpeg -lmypng -lz
145+
146+
$(BIN)$(PI_TARGET): $(PI_OBJECTS)
147+
cd PNG && $(MAKE) COMPILER=$(COMPILER)
148+
$(CXX) -pthread -o $@ $(PI_OBJECTS) -L$(BIN) $(LFLAGS) -ljpeg -lmypng -lz
149+
150+
$(BIN)$(ST_TARGET): $(ST_OBJECTS)
151+
$(CXX) -pthread -o $@ $(ST_OBJECTS) $(LFLAGS)
152+
153+
$(BIN)$(EH_TARGET): $(EH_OBJECTS)
154+
$(CXX) -pthread -o $@ $(EH_OBJECTS) $(LFLAGS)
155+
156+
$(BIN)$(IS_TARGET): $(IS_OBJECTS)
157+
cd PNG && $(MAKE) COMPILER=$(COMPILER)
158+
$(CXX) -pthread -o $@ $(IS_OBJECTS) -L$(BIN) $(LFLAGS) -ljpeg -lmypng -lz
159+
160+
$(BIN)$(AV_TARGET): $(AV_OBJECTS)
161+
cd PNG && $(MAKE) COMPILER=$(COMPILER)
162+
$(CXX) -pthread -o $@ $(AV_OBJECTS) -L$(BIN) $(LFLAGS) -ljpeg -lmypng -lz
163+
164+
$(BIN)$(CP_TARGET): $(CP_OBJECTS)
165+
cd PNG && $(MAKE) COMPILER=$(COMPILER)
166+
$(CXX) -pthread -o $@ $(CP_OBJECTS) -L$(BIN) $(LFLAGS) -ljpeg -lmypng -lz
167+
168+
$(BIN)%.o: $(SRC)%.c
169+
$(CC) -c -o $@ -I$(INCLUDE) $<
170+
171+
$(BIN)%.o: $(SRC)%.cpp
172+
$(CXX) -c -o $@ $(CFLAGS) -I$(INCLUDE) $<
173+

PoissonRecon.vcxproj

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
8484
<ClCompile>
8585
<Optimization>Disabled</Optimization>
86-
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
86+
<PreprocessorDefinitions>NOMINMAX;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8787
<MinimalRebuild>true</MinimalRebuild>
8888
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
8989
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -107,7 +107,7 @@
107107
</Midl>
108108
<ClCompile>
109109
<Optimization>Disabled</Optimization>
110-
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
110+
<PreprocessorDefinitions>NOMINMAX;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
111111
<MinimalRebuild>true</MinimalRebuild>
112112
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
113113
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -127,14 +127,14 @@
127127
</ItemDefinitionGroup>
128128
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
129129
<ClCompile>
130-
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
130+
<PreprocessorDefinitions>NOMINMAX;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
131131
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
132132
<PrecompiledHeader>
133133
</PrecompiledHeader>
134134
<WarningLevel>Level3</WarningLevel>
135135
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
136136
<OpenMPSupport>true</OpenMPSupport>
137-
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
137+
<AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
138138
</ClCompile>
139139
<Link>
140140
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -164,7 +164,7 @@
164164
<FloatingPointModel>Precise</FloatingPointModel>
165165
<OpenMPSupport>true</OpenMPSupport>
166166
<IntrinsicFunctions>false</IntrinsicFunctions>
167-
<EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
167+
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
168168
<AdditionalOptions>
169169
</AdditionalOptions>
170170
<ConformanceMode>true</ConformanceMode>
@@ -189,6 +189,11 @@
189189
<ItemGroup>
190190
<ClCompile Include="Src\PoissonRecon.cpp" />
191191
</ItemGroup>
192+
<ItemGroup>
193+
<ProjectReference Include="ZLIB.vcxproj" />
194+
<ProjectReference Include="PNG.vcxproj" />
195+
<ProjectReference Include="JPEG.vcxproj" />
196+
</ItemGroup>
192197
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
193198
<ImportGroup Label="ExtensionTargets">
194199
</ImportGroup>

0 commit comments

Comments
 (0)