Merge branch 'master' of gitorious.org:birdfont/birdfont

Changed files (3)

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

Diff

diff --git a/scripts/build.py b/scripts/build.pyindex 1f478b0..0ba8b68 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 @@ -66,7 +65,7 @@ def libbirdfont(prefix, cc, cflags, ldflags, valac, valaflags, library, nonNull  			$(pkg-config --cflags cairo) \ 			$(pkg-config --cflags glib-2.0) \ 			$(pkg-config --cflags gdk-pixbuf-2.0) \-			-I ./build/mac/birdfont""")+			-I ./build/libbirdxml""") 		run("mv ./*.o build/libbirdfont/ ")  		if library.endswith (".dylib"):@@ -84,6 +83,7 @@ def libbirdfont(prefix, cc, cflags, ldflags, valac, valaflags, library, nonNull  			$(pkg-config --libs cairo) \ 			$(pkg-config --libs glib-2.0) \ 			$(pkg-config --libs gdk-pixbuf-2.0) \+			-L./build/bin -l birdxml \ 			-o """ + library) 		run("mv " + library + " build/bin/") 		@@ -137,6 +137,7 @@ def libbirdxml(prefix, cc, cflags, ldflags, valac, valaflags, library, nonNull = 			-c build/libbirdxml/*.c \ 			-fPIC \ 			$(pkg-config --cflags glib-2.0) \+			$(pkg-config --cflags gobject-2.0) \ 			""") 			 		run("mv ./*.o build/libbirdxml/ ")@@ -149,8 +150,9 @@ 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) \+			$(pkg-config --libs gobject-2.0) \ 			-o """ + library) 		run("mv " + library + " build/bin/") 		diff --git a/scripts/mac_build.py b/scripts/mac_build.pyindex eff7db2..48ddaf4 100644--- a/scripts/mac_build.py+++ b/scripts/mac_build.py@@ -57,13 +57,13 @@ 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.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)+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, False)+build.birdfont_export(prefix, cc, cflags, ldflags, valac, valaflags, False)+build.birdfont_import(prefix, cc, cflags, ldflags, valac, valaflags, False)  if not options.nogtk:-	build.birdfont_gtk(prefix, cc, cflags, ldflags, valac, valaflags, library, False)+	build.birdfont_gtk(prefix, cc, cflags, ldflags, valac, valaflags, False)  print ("Done")diff --git a/scripts/windows_build.py b/scripts/windows_build.pyindex 4b7fc8a..3932220 100644--- a/scripts/windows_build.py+++ b/scripts/windows_build.py@@ -34,6 +34,6 @@ compile_translations() run("windres ./resources/win32/icon.rc -O coff -o ./build/icon.res") build.libbirdxml(prefix, cc, cflags, library_ldflags, valac, valaflags, "libbirdxml.dll") build.libbirdfont(prefix, cc, cflags, library_ldflags, valac, valaflags, "libbirdfont.dll")-build.birdfont_export(prefix, cc, cflags, ldflags, valac, valaflags, library)+build.birdfont_export(prefix, cc, cflags, ldflags, valac, valaflags)  print ("Done")