Clone in a terminal:
Commit 4b6004d
Johan Mattsson - 2014-09-25T18:34:33+00:00
4b6004d07195ad3f81681bc126836aeeb7fd47edjohan.mattsson.m@gmail.com

Build fixes on Windows

Changed files (2)

Diff

diff --git a/scripts/build.py b/scripts/build.pyindex bd8d1f1..0ba8b68 100644--- a/scripts/build.py+++ b/scripts/build.py@@ -65,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"):@@ -83,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/") 		@@ -136,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/ ")@@ -150,6 +152,7 @@ def libbirdxml(prefix, cc, cflags, ldflags, valac, valaflags, library, nonNull = 			""" + sonameparam + """ \ 			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/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")

Contact

Email: johan.mattsson.m@gmail.com
Mastodon: typo.social/@birdfont
GitHub: johanmattssonm
LinkedIn: johan-mattsson-2ab324112