Build on Mac OS X

Changed files (4)

• modified install.py
• modified libbirdfont/GlyphCanvas.vala
• modified scripts/build.py
• modified scripts/mac_build.py

Diff

diff --git a/install.py b/install.pyindex 574d280..f668630 100755--- a/install.py+++ b/install.py@@ -58,7 +58,9 @@ for file in os.listdir('./icons'): install ('resources/linux/birdfont.desktop', '/share/applications') install ('resources/linux/birdfont.png', '/share/icons/hicolor/48x48/apps') -install ('build/bin/birdfont', '/bin')+if os.path.isfile ('build/bin/birdfont'):+	install ('build/bin/birdfont', '/bin')+ install ('build/bin/birdfont-export', '/bin')  #librarydiff --git a/libbirdfont/GlyphCanvas.vala b/libbirdfont/GlyphCanvas.valaindex e6bb7c8..e5062be 100644--- a/libbirdfont/GlyphCanvas.vala+++ b/libbirdfont/GlyphCanvas.vala@@ -28,6 +28,10 @@ public class GlyphCanvas : GLib.Object { 	
 	public GlyphCanvas () {
 	}
++	public static WidgetAllocation get_allocation () {+		return allocation;+	} 
 	public void set_allocation (WidgetAllocation w) {
 		allocation = w.copy ();
diff --git a/scripts/build.py b/scripts/build.pyindex 855e736..876b686 100644--- a/scripts/build.py+++ b/scripts/build.py@@ -159,7 +159,7 @@ def birdfont_gtk(prefix, cc, cflags, ldflags, valac, valaflags, library): 		$(pkg-config --cflags gdk-pixbuf-2.0) \ 		$(pkg-config --cflags webkit-1.0) \ 		-I ./build/libbirdfont/""")-	run("mv ./*.o build/birdfont/")+	run("mv ./*.o build/birdfont/")	  	run(cc + " " + ldflags + """ \ 		build/birdfont/*.o \diff --git a/scripts/mac_build.py b/scripts/mac_build.pyindex 48e5add..d057ce9 100644--- a/scripts/mac_build.py+++ b/scripts/mac_build.py@@ -27,6 +27,7 @@ parser.add_option("-c", "--cc", dest="cc", help="select the C compiler", metavar 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")+parser.add_option("-n", "--nogtk", dest="nogtk", help="do not compile the gtk application", metavar="NOGTK", default=False, action="store_false")  (options, args) = parser.parse_args() @@ -56,6 +57,8 @@ configfile.write_config (prefix) compile_translations() build.libbirdfont(prefix, cc, library_cflags, library_ldflags, valac, valaflags, library) build.birdfont_export(prefix, cc, cflags, ldflags, valac, valaflags, library)-build.birdfont_gtk(prefix, cc, cflags, ldflags, valac, valaflags, library)++if not options.nogtk:+	build.birdfont_gtk(prefix, cc, cflags, ldflags, valac, valaflags, library)  print ("Done")