Changeset 15568

Show
Ignore:
Timestamp:
19.05.2008 12:55:36 (11 years ago)
Author:
mdewsnip
Message:

A couple of fixes to Windows compilation of the Z39.50 client (part of the receptionist).

Location:
gsdl/trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/src/recpt/win32.mak

    r15546 r15568  
    6666Z3950_DEFS = -DUSE_Z3950 
    6767Z3950_INCLUDES = -I$(Z3950_DIR) 
    68 Z3950_LDFLAGS = /link /NOD:msvcrt.lib 
    6968Z3950_LIBS = $(Z3950_DIR)\gsdlz3950.lib $(PACKAGES_DIR)\yaz\yaz-2.1.4\lib\yaz.lib 
    7069!ELSE 
    7170Z3950_DEFS =  
    7271Z3950_INCLUDES =  
    73 Z3950_LDFLAGS =  
    7472Z3950_LIBS =  
    7573!ENDIF 
     
    8381    -I"$(PACKAGES_DIR)\windows\crypt\crypt" -I"$(PACKAGES_DIR)\windows\expat\expat" \ 
    8482    -I"$(PACKAGES_DIR)\windows\gdbm\gdbm" $(Z3950_INCLUDES) 
    85 LDFLAGS = $(Z3950_LDFLAGS) 
     83LDFLAGS =  
    8684LIBS = "$(PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \ 
    8785        "$(PACKAGES_DIR)\windows\gdbm\gdbm\gdbm.lib" $(ACCENTFOLD_LIBS) $(Z3950_LIBS) 
  • gsdl/trunk/win32.mak

    r15516 r15568  
    6060!IF $(USE_Z3950) 
    6161MAKECMD = $(MAKECMD) USE_Z3950=1 
    62 OTHERDIRS = packages\d2m $(OTHERDIRS)  
     62OTHERDIRS = packages\d2m $(OTHERDIRS) src\z3950 
    6363YAZ_DIRS = $(YAZ_DIR) 
    6464!ENDIF