Skip to content

Windows nmake: ICU 77.1, 64-bit build is the default #160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adamdickmeiss merged 1 commit into from
May 12, 2025
Merged

Windows nmake: ICU 77.1, 64-bit build is the default #160

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions win/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Parameters

DEBUG=0 # 0 for release, 1 for debug
BARCH = 32 # 32=win32/x86 or 64=x64
BARCH = 64 # 32=win32/x86 or 64=x64

# TCL
TCL=tclsh
Expand All @@ -18,7 +18,7 @@ ICONV_DIR = c:\iconv-1.9.2.win$(BARCH)
# icu charcter conversion utility
# get icu libraries from http://www.icu-project.org
HAVE_ICU=1
ICU_VER=76
ICU_VER=77
ICU_BASE = c:\icu4c-$(ICU_VER)_1-Win$(BARCH)-MSVC2022
!if $(BARCH) == 32
ICU_LIB = $(ICU_BASE)\lib
Expand Down Expand Up @@ -59,22 +59,25 @@ YAZ4J_DIR="..\..\yaz4j"
YAZPATH=$(MAKEDIR)\..


dist: yaz.nsi version.nsi distclean
nmake DEBUG=0 all
nmake nsis
dist32: yaz.nsi version.nsi distclean
nmake make32
nmake nsis32

dist64: yaz.nsi version.nsi distclean
nmake make64 yaz4j
nmake nsis64

make32:
nmake DEBUG=0 BARCH=32 all

make64:
nmake DEBUG=0 BARCH=64 all

distclean:
nmake DEBUG=1 clean
nmake DEBUG=0 clean

nsis: version.nsi
nsis32: version.nsi
$(NSIS) /DVSARCH=x86 yaz.nsi

nsis64: version.nsi
Expand Down