Skip to content

Commit 03e931f

Browse files
committed
Windows nmake: ICU 77.1, 64-bit build is the default
1 parent dfe7c16 commit 03e931f

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

win/makefile

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Parameters
55

66
DEBUG=0 # 0 for release, 1 for debug
7-
BARCH = 32 # 32=win32/x86 or 64=x64
7+
BARCH = 64 # 32=win32/x86 or 64=x64
88

99
# TCL
1010
TCL=tclsh
@@ -18,7 +18,7 @@ ICONV_DIR = c:\iconv-1.9.2.win$(BARCH)
1818
# icu charcter conversion utility
1919
# get icu libraries from http://www.icu-project.org
2020
HAVE_ICU=1
21-
ICU_VER=76
21+
ICU_VER=77
2222
ICU_BASE = c:\icu4c-$(ICU_VER)_1-Win$(BARCH)-MSVC2022
2323
!if $(BARCH) == 32
2424
ICU_LIB = $(ICU_BASE)\lib
@@ -59,22 +59,25 @@ YAZ4J_DIR="..\..\yaz4j"
5959
YAZPATH=$(MAKEDIR)\..
6060

6161

62-
dist: yaz.nsi version.nsi distclean
63-
nmake DEBUG=0 all
64-
nmake nsis
62+
dist32: yaz.nsi version.nsi distclean
63+
nmake make32
64+
nmake nsis32
6565

6666
dist64: yaz.nsi version.nsi distclean
6767
nmake make64 yaz4j
6868
nmake nsis64
6969

70+
make32:
71+
nmake DEBUG=0 BARCH=32 all
72+
7073
make64:
7174
nmake DEBUG=0 BARCH=64 all
7275

7376
distclean:
7477
nmake DEBUG=1 clean
7578
nmake DEBUG=0 clean
7679

77-
nsis: version.nsi
80+
nsis32: version.nsi
7881
$(NSIS) /DVSARCH=x86 yaz.nsi
7982

8083
nsis64: version.nsi

0 commit comments

Comments
 (0)