projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 1.8.8
[pazpar2-moved-to-github.git]
/
win
/
makefile
diff --git
a/win/makefile
b/win/makefile
index
0eb4cca
..
f3998ea
100644
(file)
--- a/
win/makefile
+++ b/
win/makefile
@@
-5,7
+5,7
@@
DEBUG=0 # 0 for release, 1 for debug
USE_MANIFEST = 0 # Can be enabled Visual Studio 2005/2008
PACKAGE_NAME=pazpar2
DEBUG=0 # 0 for release, 1 for debug
USE_MANIFEST = 0 # Can be enabled Visual Studio 2005/2008
PACKAGE_NAME=pazpar2
-PACKAGE_VERSION=1.8.4
+PACKAGE_VERSION=1.8.8
# YAZ
YAZ_DIR=..\..\yaz
# YAZ
YAZ_DIR=..\..\yaz
@@
-17,6
+17,8
@@
LIBXSLT_DIR=\libxslt-1.1.28.win32
# ICU
HAVE_ICU=1
ICU_DIR=c:\icu
# ICU
HAVE_ICU=1
ICU_DIR=c:\icu
+ICU_LIB=$(ICU_DIR)\lib
+ICU_INCLUDE=$(ICU_DIR)\include
default: all
default: all
@@
-92,13
+94,13
@@
LIBXSLT_LIB = \
"$(LIBXSLT_DIR)\lib\libxslt.lib"
!if $(HAVE_ICU)
"$(LIBXSLT_DIR)\lib\libxslt.lib"
!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)\lib64\icuuc.lib
+ICU_DEF=/DYAZ_HAVE_ICU=1 /I"$(ICU_INCLUDE)"
+ICU_LIBS= $(ICU_LIB)\icudt.lib \
+ $(ICU_LIB)\icuin.lib \
+ $(ICU_LIB)\icuuc.lib
!else
ICU_DEF=/DYAZ_HAVE_ICU=0
!else
ICU_DEF=/DYAZ_HAVE_ICU=0
-ICU_LIB=
+ICU_LIBS=
!endif
COMMON_C_OPTIONS= \
!endif
COMMON_C_OPTIONS= \
@@
-148,7
+150,7
@@
RELEASE_C_OPTIONS= \
LINK=link.exe
LINK_LIBS= kernel32.lib ws2_32.lib advapi32.lib \
LINK=link.exe
LINK_LIBS= kernel32.lib ws2_32.lib advapi32.lib \
- $(YAZ_LIB) $(ICU_LIB) $(LIBXSLT_LIB)
+ $(YAZ_LIB) $(ICU_LIBS) $(LIBXSLT_LIB)
COMMON_LNK_OPTIONS= /nologo /subsystem:windows /incremental:no
COMMON_LNK_OPTIONS= /nologo /subsystem:windows /incremental:no