build for windows

Changed files (2)

• modified libbirdfont/load_svg_font.c
• modified win32/build_win32.py

Diff

diff --git a/libbirdfont/load_svg_font.c b/libbirdfont/load_svg_font.cindex eceb79d..908ffa6 100644--- a/libbirdfont/load_svg_font.c+++ b/libbirdfont/load_svg_font.c@@ -36,15 +36,15 @@ #define CUBIC_CURVE 2 #define QUADRATIC_OFF_CURVE 0 -uint is_cubic (char* flags, int index, int len) {+guint is_cubic (char* flags, int index, int len) { 	return flags[index] & CUBIC_CURVE && (flags[index] & ON_CURVE) == 0; } -uint is_quadratic (char* flags, int index, int len) {+guint is_quadratic (char* flags, int index, int len) { 	return (flags[index] & CUBIC_CURVE) == 0 && (flags[index] & ON_CURVE) == 0; } -uint is_line (char* flags, int index, int len) {+guint is_line (char* flags, int index, int len) { 	return flags[index] & ON_CURVE; } @@ -52,7 +52,7 @@ uint is_line (char* flags, int index, int len) { void create_contour (FT_Vector* points, char* flags, int* length, FT_Vector** new_points, char** new_flags, int* err) { 	int i; 	int j;-	uint prev_is_curve;+	guint prev_is_curve; 	double x = 0; 	double y = 0; 	FT_Vector* p;@@ -273,7 +273,7 @@ GString* get_svg_font (FT_Face face, int* err) { 		 		if (charcode != 0) { 			g_string_append (glyph_element,"unicode=\"&#x");-			g_string_append_printf (glyph_element, "%x", (uint)charcode);+			g_string_append_printf (glyph_element, "%x", (guint)charcode); 			g_string_append (glyph_element, ";\" "); 		} 		diff --git a/win32/build_win32.py b/win32/build_win32.pyindex c5c7cd3..e9715c1 100755--- a/win32/build_win32.py+++ b/win32/build_win32.py@@ -101,9 +101,8 @@ def build(): 	run("windres ../win32/icon.rc -O coff -o ../build/icon.res")  	# generate c code-	run("valac -C --library libbirdfont -H birdfont.h ../libbirdfont/* --pkg libxml-2.0 --pkg gio-2.0  --pkg cairo --pkg libsoup-2.4 --pkg gdk-pixbuf-2.0 --pkg webkit-1.0")-	run("mv ./*.c ../build/win32/libbirdfont/ ")-	run("mv ./*.h ../build/win32/libbirdfont/")+	run("cp ../libbirdfont/*.c ../build/win32/libbirdfont/")+	run("valac -C --basedir ../build/win32/libbirdfont/ --library libbirdfont -H birdfont.h ../libbirdfont/*.vala --pkg libxml-2.0 --pkg gio-2.0  --pkg cairo --pkg libsoup-2.4 --pkg gdk-pixbuf-2.0 --pkg webkit-1.0")  	run("valac -C ../birdfont/* --vapidir=./ --pkg libxml-2.0 --pkg gio-2.0  --pkg cairo --pkg libsoup-2.4 --pkg gdk-pixbuf-2.0 --pkg webkit-1.0 --pkg gtk+-2.0 --pkg libbirdfont") 	run("mv ./*.c ../build/win32/birdfont/")@@ -145,6 +144,7 @@ def build(): 		-static -B static -lintl.dll -B static -l glib-2.0.dll -B static -l xml2.dll  \ 		-B static -lgio-2.0.dll -B static -l soup-2.4.dll \ 		-B static -l webkitgtk-1.0.dll  -B static -lgtk-win32-2.0.dll -B static -lgdk-win32-2.0.dll -B static -latk-1.0.dll -B static -lgio-2.0.dll -B static -lpangowin32-1.0.dll -B static -lpangocairo-1.0.dll -B static -lgdk_pixbuf-2.0.dll -B static -lpango-1.0.dll -B static -lcairo.dll -B static -lgobject-2.0.dll -B static -lgmodule-2.0.dll -B static -lgthread-2.0.dll -B static -lglib-2.0.dll \+		-l freetype.dll \ 		-static -o libbirdfont.dll""") 	 	run("""i686-w64-mingw32-ar rcs ../build/libbirdfont.dll.a ../build/win32/libbirdfont/*.o""")@@ -161,6 +161,7 @@ def build(): 		-static -B static -lintl.dll -B static -l glib-2.0.dll -B static -l xml2.dll  \ 		-B static -l gio-2.0.dll -B static -l soup-2.4.dll \ 		-B static -l webkitgtk-1.0.dll  -B static -l gtk-win32-2.0.dll -B static -l gdk-win32-2.0.dll -B static -l atk-1.0.dll -B static -l gio-2.0.dll -B static -l pangowin32-1.0.dll -B static -l pangocairo-1.0.dll -B static -l gdk_pixbuf-2.0.dll -B static -l pango-1.0.dll -B static -l cairo.dll -B static -l gobject-2.0.dll -B static -l gmodule-2.0.dll -B static -l gthread-2.0.dll -B static -l glib-2.0.dll \+		-l freetype.dll \ 		-static -o birdfont.exe""")  	run("""i686-w64-mingw32-gcc \@@ -174,6 +175,7 @@ def build(): 		-static -B static -lintl.dll -B static -l glib-2.0.dll -B static -l xml2.dll  \ 		-B static -l gio-2.0.dll -B static -l soup-2.4.dll \ 		-B static -l webkitgtk-1.0.dll  -B static -l gtk-win32-2.0.dll -B static -l gdk-win32-2.0.dll -B static -l atk-1.0.dll -B static -l gio-2.0.dll -B static -l pangowin32-1.0.dll -B static -l pangocairo-1.0.dll -B static -l gdk_pixbuf-2.0.dll -B static -l pango-1.0.dll -B static -l cairo.dll -B static -l gobject-2.0.dll -B static -l gmodule-2.0.dll -B static -l gthread-2.0.dll -B static -l glib-2.0.dll \+		-l freetype.dll \ 		-static -o birdfont_terminal.exe""")  	run("""i686-w64-mingw32-gcc \@@ -182,11 +184,13 @@ def build(): 		-Wl,-subsystem,windows \ 		-mthreads \ 		-L../build/ \+		-L/usr/local/lib -lfreetype -lz \ 		-L/usr/i686-w64-mingw32/sys-root/mingw/lib \ 		-static -B -static -l birdfont.dll \ 		-static -B static -lintl.dll -B static -l glib-2.0.dll -B static -l xml2.dll  \ 		-B static -l gio-2.0.dll -B static -l soup-2.4.dll \ 		-B static -l webkitgtk-1.0.dll  -B static -l gtk-win32-2.0.dll -B static -l gdk-win32-2.0.dll -B static -l atk-1.0.dll -B static -l gio-2.0.dll -B static -l pangowin32-1.0.dll -B static -l pangocairo-1.0.dll -B static -l gdk_pixbuf-2.0.dll -B static -l pango-1.0.dll -B static -l cairo.dll -B static -l gobject-2.0.dll -B static -l gmodule-2.0.dll -B static -l gthread-2.0.dll -B static -l glib-2.0.dll \+		-l freetype.dll \ 		-static -o birdfont-export.exe""")  	run("mv birdfont-export.exe ../build/supplement/")