X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=836c860efc569e8ade61e4e884ad3df69b2e1c97;hp=2f79a7250fca2b95d2ad895f1fc69ea7e68b4669;hb=427ca5f986a5c3db226476fa46e5f89fba346ef6;hpb=a02be6c13a7353e7b2fba65a1faab1c6819d1728

diff --git a/win/makefile b/win/makefile
index 2f79a72..836c860 100644
--- a/win/makefile
+++ b/win/makefile
@@ -5,9 +5,11 @@
 ###########################################################
 
 DEBUG=0   # 0 for release, 1 for debug
+USE_MANIFEST = 1
 
 # TCL is optional - ONLY needed for source straight from Git
-TCL="C:\Tcl\bin\tclsh85.exe"
+TCL=tclsh
+#TCL="C:\Tcl\bin\tclsh85.exe"
 HAVE_TCL=1
 
 # EXPAT is optional. It's required for grs.xml-filters.
@@ -20,11 +22,11 @@ ICONV_DIR=c:\iconv-1.9.2.win32
 
 # libxslt. For mod_dom and mod_alvis
 HAVE_LIBXSLT=1
-LIBXSLT_DIR=c:\libxslt-1.1.24.win32
+LIBXSLT_DIR=c:\libxslt-1.1.26.win32
 
 # libxml2. Used by libxslt
 HAVE_LIBXML2=1
-LIBXML2_DIR=c:\libxml2-2.7.1.win32
+LIBXML2_DIR=c:\libxml2-2.7.6.win32
 
 # zlib compression.  Used by libxml2
 ZLIB_DIR = c:\zlib-1.2.3.win32
@@ -51,19 +53,19 @@ YAZDIR=$(ROOTDIR)\..\yaz  # or \program files\yaz
 
 YAZBINDIR=$(YAZDIR)\bin
 !if $(DEBUG)
-YAZLIB="$(YAZDIR)\lib\yaz3d.lib"
+YAZLIB="$(YAZDIR)\lib\yaz5d.lib"
 !if $(HAVE_ICU)
-YAZLIB=$(YAZLIB) "$(YAZDIR)\lib\yaz_icu3d.lib"
+YAZLIB=$(YAZLIB) "$(YAZDIR)\lib\yaz_icu5d.lib"
 !endif
-YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz3d.dll"
-YAZ_DLL_TARGET="$(BINDIR)\yaz3d.dll"
+YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz5d.dll"
+YAZ_DLL_TARGET="$(BINDIR)\yaz5d.dll"
 !else
-YAZLIB="$(YAZDIR)\lib\yaz3.lib"
+YAZLIB="$(YAZDIR)\lib\yaz5.lib"
 !if $(HAVE_ICU)
-YAZLIB=$(YAZLIB) "$(YAZDIR)\lib\yaz_icu3.lib"
+YAZLIB=$(YAZLIB) "$(YAZDIR)\lib\yaz_icu5.lib"
 !endif
-YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz3.dll"
-YAZ_DLL_TARGET="$(BINDIR)\yaz3.dll"
+YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz5.dll"
+YAZ_DLL_TARGET="$(BINDIR)\yaz5.dll"
 !endif
 
 # BZIP2 settings. Uncomment and specify if you wish to use LIBBZIP2.
@@ -203,14 +205,14 @@ libxslt:
 !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)\icudt40.dll $(BINDIR)\icuin40.dll $(BINDIR)\icuuc40.dll
-
-$(BINDIR)\icudt40.dll:
-	  copy "$(ICU_DIR)\bin\icudt40.dll" $(BINDIR)
-$(BINDIR)\icuin40.dll:
-	  copy "$(ICU_DIR)\bin\icuin40.dll" $(BINDIR)
-$(BINDIR)\icuuc40.dll:
-	  copy "$(ICU_DIR)\bin\icuuc40.dll" $(BINDIR)
+icu: $(BINDIR)\icudt42.dll $(BINDIR)\icuin42.dll $(BINDIR)\icuuc42.dll
+
+$(BINDIR)\icudt42.dll:
+	  copy "$(ICU_DIR)\bin\icudt42.dll" $(BINDIR)
+$(BINDIR)\icuin42.dll:
+	  copy "$(ICU_DIR)\bin\icuin42.dll" $(BINDIR)
+$(BINDIR)\icuuc42.dll:
+	  copy "$(ICU_DIR)\bin\icuuc42.dll" $(BINDIR)
 !else
 ICU_DEF=  /DYAZ_HAVE_ICU=0
 ICU_LIB=
