Browse Source

bundle zlib1.dll and libpcre-1.dll when `make package_bin` on Windows

Andy Li 8 years ago
parent
commit
4c6483f202
2 changed files with 2 additions and 2 deletions
  1. 1 1
      Makefile.win
  2. 1 1
      libs

+ 1 - 1
Makefile.win

@@ -43,7 +43,7 @@ package_win:
 	# Copy the package contents to $(PACKAGE_FILE_NAME)
 	# Using poor man's cp (zip then unzip), because cp in cygwin is quite broken
 	mkdir -p $(PACKAGE_FILE_NAME)
-	7z a -y -tzip -mx0 temp.zip $(OUTPUT) haxelib$(EXTENSION) std > log.txt || type log.txt
+	7z a -y -tzip -mx0 temp.zip $(OUTPUT) haxelib$(EXTENSION) std "$$(cygpath -w "$$(which zlib1.dll)")" "$$(cygpath -w "$$(which libpcre-1.dll)")" > log.txt || type log.txt
 	cd extra && 7z a -y -tzip -mx0 ../temp.zip LICENSE.txt CONTRIB.txt CHANGES.txt > log.txt || type log.txt
 	7z x -y temp.zip -o$(PACKAGE_FILE_NAME) > log.txt || type log.txt
 	rm temp.zip

+ 1 - 1
libs

@@ -1 +1 @@
-Subproject commit cc37b812e958e5ce2ae2defa4d4fcab0c5a19114
+Subproject commit 8e15aa26d54c7317025600cad3e3e71eb0b8526c