Changeset 15522

Show
Ignore:
Timestamp:
16.05.2008 10:31:05 (11 years ago)
Author:
mdewsnip
Message:

A few consistency improvements to the win32.mak file.

Files:
1 modified

Legend:

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

    r15519 r15522  
    66# University of Waikato, New Zealand. 
    77# 
    8 # Copyright (C) 1999  The New Zealand Digital Library Project 
     8# Copyright (C) 1999-2008  The New Zealand Digital Library Project 
    99# 
    1010# 
     
    2525########################################################################### 
    2626 
    27 GSDLHOME = ..\.. 
     27GSDL_DIR = ..\.. 
     28INDEXERS_DIR = $(GSDL_DIR)\indexers 
     29 
     30 
    2831GSDL_VC4 = 0 
    2932DLL = 0 
    3033DLLDEBUG = 0 
    31 STLPATH = "$(GSDLHOME)\packages\windows\stlport\stlport" 
     34STLPATH = "$(GSDL_DIR)\packages\windows\stlport\stlport" 
    3235 
    3336 
     
    5053CC = cl 
    5154DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -DXML_STATIC -D_CRT_SECURE_NO_DEPRECATE 
    52 INCLUDES = -I"$(GSDLHOME)" -I"$(GSDLHOME)\lib" -I"$(GSDLHOME)\src\colservr" \ 
    53        -I"$(GSDLHOME)\indexers\mg" \ 
    54        -I"$(GSDLHOME)\indexers\mg\lib" -I"$(GSDLHOME)\indexers\mg\src\text" \ 
    55        -I"$(GSDLHOME)\packages\windows\gdbm\gdbm" \ 
    56            -I"$(GSDLHOME)\indexers\mgpp\lib" -I"$(GSDLHOME)\indexers\mgpp\text" \ 
    57            -I"$(GSDLHOME)\packages\windows\expat\expat" 
     55# Do NOT add the "recpt" directory here: the colserver should be independent of the receptionist! 
     56INCLUDES = -I"$(GSDL_DIR)" -I"$(GSDL_DIR)\lib" \ 
     57    -I"$(INDEXERS_DIR)\mg" -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mg\src\text" \ 
     58    -I"$(INDEXERS_DIR)\mgpp\lib" -I"$(INDEXERS_DIR)\mgpp\text" \ 
     59    -I"$(GSDL_DIR)\packages\expat\include" -I"$(GSDL_DIR)\packages\windows\gdbm\gdbm" 
    5860 
    5961!IF $(GSDL_VC4)