summary refs log tree commit diff stats
path: root/win32/deps
diff options
context:
space:
mode:
authorBerke Viktor <bviktor@hexchat.org>2012-09-28 17:19:49 +0200
committerBerke Viktor <bviktor@hexchat.org>2012-09-28 17:19:49 +0200
commit7d0a175dc2c00f93bdab513d7f17f43853245f3b (patch)
tree96c682f3dc51982364964776f05eb8afcd0dba7f /win32/deps
parenta6c7598a2f42c19e21fcfc56114e2e61c35e8999 (diff)
Some more zlib cosmetics and x64 build script
Diffstat (limited to 'win32/deps')
-rw-r--r--win32/deps/zlib/build-x64.bat33
-rw-r--r--win32/deps/zlib/build-x86.bat8
2 files changed, 37 insertions, 4 deletions
diff --git a/win32/deps/zlib/build-x64.bat b/win32/deps/zlib/build-x64.bat
new file mode 100644
index 00000000..07de2c8e
--- /dev/null
+++ b/win32/deps/zlib/build-x64.bat
@@ -0,0 +1,33 @@
+:: run this from a VS x64 command prompt

+@echo off

+

+SET PACKAGE_NAME=zlib-1.2.7

+

+nmake -f win32\Makefile.msc clean

+nmake -f win32\Makefile.msc AS=ml64 LOC="-I. -I.\win32 -DASMV -DASMINF" OBJA="inffasx64.obj gvmat64.obj inffas8664.obj"

+set ZLIB_SRC=%cd%

+set ZLIB_DEST=%cd%-x64

+nmake -f win32\Makefile.msc test

+echo.Press return when ready to install!

+pause

+

+rmdir /q /s %ZLIB_DEST%

+mkdir %ZLIB_DEST%

+mkdir %ZLIB_DEST%\bin

+mkdir %ZLIB_DEST%\include

+mkdir %ZLIB_DEST%\lib

+copy zlib.h %ZLIB_DEST%\include

+copy zconf.h %ZLIB_DEST%\include

+copy zdll.lib %ZLIB_DEST%\lib

+copy zlib1.dll %ZLIB_DEST%\bin

+copy README %ZLIB_DEST%\LICENSE.ZLIB

+nmake -f win32\Makefile.msc clean

+

+cd %ZLIB_DEST%

+set PATH=%PATH%;%ProgramFiles%\7-zip

+7z a ..\%PACKAGE_NAME%-x64.7z *

+cd %ZLIB_SRC%

+rmdir /q /s %ZLIB_DEST%

+

+echo.Finished!

+pause

diff --git a/win32/deps/zlib/build-x86.bat b/win32/deps/zlib/build-x86.bat
index fd0b685f..5c94e851 100644
--- a/win32/deps/zlib/build-x86.bat
+++ b/win32/deps/zlib/build-x86.bat
@@ -3,11 +3,11 @@
 

 SET PACKAGE_NAME=zlib-1.2.7

 

-nmake -f win32\makefile.msc clean

-nmake -f win32\makefile.msc LOC="-DASMV -DASMINF" OBJA="inffas32.obj match686.obj"

+nmake -f win32\Makefile.msc clean

+nmake -f win32\Makefile.msc LOC="-DASMV -DASMINF" OBJA="inffas32.obj match686.obj"

 set ZLIB_SRC=%cd%

 set ZLIB_DEST=%cd%-x86

-nmake -f win32\makefile.msc test

+nmake -f win32\Makefile.msc test

 echo.Press return when ready to install!

 pause

 

@@ -21,7 +21,7 @@ copy zconf.h %ZLIB_DEST%\include
 copy zdll.lib %ZLIB_DEST%\lib

 copy zlib1.dll %ZLIB_DEST%\bin

 copy README %ZLIB_DEST%\LICENSE.ZLIB

-nmake -f win32\makefile.msc clean

+nmake -f win32\Makefile.msc clean

 

 cd %ZLIB_DEST%

 set PATH=%PATH%;%ProgramFiles%\7-zip