projects
/
debian
/
splat
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Debian patch 1.2.1-1
[debian/splat]
/
utils
/
build
diff --git
a/utils/build
b/utils/build
index 7dba0d3574ed82cd87259a6fef9ecf231b7fca71..a997e8455853dc2b6e6e7fe2b49550c124d2f446 100755
(executable)
--- a/
utils/build
+++ b/
utils/build
@@
-1,7
+1,7
@@
#!/bin/bash
#
# Simple shell script for building SPLAT! and associated utilities.
#!/bin/bash
#
# Simple shell script for building SPLAT! and associated utilities.
-# Written by John A. Magliacane, KD2BD May 2002. Updated
February 2006
.
+# Written by John A. Magliacane, KD2BD May 2002. Updated
October 2007
.
#
build_citydecoder()
#
build_citydecoder()
@@
-21,7
+21,11
@@
build_usgs2sdf()
build_srtm2sdf()
{
echo -n "Compiling srtm2sdf... "
build_srtm2sdf()
{
echo -n "Compiling srtm2sdf... "
+<<<<<<< build
cc -Wall -O3 -lbz2 -fomit-frame-pointer srtm2sdf.c -o srtm2sdf
cc -Wall -O3 -lbz2 -fomit-frame-pointer srtm2sdf.c -o srtm2sdf
+=======
+ cc -Wall -O3 -s -fomit-frame-pointer srtm2sdf.c -lbz2 -o srtm2sdf
+>>>>>>> 1.1.1.4
echo "Done!"
}
echo "Done!"
}
@@
-33,7
+37,7
@@
build_fontdata()
}
if [ $# == "0" ]; then
}
if [ $# == "0" ]; then
- echo "Usage: build { citydecoder, usgs2sdf, fontdata, all }"
+ echo "Usage: build { citydecoder,
srtm2sdf,
usgs2sdf, fontdata, all }"
else
if [ $1 == "citydecoder" ]; then
else
if [ $1 == "citydecoder" ]; then
@@
-66,4
+70,3
@@
else
echo "Usage: build { citydecoder, srtm2sdf, usgs2sdf, fontdata, all }"
fi
fi
echo "Usage: build { citydecoder, srtm2sdf, usgs2sdf, fontdata, all }"
fi
fi
-