build with clang

Changed files (3)

• modified libbirdfont/CharDatabase.vala
• modified libbirdfont/ImportSvg.vala
• modified scripts/linux_build.py

Diff

diff --git a/libbirdfont/CharDatabase.vala b/libbirdfont/CharDatabase.valaindex 854da50..7152cee 100644--- a/libbirdfont/CharDatabase.vala+++ b/libbirdfont/CharDatabase.vala@@ -54,7 +54,7 @@ public class CharDatabase { 			show_loading_message (); 		} 		-		return_if_fail (result.get_length () == 0);+		return_val_if_fail (result.get_length () == 0, result); 		 		if (s.has_prefix ("U+") || s.has_prefix ("u+")) { 			c = Font.to_unichar (s.down ());diff --git a/libbirdfont/ImportSvg.vala b/libbirdfont/ImportSvg.valaindex 28cc91c..27fdb0d 100644--- a/libbirdfont/ImportSvg.vala+++ b/libbirdfont/ImportSvg.vala@@ -70,7 +70,7 @@ public class ImportSvg { 			 			doc = Parser.parse_doc (xml_data); 			root = doc->get_root_element ();-			return_if_fail (root != null);+			return_val_if_fail (root != null, path_list); 			path_list = parse_svg_file (root);  			delete doc;diff --git a/scripts/linux_build.py b/scripts/linux_build.pyindex fc76e1b..25f95ef 100755--- a/scripts/linux_build.py+++ b/scripts/linux_build.py@@ -18,15 +18,37 @@ from translations import compile_translations import configfile from run import run import version+from optparse import OptionParser -prefix = ""-valac = "valac"+parser = OptionParser()+parser.add_option("-p", "--prefix", dest="prefix", help="install prefix", metavar="PREFIX")+parser.add_option("-d", "--dest", dest="dest", help="install to this directory", metavar="DEST")+parser.add_option("-c", "--cc", dest="cc", help="select the C compiler", metavar="CC")+parser.add_option("-f", "--cflags", dest="cflags", help="set compiler flags", metavar="CFLAGS")+parser.add_option("-l", "--ldflags", dest="ldflags", help="set linker flags", metavar="LDFLAGS")+parser.add_option("-v", "--valac", dest="valac", help="select vala compiler", metavar="VALAC")++(options, args) = parser.parse_args()++if not options.prefix:+	options.prefix = "/usr"+if not options.cc:+	options.cc = "gcc"+if not options.cflags:+	options.cflags = ""+if not options.ldflags:+	options.ldflags = ""+if not options.valac:+	options.valac = "valac"++prefix = options.prefix+valac = options.valac valaflags = ""-cc = "gcc"-cflags = ""-ldflags = ""-library_cflags = ""-library_ldflags= "";+cc = options.cc+cflags = options.cflags+ldflags = options.ldflags+library_cflags = options.cflags+library_ldflags= options.ldflags library = "libbirdfont.so." + version.SO_VERSION  configfile.write_config (prefix)