windows compilation

Changed files (5)

• modified birdfont-export.sh
• modified birdfont.sh
• modified po/de.po
• modified po/sv.po
• modified win32/wscript

Diff

diff --git a/birdfont-export.sh b/birdfont-export.shindex 3ecc1fe..0662d33 100755--- a/birdfont-export.sh+++ b/birdfont-export.sh@@ -1,4 +1,4 @@ export LD_LIBRARY_PATH="./build/src/:$LD_LIBRARY_PATH" PKG_PATH=$(dirname "$(readlink -f "$0")") cd "${PKG_PATH}"-./build/src/birdfont-export $*+./build/birdfont-export/birdfont-export $*diff --git a/birdfont.sh b/birdfont.shindex 36f5c39..f588916 100755--- a/birdfont.sh+++ b/birdfont.sh@@ -1,4 +1,4 @@ export LD_LIBRARY_PATH="./build/src/:$LD_LIBRARY_PATH" PKG_PATH=$(dirname "$(readlink -f "$0")") cd "${PKG_PATH}"-./build/src/birdfont $*+./build/birdfont/birdfont $*diff --git a/po/de.po b/po/de.poindex b54bde4..6ca5051 100644--- a/po/de.po+++ b/po/de.po@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n"-"POT-Creation-Date: 2012-12-14 17:51+0100\n"+"POT-Creation-Date: 2012-12-14 07:54+0100\n" "PO-Revision-Date: 2012-12-14 07:59+0000\n" "Last-Translator: Johan <johan.mattsson.m@gmail.com>\n" "Language-Team: LANGUAGE <LL@li.org>\n"diff --git a/po/sv.po b/po/sv.poindex 8fec2d9..e99dce6 100644--- a/po/sv.po+++ b/po/sv.po@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n"-"POT-Creation-Date: 2012-12-14 17:51+0100\n"+"POT-Creation-Date: 2012-12-14 07:54+0100\n" "PO-Revision-Date: 2012-12-14 07:23+0000\n" "Last-Translator: Johan <johan.mattsson.m@gmail.com>\n" "Language-Team: LANGUAGE <LL@li.org>\n"diff --git a/win32/wscript b/win32/wscriptindex 0ce2578..59811de 100644--- a/win32/wscript+++ b/win32/wscript@@ -90,7 +90,7 @@ def build(bld):  	bld( 		rule="""i686-w64-mingw32-gcc \-			-c ./Main.c ./GtkWindow.c ./BirdfontExport.c ./src/*.c ./ \+			-c ./Main.c ./GtkWindow.c ./BirdfontExport.c ./libbirdfont/*.c ./ \ 			-D 'GETTEXT_PACKAGE="birdfont"' \ 			-I ./ \ 			-mthreads \@@ -101,7 +101,7 @@ def build(bld): 			$(i686-w64-mingw32-pkg-config --cflags --libs gtk+-2.0) \ 			$(i686-w64-mingw32-pkg-config --cflags --libs webkit-1.0) && \ 			mv *.o win32/""",-		source="../build/src/Supplement.c", +		source="../build/libbirdfont/Supplement.c",  		target="./Supplement.o",  		name="mingw compile",  		depends_on="clean_src", @@ -121,7 +121,7 @@ def build(bld): 		-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 \-		-static -o libbirdfont.dll""", source="../build/src/Supplement.c", target="../libbirdfont.dll", depends_on=['mingw compile', 'icon'], name="mingw link shared", always=True)+		-static -o libbirdfont.dll""", source="../build/libbirdfont/Supplement.c", target="../libbirdfont.dll", depends_on=['mingw compile', 'icon'], name="mingw link shared", always=True) 	 	bld(rule="""i686-w64-mingw32-ar rcs libbirdfont.dll.a win32/*.o""", name="mingw link static", depends_on="mingw link shared") @@ -137,7 +137,7 @@ def build(bld): 		-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 \-		-static -o birdfont.exe""", source="../build/src/Supplement.c", target="../birdfont.exe", depends_on=['mingw link shared', 'icon'], name="mingw link", always=True)+		-static -o birdfont.exe""", source="../build/libbirdfont/Supplement.c", target="../birdfont.exe", depends_on=['mingw link shared', 'icon'], name="mingw link", always=True)  	bld(rule="""i686-w64-mingw32-gcc \ 		./Main.o \@@ -150,7 +150,7 @@ def build(bld): 		-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 \-		-static -o birdfont_terminal.exe""", source="../build/src/Supplement.c", target="../birdfont.exe", depends_on=['mingw link shared', 'icon'], name="mingw link terminal", always=True)+		-static -o birdfont_terminal.exe""", source="../build/libbirdfont/Supplement.c", target="../birdfont.exe", depends_on=['mingw link shared', 'icon'], name="mingw link terminal", always=True)  	bld(rule="""i686-w64-mingw32-gcc \ 		./BirdfontExport.o \@@ -163,7 +163,7 @@ def build(bld): 		-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 \-		-static -o birdfont-export.exe""", source="../build/src/Supplement.c", target="../birdfont-export.exe", depends_on=['mingw link shared', 'icon'], name="mingw link", always=True)+		-static -o birdfont-export.exe""", source="../build/libbirdfont/Supplement.c", target="../birdfont-export.exe", depends_on=['mingw link shared', 'icon'], name="mingw link", always=True)  	bld(rule="mv birdfont-export.exe supplement/", depends_on='mingw link', always=True) 	bld(rule="mv birdfont.exe supplement/", depends_on='mingw link', always=True)