X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=be3d740f41b7e46d8493cddaea18d59b694d63cb;hp=0acd26afd29a781824fed150cfa1c45dc76681f2;hb=bea56f1c828887f8b423c03ad5f6b1dd4d168bde;hpb=11d7c9b0b4942633b3509df2b40a8cdbbb98336b

diff --git a/win/makefile b/win/makefile
index 0acd26a..be3d740 100644
--- a/win/makefile
+++ b/win/makefile
@@ -52,19 +52,19 @@ YAZDIR=$(ROOTDIR)\..\yaz  # or \program files\yaz
 
 YAZBINDIR=$(YAZDIR)\bin
 !if $(DEBUG)
-YAZLIB="$(YAZDIR)\lib\yaz4d.lib"
+YAZLIB="$(YAZDIR)\lib\yaz5d.lib"
 !if $(HAVE_ICU)
-YAZLIB=$(YAZLIB) "$(YAZDIR)\lib\yaz_icu4d.lib"
+YAZLIB=$(YAZLIB) "$(YAZDIR)\lib\yaz_icu5d.lib"
 !endif
-YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz4d.dll"
-YAZ_DLL_TARGET="$(BINDIR)\yaz4d.dll"
+YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz5d.dll"
+YAZ_DLL_TARGET="$(BINDIR)\yaz5d.dll"
 !else
-YAZLIB="$(YAZDIR)\lib\yaz4.lib"
+YAZLIB="$(YAZDIR)\lib\yaz5.lib"
 !if $(HAVE_ICU)
-YAZLIB=$(YAZLIB) "$(YAZDIR)\lib\yaz_icu4.lib"
+YAZLIB=$(YAZLIB) "$(YAZDIR)\lib\yaz_icu5.lib"
 !endif
-YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz4.dll"
-YAZ_DLL_TARGET="$(BINDIR)\yaz4.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.
@@ -238,11 +238,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)           \
@@ -270,11 +269,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
@@ -302,10 +301,9 @@ MT=mt.exe /nologo
 MT=echo
 !endif
 
-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 \
+# 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
@@ -346,9 +344,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 
@@ -518,21 +516,15 @@ 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
@@ -557,7 +549,7 @@ $(DLL) $(IMPLIB): "$(BINDIR)" $(ZEBRALIB_OBJS) $(RES)
 		$(DLL_LINK_OPTIONS) \
 		$(ZEBRALIB_OBJS) \
 		$(RES) \
-		/out:$(DLL) \
+		/out:$@ \
 		$(YAZLIB) \
 		/implib:"$(IMPLIB)" \
 		/map:"$(LIBDIR)\idzebra.map"