From 335d44006f64777851336f2badb4e5e78cbaab4b Mon Sep 17 00:00:00 2001 From: Matthias Kramm Date: Mon, 15 Oct 2012 13:00:12 -0700 Subject: [PATCH] fixed wx/ autobuild --- wx/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wx/Makefile b/wx/Makefile index 7127125c..facbe441 100644 --- a/wx/Makefile +++ b/wx/Makefile @@ -11,7 +11,7 @@ pdf2swf_gui.exe: gpdf2swf.py gui/*.py viewers/*.py cp -a -R viewers gui lib /xpython/ rm -f /xpython/swftools/lib/python/gfx.a rm -f /xpython/swftools/lib/python/gfx.lib - cd /xpython/swftools;git pull + cd /xpython/swftools;git stash && git pull && git stash apply cd /xpython;make xpython.exe ln -f /xpython/xpython.exe ./gpdf2swf.exe #ln -f gpdf2swf.exe ../win32_gui/ -- 2.11.4.GIT