Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Rename .c -> .cpp: all source files were already compiled as C++,
# this commit just makes the extensions reflect that.
79a6590f
2 changes: 1 addition & 1 deletion linux/build_makefile_inc.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
objects = None

for f in files:
match = re.match(r'(.*)\.c(pp)?$',f)
match = re.match(r'(.*)\.cpp$',f)
if match:
file = join(fbase,match.group(1)+'.o')
module = file.split(os.path.sep)[1]
Expand Down
6 changes: 1 addition & 5 deletions linux/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -174,10 +174,6 @@ $(OBJ)/%.o: $(SRCDIR)/%.cpp
@echo Compiling $<...
$(CC) $(CCFLAGS) -c $< -o $@

$(OBJ)/%.o: $(SRCDIR)/%.c
@mkdir -p `dirname $@`
@echo Compiling $<...
$(CC) $(CCFLAGS) -c $< -o $@

$(SNAPEXE): $(SNAPLIB) $(SNAPOBJS)
@mkdir -p `dirname $@`
Expand Down Expand Up @@ -286,5 +282,5 @@ testblt:
mkdir -p test
rm -rf test/*
cd test; \
source="../$(SRCDIR)/snaplib/util/bltmatrx.c ../$(SRCDIR)/snaplib/util/symmatrx.c ../$(SRCDIR)/snaplib/util/chkalloc.c ../$(SRCDIR)/snaplib/util/progress.c ../$(SRCDIR)/snaplib/util/errdef.c"; \
source="../$(SRCDIR)/snaplib/util/bltmatrx.cpp ../$(SRCDIR)/snaplib/util/symmatrx.cpp ../$(SRCDIR)/snaplib/util/chkalloc.cpp ../$(SRCDIR)/snaplib/util/progress.cpp ../$(SRCDIR)/snaplib/util/errdef.cpp"; \
$(CC) -D TESTBLT -I ../$(SRCDIR)/snaplib $$source $(LDFLAGS) -o testblt
2 changes: 1 addition & 1 deletion ms/projects/concord/concord.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\src\concord\concord.c" />
<ClCompile Include="..\..\..\src\concord\concord.cpp" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\snaplib\snaplib.vcxproj">
Expand Down
2 changes: 1 addition & 1 deletion ms/projects/dat2site/dat2site.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\src\dat2site\dat2site.c" />
<ClCompile Include="..\..\..\src\dat2site\dat2site.cpp" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\snaplib\snaplib.vcxproj">
Expand Down
2 changes: 1 addition & 1 deletion ms/projects/site2gps/site2gps.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\src\site2gps\site2gps.c" />
<ClCompile Include="..\..\..\src\site2gps\site2gps.cpp" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\snaplib\snaplib.vcxproj">
Expand Down
50 changes: 25 additions & 25 deletions ms/projects/snap/snap.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -112,31 +112,31 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\src\snap\adjparam.c" />
<ClCompile Include="..\..\..\src\snap\autofix.c" />
<ClCompile Include="..\..\..\src\snap\bindata2.c" />
<ClCompile Include="..\..\..\src\snap\coefs.c" />
<ClCompile Include="..\..\..\src\snap\control.c" />
<ClCompile Include="..\..\..\src\snap\csdeform.c" />
<ClCompile Include="..\..\..\src\snap\cvrfile.c" />
<ClCompile Include="..\..\..\src\snap\grddeform.c" />
<ClCompile Include="..\..\..\src\snap\lnzdeform.c" />
<ClCompile Include="..\..\..\src\snap\loadsnap.c" />
<ClCompile Include="..\..\..\src\snap\main.c" />
<ClCompile Include="..\..\..\src\snap\notedata.c" />
<ClCompile Include="..\..\..\src\snap\obsdata.c" />
<ClCompile Include="..\..\..\src\snap\output.c" />
<ClCompile Include="..\..\..\src\snap\pntdata.c" />
<ClCompile Include="..\..\..\src\snap\relerror.c" />
<ClCompile Include="..\..\..\src\snap\reorder.c" />
<ClCompile Include="..\..\..\src\snap\residual.c" />
<ClCompile Include="..\..\..\src\snap\ressumry.c" />
<ClCompile Include="..\..\..\src\snap\rftrnadj.c" />
<ClCompile Include="..\..\..\src\snap\snapmain.c" />
<ClCompile Include="..\..\..\src\snap\sortobs.c" />
<ClCompile Include="..\..\..\src\snap\stnobseq.c" />
<ClCompile Include="..\..\..\src\snap\testspec.c" />
<ClCompile Include="..\..\..\src\snap\vecdata.c" />
<ClCompile Include="..\..\..\src\snap\adjparam.cpp" />
<ClCompile Include="..\..\..\src\snap\autofix.cpp" />
<ClCompile Include="..\..\..\src\snap\bindata2.cpp" />
<ClCompile Include="..\..\..\src\snap\coefs.cpp" />
<ClCompile Include="..\..\..\src\snap\control.cpp" />
<ClCompile Include="..\..\..\src\snap\csdeform.cpp" />
<ClCompile Include="..\..\..\src\snap\cvrfile.cpp" />
<ClCompile Include="..\..\..\src\snap\grddeform.cpp" />
<ClCompile Include="..\..\..\src\snap\lnzdeform.cpp" />
<ClCompile Include="..\..\..\src\snap\loadsnap.cpp" />
<ClCompile Include="..\..\..\src\snap\main.cpp" />
<ClCompile Include="..\..\..\src\snap\notedata.cpp" />
<ClCompile Include="..\..\..\src\snap\obsdata.cpp" />
<ClCompile Include="..\..\..\src\snap\output.cpp" />
<ClCompile Include="..\..\..\src\snap\pntdata.cpp" />
<ClCompile Include="..\..\..\src\snap\relerror.cpp" />
<ClCompile Include="..\..\..\src\snap\reorder.cpp" />
<ClCompile Include="..\..\..\src\snap\residual.cpp" />
<ClCompile Include="..\..\..\src\snap\ressumry.cpp" />
<ClCompile Include="..\..\..\src\snap\rftrnadj.cpp" />
<ClCompile Include="..\..\..\src\snap\snapmain.cpp" />
<ClCompile Include="..\..\..\src\snap\sortobs.cpp" />
<ClCompile Include="..\..\..\src\snap\stnobseq.cpp" />
<ClCompile Include="..\..\..\src\snap\testspec.cpp" />
<ClCompile Include="..\..\..\src\snap\vecdata.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\src\snap\adjparam.h" />
Expand Down
48 changes: 24 additions & 24 deletions ms/projects/snapadjust/snapadjust.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -118,31 +118,31 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\src\snap\adjparam.c" />
<ClCompile Include="..\..\..\src\snap\autofix.c" />
<ClCompile Include="..\..\..\src\snap\bindata2.c" />
<ClCompile Include="..\..\..\src\snap\coefs.c" />
<ClCompile Include="..\..\..\src\snap\control.c" />
<ClCompile Include="..\..\..\src\snap\csdeform.c" />
<ClCompile Include="..\..\..\src\snap\cvrfile.c" />
<ClCompile Include="..\..\..\src\snap\grddeform.c" />
<ClCompile Include="..\..\..\src\snap\lnzdeform.c" />
<ClCompile Include="..\..\..\src\snap\loadsnap.c" />
<ClCompile Include="..\..\..\src\snap\notedata.c" />
<ClCompile Include="..\..\..\src\snap\obsdata.c" />
<ClCompile Include="..\..\..\src\snap\output.c" />
<ClCompile Include="..\..\..\src\snap\pntdata.c" />
<ClCompile Include="..\..\..\src\snap\relerror.c" />
<ClCompile Include="..\..\..\src\snap\reorder.c" />
<ClCompile Include="..\..\..\src\snap\residual.c" />
<ClCompile Include="..\..\..\src\snap\ressumry.c" />
<ClCompile Include="..\..\..\src\snap\rftrnadj.c" />
<ClCompile Include="..\..\..\src\snap\adjparam.cpp" />
<ClCompile Include="..\..\..\src\snap\autofix.cpp" />
<ClCompile Include="..\..\..\src\snap\bindata2.cpp" />
<ClCompile Include="..\..\..\src\snap\coefs.cpp" />
<ClCompile Include="..\..\..\src\snap\control.cpp" />
<ClCompile Include="..\..\..\src\snap\csdeform.cpp" />
<ClCompile Include="..\..\..\src\snap\cvrfile.cpp" />
<ClCompile Include="..\..\..\src\snap\grddeform.cpp" />
<ClCompile Include="..\..\..\src\snap\lnzdeform.cpp" />
<ClCompile Include="..\..\..\src\snap\loadsnap.cpp" />
<ClCompile Include="..\..\..\src\snap\notedata.cpp" />
<ClCompile Include="..\..\..\src\snap\obsdata.cpp" />
<ClCompile Include="..\..\..\src\snap\output.cpp" />
<ClCompile Include="..\..\..\src\snap\pntdata.cpp" />
<ClCompile Include="..\..\..\src\snap\relerror.cpp" />
<ClCompile Include="..\..\..\src\snap\reorder.cpp" />
<ClCompile Include="..\..\..\src\snap\residual.cpp" />
<ClCompile Include="..\..\..\src\snap\ressumry.cpp" />
<ClCompile Include="..\..\..\src\snap\rftrnadj.cpp" />
<ClCompile Include="..\..\..\src\snapadjust\snapadjust_app.cpp" />
<ClCompile Include="..\..\..\src\snap\snapmain.c" />
<ClCompile Include="..\..\..\src\snap\sortobs.c" />
<ClCompile Include="..\..\..\src\snap\stnobseq.c" />
<ClCompile Include="..\..\..\src\snap\testspec.c" />
<ClCompile Include="..\..\..\src\snap\vecdata.c" />
<ClCompile Include="..\..\..\src\snap\snapmain.cpp" />
<ClCompile Include="..\..\..\src\snap\sortobs.cpp" />
<ClCompile Include="..\..\..\src\snap\stnobseq.cpp" />
<ClCompile Include="..\..\..\src\snap\testspec.cpp" />
<ClCompile Include="..\..\..\src\snap\vecdata.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\src\snap\adjparam.h" />
Expand Down
2 changes: 1 addition & 1 deletion ms/projects/snapconv/snapconv.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\src\snapconv\snapconv.c" />
<ClCompile Include="..\..\..\src\snapconv\snapconv.cpp" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\snaplib\snaplib.vcxproj">
Expand Down
2 changes: 1 addition & 1 deletion ms/projects/snapgeoid/snapgeoid.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\src\snapgeoid\snapgeoid.c" />
<ClCompile Include="..\..\..\src\snapgeoid\snapgeoid.cpp" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\snaplib\snaplib.vcxproj">
Expand Down
Loading
Loading