Fix build scripts for libirdxml

Changed files (2)

• modified scripts/build.py
• modified scripts/mac_build.py

Diff

diff --git a/scripts/build.py b/scripts/build.pyindex 1f478b0..bd8d1f1 100644--- a/scripts/build.py+++ b/scripts/build.py@@ -36,7 +36,6 @@ def libbirdfont(prefix, cc, cflags, ldflags, valac, valaflags, library, nonNull  		-C \ 		""" + valaflags + """ \ 		--vapidir=./ \-		--vapidir=./build \ 		--basedir build/libbirdfont/ \ 		""" + experimentalNonNull + """ \ 		--enable-experimental \@@ -48,7 +47,7 @@ def libbirdfont(prefix, cc, cflags, ldflags, valac, valaflags, library, nonNull  		--pkg gio-2.0 \ 		--pkg cairo \ 		--pkg gdk-pixbuf-2.0 \-		--pkg birdxml \+		--pkg libbirdxml \ 		""")  	#copy c sources @@ -149,7 +148,7 @@ def libbirdxml(prefix, cc, cflags, ldflags, valac, valaflags, library, nonNull = 		run(cc + " " + ldflags + """ \ 			-shared \ 			""" + sonameparam + """ \-			build/libbirdfont/*.o \+			build/libbirdxml/*.o \ 			$(pkg-config --libs glib-2.0) \ 			-o """ + library) 		run("mv " + library + " build/bin/")diff --git a/scripts/mac_build.py b/scripts/mac_build.pyindex eff7db2..6a4d30b 100644--- a/scripts/mac_build.py+++ b/scripts/mac_build.py@@ -57,8 +57,8 @@ xml_library_ldflags = options.ldflags + " " + """-dynamiclib -Wl,-headerpad_max_  configfile.write_config (prefix) compile_translations()-build.libbirdxml(prefix, cc, xml_library_cflags, xml_library_ldflags, valac, valaflags, "libbirdfont." + version.SO_VERSION + ".dylib", False)-build.libbirdfont(prefix, cc, library_cflags, library_ldflags, valac, valaflags, "libbirdxml." + version.LIBBIRDXML_SO_VERSION + ".dylib", False)+build.libbirdxml(prefix, cc, xml_library_cflags, xml_library_ldflags, valac, valaflags, "libbirdxml." + version.LIBBIRDXML_SO_VERSION + ".dylib", False)+build.libbirdfont(prefix, cc, library_cflags, library_ldflags, valac, valaflags, "libbirdfont." + version.SO_VERSION + ".dylib", False) build.birdfont_autotrace(prefix, cc, cflags, ldflags, valac, valaflags, library, False) build.birdfont_export(prefix, cc, cflags, ldflags, valac, valaflags, library, False) build.birdfont_import(prefix, cc, cflags, ldflags, valac, valaflags, library, False)