build on windows

Changed files (2)

• modified mac/build_mac.py
• modified win32/build_win32.py

Diff

diff --git a/mac/build_mac.py b/mac/build_mac.pyindex 78b9f84..3961c46 100755--- a/mac/build_mac.py+++ b/mac/build_mac.py@@ -51,27 +51,22 @@ def build(): 	run("mkdir -p build/mac/bin")  	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 libbirdfont/*.c build/mac/libbirdfont/ ") 	run("mv ./*.h build/mac/libbirdfont/")  	run("""gcc -c build/mac/libbirdfont/*.c -shared -fno-common -fPIC -D 'GETTEXT_PACKAGE="birdfont"' $(pkg-config --cflags --libs libxml-2.0) $(pkg-config --cflags --libs gio-2.0) $(pkg-config --cflags --libs cairo) $(pkg-config --cflags --libs glib-2.0) $(pkg-config --cflags --libs gdk-pixbuf-2.0) $(pkg-config --cflags --libs webkit-1.0) -I ./build/mac/birdfont""")- 	run("mv ./*.o build/mac/libbirdfont/ ")  	run("gcc -dynamiclib -Wl,-headerpad_max_install_names,-undefined,dynamic_lookup,-compatibility_version,1.0,-current_version,1.0,-install_name,/usr/local/lib/libbirdfont.dylib -shared build/mac/libbirdfont/*.o $(pkg-config --cflags --libs libxml-2.0) $(pkg-config --cflags --libs gio-2.0) $(pkg-config --cflags --libs cairo) $(pkg-config --cflags --libs glib-2.0) $(pkg-config --cflags --libs gdk-pixbuf-2.0) $(pkg-config --cflags --libs webkit-1.0) -shared -o libbirdfont.dylib")- 	run("mv libbirdfont.dylib build/mac/bin/")  	# birdfont 	run("mkdir -p build/mac/birdfont") 	 	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 birdfont/*.c build/mac/birdfont/")  	run("""gcc -c ./build/mac/libbirdfont/birdfont.h build/mac/birdfont/*.c -D 'GETTEXT_PACKAGE="birdfont"' $(pkg-config --cflags --libs libxml-2.0) $(pkg-config --cflags --libs gio-2.0) $(pkg-config --cflags --libs cairo) $(pkg-config --cflags --libs glib-2.0) $(pkg-config --cflags --libs gdk-pixbuf-2.0) $(pkg-config --cflags --libs webkit-1.0) -I ./build/mac/libbirdfont/""")- 	run("mv ./*.o build/mac/birdfont/")  	run("gcc build/mac/birdfont/*.o ./build/mac/bin/libbirdfont.dylib $(pkg-config --cflags --libs libxml-2.0) $(pkg-config --cflags --libs gio-2.0) $(pkg-config --cflags --libs cairo) $(pkg-config --cflags --libs glib-2.0) $(pkg-config --cflags --libs gdk-pixbuf-2.0) $(pkg-config --cflags --libs webkit-1.0) $(pkg-config --cflags --libs gtk+-2.0) -o ./build/mac/bin/birdfont")@@ -80,11 +75,9 @@ def build(): 	run("mkdir -p build/mac/birdfont-export") 	 	run("valac -C birdfont-export/* --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 birdfont-export/*.c build/mac/birdfont-export/")  	run("""gcc -c ./build/mac/libbirdfont/birdfont.h build/mac/birdfont-export/*.c -D 'GETTEXT_PACKAGE="birdfont"' $(pkg-config --cflags --libs libxml-2.0) $(pkg-config --cflags --libs gio-2.0) $(pkg-config --cflags --libs cairo) $(pkg-config --cflags --libs glib-2.0) $(pkg-config --cflags --libs gdk-pixbuf-2.0) $(pkg-config --cflags --libs webkit-1.0) -I ./build/mac/libbirdfont/""")- 	run("mv ./*.o build/mac/birdfont-export/")  	run("gcc build/mac/birdfont-export/*.o ./build/mac/bin/libbirdfont.dylib $(pkg-config --cflags --libs libxml-2.0) $(pkg-config --cflags --libs gio-2.0) $(pkg-config --cflags --libs cairo) $(pkg-config --cflags --libs glib-2.0) $(pkg-config --cflags --libs gdk-pixbuf-2.0) $(pkg-config --cflags --libs webkit-1.0) $(pkg-config --cflags --libs gtk+-2.0) -o ./build/mac/bin/birdfont-export")@@ -133,13 +126,7 @@ def build(): 		+ "build/mac/birdfont.app/Contents/MacOs/birdfont")	  	run("install_name_tool -change /usr/local/lib/libbirdfont.dylib @executable_path/libbirdfont.dylib "-		+ "build/mac/birdfont.app/Contents/MacOs/birdfont-export")		--#	run("rm -rf build/mac/birdfont.dmg")	-#	run("hdiutil create -megabytes 50 -fs HFS+ -volname birdfont build/mac/birdfont")-#	run("open build/mac/birdfont.dmg")	-#	run("cp -r build/mac/birdfont.app /Volumes/birdfont/")-#	run("hdiutil detach /Volumes/birdfont")	+		+ "build/mac/birdfont.app/Contents/MacOs/birdfont-export")  	print ("Done."); diff --git a/win32/build_win32.py b/win32/build_win32.pyindex 735100a..c9f6e64 100755--- a/win32/build_win32.py+++ b/win32/build_win32.py@@ -80,7 +80,6 @@ def configure(): 	 	os.chdir('../') 	run('./configure')-	run('doit') 	os.chdir('./win32') 	 	run('i686-w64-mingw32-gcc --version')@@ -95,11 +94,32 @@ def configure(): def build(): 	run("mkdir -p ../build/supplement") 	run("mkdir -p ../build/win32")+	run("mkdir -p ../build/win32/libbirdfont")+	run("mkdir -p ../build/win32/birdfont")+	run("mkdir -p ../build/win32/birdfont-export")+ 	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("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/")++	run("valac -C ../birdfont-export/* --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-export/")++	# compile c code 	run("""i686-w64-mingw32-gcc \-			-c ../build/birdfont.h ../build/birdfont/Main.c ../build/birdfont/GtkWindow.c ../build/birdfont-export/BirdfontExport.c ../build/libbirdfont/*.c ./ \+			-c ../build/win32/libbirdfont/birdfont.h \+			../build/win32/birdfont/Main.c \+			../build/win32/birdfont/GtkWindow.c \+			../build/win32/birdfont-export/BirdfontExport.c \+			../build/win32/libbirdfont/*.c ./ \ 			-D 'GETTEXT_PACKAGE="birdfont"' \-			-I ../build/ \+			-I ../build/win32/libbirdfont/ \ 			-mthreads \ 			$(i686-w64-mingw32-pkg-config --cflags --libs glib-2.0) \ 			$(i686-w64-mingw32-pkg-config --cflags --libs libxml-2.0) \@@ -112,10 +132,11 @@ def build(): 	run("""mv ../build/win32/BirdfontExport.* ../build """) 	run("""mv ../build/win32/Main.* ../build """) 	run("""mv ../build/win32/GtkWindow.* ../build """)-	++	# link binaries 	run("""i686-w64-mingw32-gcc \ 		-shared \-		../build/win32/*.o \+		../build/win32/libbirdfont/*.o \ 		../build/icon.res \ 		-Wl,-subsystem,windows \ 		-mthreads \