Clone in a terminal:
Commit d476ffe
Johan Mattsson - 2012-10-12T19:47:28+00:00
d476ffecdb4a83487a47bb36042a8c547e1dfef4johan.mattsson.m@gmail.com

fix win32 build scripts

Changed files (2)

Diff

diff --git a/src/OverView.vala b/src/OverView.valaindex 3b9504f..c2684fe 100644--- a/src/OverView.vala+++ b/src/OverView.vala@@ -827,7 +827,7 @@ public class OverView : FontDisplay { 		if (deleted_glyphs.length () == 0) { 			return; 		}-		+			 		f.add_glyph_collection (deleted_glyphs.last ().data); 		deleted_glyphs.remove_link (deleted_glyphs.last ()); 	}diff --git a/win32/wscript b/win32/wscriptindex a6d374e..ec8aa3f 100644--- a/win32/wscript+++ b/win32/wscript@@ -83,13 +83,12 @@ def configure(conf): 		conf.find_program(os.getenv("HOME") + "/.wine/drive_c/Program/NSIS/makensis.exe", always=True)  def build(bld):-	 	bld(rule="mkdir -p build/supplement")  	bld(rule="windres ${SRC} -O coff -o ${TGT}", source="../win32/icon.rc", target="icon.res", always=True) 	bld(rule="mv ${SRC} ${TGT}", source="../win32/icon.res", target="../build/", name="icon", always=True) -	bld(rule="""i686-w64-mingw32-gcc -c ./Main.c ./BirdfontExport.c ./src/*.c ./ \+	bld(rule="""i686-w64-mingw32-gcc -c ./Main.c ./GtkInterface.c ./BirdfontExport.c ./src/*.c ./ \ 		-I./ \ 		-mthreads \ 		$(i686-w64-mingw32-pkg-config --cflags --libs glib-2.0) \@@ -101,6 +100,7 @@ def build(bld): 	 	bld(rule="""mv win32/BirdfontExport.* ./ """, always=True); 	bld(rule="""mv win32/Main.* ./ """, always=True);+	bld(rule="""mv win32/GtkInterface.* ./ """, always=True); 	 	bld(rule="""i686-w64-mingw32-gcc \ 		-shared \@@ -118,6 +118,7 @@ def build(bld):  	bld(rule="""i686-w64-mingw32-gcc \ 		./Main.o \+		./GtkInterface.o \ 		./icon.res \ 		-Wl,-subsystem,windows \ 		-mthreads \@@ -132,6 +133,7 @@ def build(bld): 	bld(rule="""i686-w64-mingw32-gcc \ 		./Main.o \ 		./icon.res \+		./GtkInterface.o \ 		-mthreads \ 		-L./ \ 		-L/usr/i686-w64-mingw32/sys-root/mingw/lib \@@ -170,6 +172,8 @@ def build(bld): def generate_nsi(bld): 	print ('generating build/supplement/birdfont_installer.nsi') +	bld.exec_command('mkdir -p build/supplement')+ 	f = open('build/supplement/birdfont_installer.nsi', 'w+') 	f.write("""; windows installation script generated by by win32/wscript 

Contact

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