Changeset 11257


Ignore:
Timestamp:
2006-02-15T14:46:57+13:00 (18 years ago)
Author:
mdewsnip
Message:

Removed the USE_STLPORT option -- use GSDL_VC4 instead.

Location:
trunk/gsdl
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/gsdl/lib/win32.mak

    r11256 r11257  
    2727GSDLHOME = ..
    2828GSDL_VC4 = 0
    29 USE_STLPORT = 0
    3029LOCAL_LIBRARY = 0
    3130DLL = 0
    … …  
    5352       -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE
    5453INCLUDES = -I"$(GSDLHOME)" -I"$(GSDLHOME)\packages\mg\lib"
    55 !IF $(USE_STLPORT)
     54!IF $(GSDL_VC4)
    5655DEFS = $(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS
    5756INCLUDES = $(INCLUDES) -I$(STLPATH)

  • trunk/gsdl/src/colservr/win32.mak

    r11256 r11257  
    2727GSDLHOME = ..\..
    2828GSDL_VC4 = 0
    29 USE_STLPORT = 0
    3029DLL = 0
    3130DLLDEBUG = 0
    … …  
    5958           -I"$(GSDLHOME)\packages\windows\expat\expat"
    6059
    61 !IF $(USE_STLPORT)
     60!IF $(GSDL_VC4)
    6261DEFS=$(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS
    6362INCLUDES = $(INCLUDES) -I$(STLPATH)

  • trunk/gsdl/src/db2txt/win32.mak

    r11256 r11257  
    2727GSDLHOME = ..\..
    2828GSDL_VC4 = 0
    29 USE_STLPORT = 0
    3029STLPATH = "$(GSDLHOME)\packages\windows\stlport\stlport"
    3130
    … …  
    4443INCLUDES = -I"$(GSDLHOME)\src\db2txt" -I"$(GSDLHOME)\lib" -I"$(GSDLHOME)\packages\mg\lib" \
    4544       -I"$(GSDLHOME)\packages\windows\gdbm\gdbm"
    46 !IF $(USE_STLPORT)
     45!IF $(GSDL_VC4)
    4746DEFS=$(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS
    4847INCLUDES = $(INCLUDES) -I$(STLPATH)

  • trunk/gsdl/src/mgpp/lib/WIN32.MAK

    r11256 r11257  
    2727GSDLHOME = ..\..\..
    2828GSDL_VC4 = 0
    29 USE_STLPORT = 0
    3029DLL = 0
    3130DLLDEBUG = 0
    … …  
    5049DEFS = -DSHORT_SUFFIX -DSILENT -DHAVE_CONFIG_H -D__WIN32__ -D_CRT_SECURE_NO_DEPRECATE
    5150INCLUDES = -I"$(GSDLHOME)"
    52 !IF $(USE_STLPORT)
     51!IF $(GSDL_VC4)
    5352DEFS = $(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS
    5453INCLUDES = $(INCLUDES) -I$(STLPATH)

  • trunk/gsdl/src/mgpp/text/WIN32.MAK

    r11256 r11257  
    2727GSDLHOME = ..\..\..
    2828GSDL_VC4 = 0
    29 USE_STLPORT = 0
    3029DLL = 0
    3130DLLDEBUG = 0
    … …  
    5049DEFS = -DSHORT_SUFFIX -DSILENT -DHAVE_CONFIG_H -D__WIN32__ -D__STDC__ -D__GNU_LIBRARY__ -D__MSDOS__ -D_CRT_SECURE_NO_DEPRECATE
    5150INCLUDES = -I"$(GSDLHOME)\src\mgpp\lib" -I"$(GSDLHOME)"
    52 !IF $(USE_STLPORT)
     51!IF $(GSDL_VC4)
    5352DEFS = $(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS
    5453INCLUDES = $(INCLUDES) -I$(STLPATH)

  • trunk/gsdl/src/oaiservr/win32.mak

    r11256 r11257  
    2727GSDLHOME = ..\..
    2828GSDL_VC4 = 0
    29 USE_STLPORT = 0
    3029DLL = 0
    3130DLLDEBUG = 0
    … …  
    6059       -I"$(GSDLHOME)\packages\windows\crypt\crypt" -I"$(GSDLHOME)\src\mgpp\lib" \
    6160       -I"$(GSDLHOME)\src\mgpp\text" -I"$(GSDLHOME)"
    62 !IF $(USE_STLPORT)
     61!IF $(GSDL_VC4)
    6362DEFS = $(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS
    6463INCLUDES = $(INCLUDES) -I$(STLPATH)

  • trunk/gsdl/src/phind/generate/win32.mak

    r11256 r11257  
    2727GSDLHOME = ..\..\..
    2828GSDL_VC4 = 0
    29 USE_STLPORT = 0
    3029STLPATH = "$(GSDLHOME)\packages\windows\stlport\stlport"
    3130
    … …  
    4241DEFS = -D__WIN32__
    4342INCLUDES =
    44 !IF $(USE_STLPORT)
     43!IF $(GSDL_VC4)
    4544DEFS = $(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS -D_CRT_SECURE_NO_DEPRECATE
    4645INCLUDES = $(INCLUDES) -I$(STLPATH)

  • trunk/gsdl/src/recpt/win32.mak

    r11256 r11257  
    2727GSDLHOME = ..\..
    2828GSDL_VC4 = 0
    29 USE_STLPORT = 0
    3029LOCAL_LIBRARY = 0
    3130USE_Z3950 = 0
    … …  
    6261       -I"$(GSDLHOME)\packages\windows\crypt\crypt" -I"$(GSDLHOME)\src\mgpp\lib" \
    6362       -I"$(GSDLHOME)\src\mgpp\text" -I"$(GSDLHOME)"
    64 !IF $(USE_STLPORT)
     63!IF $(GSDL_VC4)
    6564DEFS = $(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS
    6665INCLUDES = $(INCLUDES) -I$(STLPATH)

  • trunk/gsdl/src/txt2db/win32.mak

    r11256 r11257  
    2727GSDLHOME = ..\..
    2828GSDL_VC4 = 0
    29 USE_STLPORT = 0
    3029STLPATH = "$(GSDLHOME)\packages\windows\stlport\stlport"
    3130
    … …  
    4443INCLUDES = -I"$(GSDLHOME)\src\txt2db" -I"$(GSDLHOME)\lib" -I"$(GSDLHOME)\packages\mg\lib" \
    4544       -I"$(GSDLHOME)\packages\windows\gdbm\gdbm"
    46 !IF $(USE_STLPORT)
     45!IF $(GSDL_VC4)
    4746DEFS=$(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS
    4847INCLUDES = $(INCLUDES) -I$(STLPATH)

  • trunk/gsdl/src/w32server/win32.mak

    r11256 r11257  
    2727GSDLHOME = ..\..
    2828GSDL_VC4 = 0
    29 USE_STLPORT = 0
    3029STLPATH = "$(GSDLHOME)\packages\windows\stlport\stlport"
    3130
    … …  
    4746       -I"$(GSDLHOME)\packages\mg\lib" -I"$(GSDLHOME)\packages\mg\src\text" \
    4847       -I"$(GSDLHOME)\src\mgpp\lib" -I"$(GSDLHOME)\src\mgpp\text" -I"$(GSDLHOME)"
    49 !IF $(USE_STLPORT)
     48!IF $(GSDL_VC4)
    5049DEFS = $(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS
    5150INCLUDES = $(INCLUDES) -I$(STLPATH)

  • trunk/gsdl/win32.mak

    r11256 r11257  
    2727GSDLHOME = $(MAKEDIR)
    2828GSDL_VC4 = 0
    29 USE_STLPORT = 0
    3029LOCAL_LIBRARY = 0
    3130DLL = 0
    … …  
    4140
    4241MAKECMD = $(MAKE) $(MDEFINES) GSDLHOME="$(GSDLHOME)"
    43 !IF $(USE_STLPORT)
    44 MAKECMD = $(MAKECMD) USE_STLPORT=1
     42!IF $(GSDL_VC4)
     43MAKECMD = $(MAKECMD) GSDL_VC4=1
    4544!ENDIF
    4645!IF $(LOCAL_LIBRARY)
Note: See TracChangeset for help on using the changeset viewer.