@@ -237,11 +239,10 @@ MOD_DOM_CFLAGS=
 
 COMMON_C_OPTIONS=          \
   /nologo /W3 /EHsc /FD /c \
-  /D "WIN32"               \
-  /D"_CONSOLE" /D"_MBCS"   \
   /DYAZ_USE_NEW_LOG=1      \
   /D"_CRT_SECURE_NO_DEPRECATE" \
   /D"_CRT_NONSTDC_NO_DEPRECATE" \
+  /D "WIN32"               \
   $(ICONV_DEF)             \
   $(EXPAT_DEF)             \
   $(LIBXML2_DEF)           \
@@ -269,11 +270,11 @@ COMMON_C_INCLUDES= \
   $(BZIP2INCLUDE)
 
 DEBUG_C_OPTIONS=  \
-  /D "_DEBUG"      \
-  /MDd  /Od /YX /Zi /Gm
+  /D "_DEBUG"     \
+  /MDd /Od /Zi /Gm
 
-RELEASE_C_OPTIONS=  \
-  /D "NDEBUG"        \
+RELEASE_C_OPTIONS= \
+  /D "NDEBUG"      \
   /MD /O2
 
 # /W3  = warning level
@@ -295,10 +296,15 @@ RELEASE_C_OPTIONS=  \
 ### Linker options
 LINK=link.exe
 
-LINK_LIBS= kernel32.lib user32.lib   gdi32.lib   winspool.lib \
-           comdlg32.lib advapi32.lib shell32.lib ole32.lib    \
-           oleaut32.lib uuid.lib     odbc32.lib  odbccp32.lib \
-           wsock32.lib  advapi32.lib \
+!if $(USE_MANIFEST)
+MT=mt.exe /nologo
+!else
+MT=echo
+!endif
+
+# wsock32.lib  advapi32.lib \
+
+LINK_LIBS= kernel32.lib advapi32.lib \
 	   $(ICONV_LIB) $(EXPAT_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB) $(ICU_LIB)
 
 COMMON_LNK_OPTIONS= /nologo /machine:i386 /incremental:no
@@ -339,9 +345,9 @@ LINK_PROGRAM= $(LINK) \
 # Generated sources
 generate: $(INCLDIR)\idzebra\version.h
 
-$(INCLDIR)\idzebra\version.h:
+$(INCLDIR)\idzebra\version.h: $(ROOTDIR)/IDMETA 
 	@cd $(ROOTDIR)\util
-	$(TCL) mk_version.tcl $(ROOTDIR)/configure.ac $(INCLDIR)\idzebra\version.h
+	$(TCL) mk_version.tcl $(ROOTDIR)/IDMETA $(INCLDIR)\idzebra\version.h
 
 # Source and object modules
 # Note: Ordinary source files are not specified here at 
@@ -511,19 +517,16 @@ ZEBRALIB_OBJS= \
 # Linking
 
 $(ZSERVER) : "$(BINDIR)" $(ZSERVER_OBJS) $(IMPLIB)
-	$(LINK_PROGRAM) \
-		$(ZSERVER_OBJS) \
-		/out:$(ZSERVER)
+	$(LINK_PROGRAM) $(ZSERVER_OBJS)  /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(ZEBRAIDX) : "$(BINDIR)" $(ZEBRAIDX_OBJS) $(IMPLIB)
-	$(LINK_PROGRAM) \
-		$(ZEBRAIDX_OBJS) \
-		/out:$(ZEBRAIDX)
+	$(LINK_PROGRAM) $(ZEBRAIDX_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(TSTFLOCK) : "$(BINDIR)" $(TSTFLOCK_OBJS) $(IMPLIB)
-	$(LINK_PROGRAM) \
-		$(TSTFLOCK_OBJS) \
-		/out:$(TSTFLOCK) 
+	$(LINK_PROGRAM) $(TSTFLOCK_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 # Resources
 RES=$(OBJDIR)\zebra.res
@@ -547,10 +550,11 @@ $(DLL) $(IMPLIB): "$(BINDIR)" $(ZEBRALIB_OBJS) $(RES)
 		$(DLL_LINK_OPTIONS) \
 		$(ZEBRALIB_OBJS) \
 		$(RES) \
-		/out:$(DLL) \
+		/out:$@ \
 		$(YAZLIB) \
 		/implib:"$(IMPLIB)" \
-		/map:"$(LIBDIR)\idzebra.map" \
+		/map:"$(LIBDIR)\idzebra.map" 
+	$(MT) -manifest $@.manifest -outputresource:$@;2
 
 # Other rules