Skip to content

Commit 834612d

Browse files
Build srtm2sdf (#12)
1 parent 0aad528 commit 834612d

3 files changed

Lines changed: 21 additions & 98 deletions

File tree

build

Lines changed: 0 additions & 84 deletions
This file was deleted.

meson.build

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
project(
22
'splat',
3-
'cpp',
3+
['c', 'cpp'],
44
version: run_command(
55
[
66
'sh',
@@ -30,7 +30,7 @@ add_project_arguments(
3030
'-DMESON_VERSION=@0@'.format(meson.version()),
3131
'-DGIT_TAG=@0@'.format(meson.project_version()),
3232
],
33-
language: 'cpp',
33+
language: ['c', 'cpp'],
3434
)
3535

3636
# https://github.com/sebastianotronto/emscripten-tutorial/blob/master/04_no_block/build.sh
@@ -45,24 +45,32 @@ add_project_link_arguments(
4545
# '-sEXPORTED_RUNTIME_METHODS=FS,callMain,ccall,cwrap',
4646
'-sEXPORT_NAME=Splat',
4747
'--emit-tsd=splat.d.ts',
48-
language: 'cpp',
48+
language: ['c', 'cpp'],
4949
)
5050

5151

52-
sources = [
53-
'src/itwom3.0.cpp',
54-
'src/splat.cpp'
55-
]
56-
5752
includes = [
5853
'src/fontdata.h'
5954
]
6055

6156
executable(
6257
'splat',
63-
sources,
58+
sources : [
59+
'src/itwom3.0.cpp',
60+
'src/splat.cpp'
61+
],
6462
dependencies : [
6563
bz2_dep,
6664
m_dep,
6765
]
6866
)
67+
68+
executable(
69+
'srtm2sdf',
70+
sources : [
71+
'utils/srtm2sdf.c'
72+
],
73+
dependencies : [
74+
bz2_dep,
75+
]
76+
)

utils/srtm2sdf.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
** Compile like this: **
99
** cc -Wall -O3 -s -lbz2 srtm2sdf.c -o srtm2sdf **
1010
** Last modification: 08-Jan-2014 **
11-
\**************************************************************/
11+
\**************************************************************/
1212

1313
#include <stdio.h>
1414
#include <stdlib.h>
@@ -382,7 +382,7 @@ int LoadSDF_BZ(char *name)
382382
sscanf(BZfgets(bzfd,255),"%d",&dummy);
383383
sscanf(BZfgets(bzfd,255),"%d",&dummy);
384384
sscanf(BZfgets(bzfd,255),"%d",&dummy);
385-
385+
386386
for (x=0; x<1200; x++)
387387
for (y=0; y<1200; y++)
388388
sscanf(BZfgets(bzfd,20),"%d",&usgs[x][y]);
@@ -500,7 +500,7 @@ int x, y, z;
500500
}
501501
}
502502

503-
if ((x>=1) && (y>=2))
503+
if ((x>=1) && (y>=2))
504504
{
505505
temp=srtm[y-1][x-1];
506506

@@ -664,7 +664,7 @@ int main(int argc, char **argv)
664664

665665
if (min_elevation<-32767)
666666
min_elevation=0;
667-
}
667+
}
668668
}
669669
}
670670

@@ -719,4 +719,3 @@ int main(int argc, char **argv)
719719

720720
return 0;
721721
}
722-

0 commit comments

Comments
 (0)