updated cross compilation makefile.

diff --git a/cross.mk b/cross.mk
index 8161b09ba2478fff13d3e29d73891fb536f7e7fa..08f20dc31d09d1fc2b580a051a9a696c8a8f5181 100644 (file)
--- a/cross.mk
+++ b/cross.mk
@@ -27,12 +27,11 @@ $(GNUTLS_DIR)-w32.zip: $(LIB_DIR) $(BIN_DIR) $(GNUTLS_DIR)/.installed
        cd $(CROSS_DIR) && zip -r $(PWD)/$@ *
        gpg --sign --detach $(GNUTLS_DIR)-w32.zip
 
-gnutls-$(GNUTLS_VERSION)-1gn.DevPak: $(GNUTLS_DIR)-w32.zip
+gnutls-$(GNUTLS_VERSION)-1gn.DevPak: $(GNUTLS_DIR)-w32.zip devcpp.tar
        rm -rf $(DEVCPP_DIR)
-       mkdir -p $(DEVCPP_DIR)/gnutls
-       mkdir -p $(DEVCPP_DIR)/MinGW32
-       cd $(DEVCPP_DIR)/gnutls && unzip ../../$(GNUTLS_DIR)-w32.zip 
-       cd $(DEVCPP_DIR) && tar xf ../../devcpp.tar && sed -i 's/@VERSION@/$(GNUTLS_VERSION)/g' gnutls.DevPackage
+       mkdir -p $(DEVCPP_DIR)
+       cd $(DEVCPP_DIR) && unzip ../$(GNUTLS_DIR)-w32.zip 
+       cd $(DEVCPP_DIR) && tar xf ../devcpp.tar && sed -i 's/@VERSION@/$(GNUTLS_VERSION)/g' gnutls.DevPackage
        cd $(DEVCPP_DIR) && tar -cjf ../$@ .
 
 devpak: gnutls-$(GNUTLS_VERSION)-1gn.DevPak

diff --git a/win32/.gitignore b/win32/.gitignore
new file mode 100644 (file)
index 0000000..692ff23
--- /dev/null
+++ b/win32/.gitignore
@@ -0,0 +1,10 @@
+*.tar.*
+*.zip
+*.sig
+*.DevPak
+gnutls-*
+nettle-*
+gmp-*
+p11-kit-*
+devcpp
+win32

diff --git a/win32/devcpp.tar b/win32/devcpp.tar
index f3a48d820a4effabc9c90883df8fffb9176f3c8e..d8ba064fe8614f6bcb7a4118b99fa6729b46daa3 100644 (file)
Binary files a/win32/devcpp.tar and b/win32/devcpp.tar differ