projects
/
idzebra-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
32efa3f
)
Enable ICU using HAVE_ICU on Win32 (same as YAZ)
author
Adam Dickmeiss
<adam@indexdata.dk>
Thu, 17 Jan 2008 21:48:36 +0000
(21:48 +0000)
committer
Adam Dickmeiss
<adam@indexdata.dk>
Thu, 17 Jan 2008 21:48:36 +0000
(21:48 +0000)
win/makefile
patch
|
blob
|
history
diff --git
a/win/makefile
b/win/makefile
index
a65e64e
..
0bba74c
100644
(file)
--- a/
win/makefile
+++ b/
win/makefile
@@
-1,5
+1,5
@@
# Zebra makefile for MS NMAKE
# Zebra makefile for MS NMAKE
-# $Id: makefile,v 1.73 2008-01-17 14:01:45 adam Exp $
+# $Id: makefile,v 1.74 2008-01-17 21:48:36 adam Exp $
###########################################################
############### Parameters
###########################################################
############### Parameters
@@
-31,7
+31,7
@@
ZLIB_DIR = c:\zlib-1.2.3.win32
# ICU support
# get icu libraries from http://www.icu-project.org
# ICU support
# get icu libraries from http://www.icu-project.org
-HAVE_LIBICU=1
+HAVE_ICU=1
ICU_DIR=c:\icu
ICU_DIR=c:\icu
@@
-50,14
+50,14
@@
YAZINCL=$(YAZDIR)\include
YAZBINDIR=$(YAZDIR)\bin
!if $(DEBUG)
YAZLIB="$(YAZDIR)\lib\yaz3d.lib"
YAZBINDIR=$(YAZDIR)\bin
!if $(DEBUG)
YAZLIB="$(YAZDIR)\lib\yaz3d.lib"
-!if $(HAVE_LIBICU)
+!if $(HAVE_ICU)
YAZLIB=$(YAZLIB) "$(YAZDIR)\lib\yaz_icu3d.lib"
!endif
YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz3d.dll"
YAZ_DLL_TARGET="$(BINDIR)\yaz3d.dll"
!else
YAZLIB="$(YAZDIR)\lib\yaz3.lib"
YAZLIB=$(YAZLIB) "$(YAZDIR)\lib\yaz_icu3d.lib"
!endif
YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz3d.dll"
YAZ_DLL_TARGET="$(BINDIR)\yaz3d.dll"
!else
YAZLIB="$(YAZDIR)\lib\yaz3.lib"
-!if $(HAVE_LIBICU)
+!if $(HAVE_ICU)
YAZLIB=$(YAZLIB) "$(YAZDIR)\lib\yaz_icu3.lib"
!endif
YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz3.dll"
YAZLIB=$(YAZLIB) "$(YAZDIR)\lib\yaz_icu3.lib"
!endif
YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz3.dll"
@@
-200,7
+200,7
@@
libxslt:
!endif
!endif
-!if $(HAVE_LIBICU)
+!if $(HAVE_ICU)
ICU_DEF= /DYAZ_HAVE_ICU=1 /I"$(ICU_DIR)\include"
ICU_LIB= $(ICU_DIR)\lib\icudt.lib $(ICU_DIR)\lib\icuin.lib $(ICU_DIR)\lib\icuuc.lib
icu: $(BINDIR)\icudt38.dll $(BINDIR)\icuin38.dll $(BINDIR)\icuuc38.dll
ICU_DEF= /DYAZ_HAVE_ICU=1 /I"$(ICU_DIR)\include"
ICU_LIB= $(ICU_DIR)\lib\icudt.lib $(ICU_DIR)\lib\icuin.lib $(ICU_DIR)\lib\icuuc.lib
icu: $(BINDIR)\icudt38.dll $(BINDIR)\icuin38.dll $(BINDIR)\icuuc38.dll