Changeset 15545

Timestamp:

2008-05-16T15:11:40+12:00 (16 years ago)

Author:

mdewsnip

Message:

Some improvements for compiling with the Z39.50 client stuff included.

File:

• gsdl/trunk/src/recpt/win32.mak (modified) (3 diffs)

gsdl/trunk/src/recpt/win32.mak

@@ -63 +63 @@
 
 !IF $(USE_Z3950)
-DEFS = $(DEFS) -DUSE_Z3950
-Z3950EXEC = z3950server.exe
-Z3950OBJS = z3950proto.obj z3950proxy.obj  yaz_zclient.obj zparse.tab.obj zparse.yy.obj 
-Z_CLIENTOBJS = "$(YAZDIR)\win\obj\tabcomplete.obj"
-Z_LIBYAZ = "$(YAZDIR)\lib\yaz.lib"
-LDFLAGS = $(LDFLAGS) /link /NOD:msvcrt.lib
-!ELSE
-Z3950EXEC = 
-Z3950OBJS =
-Z_CLIENTOBJS =
-Z_LIBYAZ =
+Z3950_DEFS = -DUSE_Z3950
+Z3950_INCLUDES = -I$(Z3950_DIR)
+Z3950_LDFLAGS = /link /NOD:msvcrt.lib
+Z3950_LIBS = $(Z3950_DIR)\gsdlz3950.lib $(GSDL_DIR)\packages\yaz\yaz-2.1.4\lib\yaz.lib
+!ELSE
+Z3950_DEFS = 
+Z3950_INCLUDES = 
+Z3950_LDFLAGS = 
+Z3950_LIBS = 
 !ENDIF
 
@@ -79 +77 @@
 AR = lib
 CC = cl
-DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE -DGSDL_NOCACHE
+DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE -DGSDL_NOCACHE $(Z3950_DEFS)
 INCLUDES = -I. -I"$(GSDL_DIR)" -I"$(GSDL_DIR)\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \
     -I"$(INDEXERS_DIR)\mg" -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mgpp\text" \
     -I"$(GSDL_DIR)\packages\windows\crypt\crypt" -I"$(GSDL_DIR)\packages\windows\expat\expat" \
     -I"$(GSDL_DIR)\packages\windows\gdbm\gdbm" $(Z3950_INCLUDES)
-LDFLAGS = 
+LDFLAGS = $(Z3950_LDFLAGS)
 LIBS = "$(GSDL_DIR)\packages\windows\crypt\crypt\crypt.lib" "$(GSDL_DIR)\packages\windows\expat\expat\libexpat.lib" \
         "$(GSDL_DIR)\packages\windows\gdbm\gdbm\gdbm.lib" $(ACCENTFOLD_LIBS) $(Z3950_LIBS)
@@ -98 +96 @@
 
 COMPILE = $(CC) -nologo -c $(CPPFLAGS) $(DEFS) $(INCLUDES)
-LINK = $(CC) -nologo -Fe"$@" 
+LINK = $(CC) -nologo -Fe"$@" $(LDFLAGS)