From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 23 May 2003 10:41:26 +0000 (+0000)
Subject: WIN32 updates
X-Git-Tag: YAZ.2.0.3~43
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=7aa202b31ec22a71d9c66f4602bf5ec60785c754;p=yaz-moved-to-github.git

WIN32 updates
---

diff --git a/client/admin.c b/client/admin.c
index 2e8c39b..5756ad1 100644
--- a/client/admin.c
+++ b/client/admin.c
@@ -2,7 +2,7 @@
  * Copyright (c) 1995-2003, Index Data
  * See the file LICENSE for details.
  *
- * $Id: admin.c,v 1.16 2003-03-11 11:07:47 adam Exp $
+ * $Id: admin.c,v 1.17 2003-05-23 10:41:26 adam Exp $
  */
 
 #include <stdio.h>
@@ -260,7 +260,7 @@ int cmd_adm_import(const char *arg)
     return 2;
 }
 #else
-int cmd_adm_import(char *arg)
+int cmd_adm_import(const char *arg)
 {
     printf ("not available on WIN32\n");
     return 0;
diff --git a/win/makefile b/win/makefile
index acf94db..ecf69bc 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,6 +1,6 @@
 # Copyright (C) 1994-2003, Index Data
 # All rights reserved.
-# $Id: makefile,v 1.55 2003-02-18 21:27:53 adam Exp $
+# $Id: makefile,v 1.56 2003-05-23 10:41:26 adam Exp $
 #
 # Programmed by
 #  HL: Heikki Levanto, Index Data
@@ -10,11 +10,11 @@
 ############### Parameters 
 ###########################################################
 
-DEBUG=0   # 0 for release, 1 for debug
+DEBUG=1   # 0 for release, 1 for debug
 
 # TCL
-#TCL="C:\Tcl\bin\tclsh83.exe"
-TCL="C:\Program Files\Tcl\bin\tclsh83.exe"
+TCL="C:\Tcl\bin\tclsh84.exe"
+#TCL="C:\Program Files\Tcl\bin\tclsh83.exe"
 HAVE_TCL=1
 
 # iconv charcter conversion utility
@@ -334,6 +334,7 @@ YAZ_ODR_OBJS= \
    $(OBJDIR)\odr_util.obj 
 
 YAZ_UTIL_OBJS= \
+   $(OBJDIR)\version.obj \
    $(OBJDIR)\atoin.obj \
    $(OBJDIR)\log.obj \
    $(OBJDIR)\marcdisp.obj \
@@ -423,9 +424,9 @@ COMMON_YAZ_OBJS= \
    $(YAZ_CQL_OBJS)
 
 YAZ_OBJS= \
+	$(COMMON_YAZ_OBJS) \
 	$(Z3950_OBJS) \
-	$(ILL_OBJS) \
-	$(COMMON_YAZ_OBJS)
+	$(ILL_OBJS)
 
 DLL_OBJS= $(YAZ_OBJS)
 
@@ -928,7 +929,10 @@ $(ILL_OBJS): $(ILL_CORE_FILES) $(ITEM_REQ_FILES)
 ###########################################################
 #
 # $Log: makefile,v $
-# Revision 1.55  2003-02-18 21:27:53  adam
+# Revision 1.56  2003-05-23 10:41:26  adam
+# WIN32 updates
+#
+# Revision 1.55  2003/02/18 21:27:53  adam
 # CQL w/bison on WIN32
 #
 # Revision 1.54  2003/02/18 09:11:50  adam