Changeset 19521 for gsdl


Ignore:
Timestamp:
2009-05-19T16:54:40+12:00 (15 years ago)
Author:
ak19
Message:

Dr Bainbridge updated the Windows makefiles to 1. Take the DEBUG flag so that we can recompile all of GS2 in the Vis C++ 2005 Express Edition command prompt and then use its Debugger on the C code. 2. Now GS2 make clean command cleans up all object and lib files that its make generates.

Location:
gsdl/trunk/runtime-src
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • gsdl/trunk/runtime-src/packages/d2m/win32.mak

    r16574 r19521  
    1010AR = lib
    1111
     12DEBUG = 0
    1213DLL = 0
    1314DLLDEBUG = 0
    1415
     16!IF $(DEBUG)
     17CXXFLAGS = -DEBUG -Z7 /errorReport:prompt
     18!ELSE
     19CXXFLAGS =
     20!ENDIF
     21
    1522!IF $(GSDL_VC4)
    16 CPPFLAGS = -GX
     23CXXFLAGS = $(CXXFLAGS) -GX
    1724!ELSE
    18 CPPFLAGS = -EHsc
     25CXXFLAGS = $(CXXFLAGS) -EHsc
    1926!ENDIF
    2027
    2128!IF $(DLL)
    22 CPPFLAGS = $(CPPFLAGS) -MD
     29CXXFLAGS = $(CXXFLAGS) -MD
    2330!ELSE
    2431!IF ($(DLLDEBUG))
    25 CPPFLAGS = $(CPPFLAGS) -MDd
     32CXXFLAGS = $(CXXFLAGS) -MDd
    2633!ENDIF
    2734!ENDIF
    … …  
    3138DEFS=-DHAVE_CONFIG_H -D__WIN32__ -D_CRT_SECURE_NO_DEPRECATE
    3239INCLUDES= -I"$(GSDLHOME)"
    33 COMPILE = $(CC) -nologo -c $(CPPFLAGS) $(DEFS) $(INCLUDES)
     40COMPILE = $(CC) -nologo -c $(CXXFLAGS) $(DEFS) $(INCLUDES)
    3441
    3542LIB_OBJS = MARC2709$o MARCtidy$o usMARC$o util$o strcasecmp$o

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

    r18077 r19521  
    3434
    3535GSDL_VC4 = 0
     36DEBUG = 0
    3637DLL = 0
    3738DLLDEBUG = 0
    … …  
    3940USE_MSSQL = 0
    4041
     42!IF $(DEBUG)
     43CXXFLAGS = -DEBUG -Z7 /errorReport:prompt
     44!ELSE
     45CXXFLAGS =
     46!ENDIF
     47
    4148
    4249!IF $(GSDL_VC4)
    43 CPPFLAGS = -GX
     50CXXFLAGS = $(CXXFLAGS) -GX
    4451!ELSE
    45 CPPFLAGS = -EHsc
     52CXXFLAGS = $(CXXFLAGS) -EHsc
    4653!ENDIF
    4754
    4855!IF $(DLL)
    49 CPPFLAGS = $(CPPFLAGS) -MD
     56CXXFLAGS = $(CXXFLAGS) -MD
    5057!ELSE
    5158!IF ($(DLLDEBUG))
    52 CPPFLAGS = $(CPPFLAGS) -MDd
     59CXXFLAGS = $(CXXFLAGS) -MDd
    5360!ENDIF
    5461!ENDIF
    … …  
    8693
    8794
    88 COMPILE = $(CC) -nologo -c $(CPPFLAGS) $(DEFS) $(INCLUDES)
     95COMPILE = $(CC) -nologo -c $(CXXFLAGS) $(DEFS) $(INCLUDES)
    8996
    9097

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

    r18864 r19521  
    3838
    3939GSDL_VC4 = 0
     40DEBUG = 0
    4041LOCAL_LIBRARY = 0
    4142DLL = 0
    … …  
    4445USE_SQLITE = 1
    4546
     47!IF $(DEBUG)
     48CXXFLAGS = -DEBUG -Z7 /errorReport:prompt
     49!ELSE
     50CXXFLAGS =
     51!ENDIF
    4652
    4753!IF $(GSDL_VC4)
    48 CPPFLAGS = -GX
     54CXXFLAGS = $(CXXFLAGS) -GX
    4955!ELSE
    50 CPPFLAGS = -EHsc
     56CXXFLAGS = $(CXXFLAGS) -EHsc
    5157!ENDIF
    5258
    5359!IF $(DLL)
    54 CPPFLAGS = $(CPPFLAGS) -MD
     60CXXFLAGS = $(CXXFLAGS) -MD
    5561!ELSE
    5662!IF ($(DLLDEBUG))
    57 CPPFLAGS = $(CPPFLAGS) -MDd
     63CXXFLAGS = $(CXXFLAGS) -MDd
    5864!ENDIF
    5965!ENDIF
    … …  
    9399
    94100
    95 COMPILE = $(CC) -nologo -c $(CPPFLAGS) $(DEFS) $(INCLUDES)
     101COMPILE = $(CC) -nologo -c $(CXXFLAGS) $(DEFS) $(INCLUDES)
    96102LINK = $(CC) -nologo -Fe"$@"
    97103

  • gsdl/trunk/runtime-src/src/protocol/win32.mak

    r18048 r19521  
    3535
    3636GSDL_VC4 = 0
     37DEBUG = 0
    3738DLL = 0
    3839DLLDEBUG = 0
    3940
     41!IF $(DEBUG)
     42CXXFLAGS = -DEBUG -Z7 /errorReport:prompt
     43!ELSE
     44CXXFLAGS =
     45!ENDIF
    4046
    4147!IF $(GSDL_VC4)
    42 CPPFLAGS = -GX
     48CXXFLAGS = $(CXXFLAGS) -GX
    4349!ELSE
    44 CPPFLAGS = -EHsc
     50CXXFLAGS = $(CXXFLAGS) -EHsc
    4551!ENDIF
    4652
    4753!IF $(DLL)
    48 CPPFLAGS = $(CPPFLAGS) -MD
     54CXXFLAGS = $(CXXFLAGS) -MD
    4955!ELSE
    5056!IF ($(DLLDEBUG))
    51 CPPFLAGS = $(CPPFLAGS) -MDd
     57CXXFLAGS = $(CXXFLAGS) -MDd
    5258!ENDIF
    5359!ENDIF
    … …  
    6773
    6874
    69 COMPILE = $(CC) -nologo -c $(CPPFLAGS) $(DEFS) $(INCLUDES)
     75COMPILE = $(CC) -nologo -c $(CXXFLAGS) $(DEFS) $(INCLUDES)
    7076
    7177

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

    r18612 r19521  
    4040LOCAL_LIBRARY = 0
    4141USE_Z3950 = 0
     42DEBUG = 0
    4243DLL = 0
    4344DLLDEBUG = 0
    … …  
    4546USE_SQLITE = 1
    4647
     48!IF $(DEBUG)
     49CXXFLAGS = -DEBUG -Z7 /errorReport:prompt
     50!ELSE
     51CXXFLAGS =
     52!ENDIF
    4753
    4854!IF $(GSDL_VC4)
    49 CPPFLAGS = -GX
    50 !ELSE
    51 CPPFLAGS = -EHsc
     55CXXFLAGS = $(CXXFLAGS) -GX
     56!ELSE
     57CXXFLAGS = $(CXXFLAGS) -EHsc
    5258!ENDIF
    5359
    5460!IF $(DLL)
    55 CPPFLAGS = $(CPPFLAGS) -MD
     61CXXFLAGS = $(CXXFLAGS) -MD
    5662!ELSE
    5763!IF ($(DLLDEBUG))
    58 CPPFLAGS = $(CPPFLAGS) -MDd
     64CXXFLAGS = $(CXXFLAGS) -MDd
    5965!ENDIF
    6066!ENDIF
    … …  
    105111
    106112
    107 COMPILE = $(CC) -nologo -c $(CPPFLAGS) $(DEFS) $(INCLUDES)
     113COMPILE = $(CC) -nologo -c $(CXXFLAGS) $(DEFS) $(INCLUDES)
    108114LINK = $(CC) -nologo -Fe"$@" $(LDFLAGS)
    109115

  • gsdl/trunk/runtime-src/src/w32apachectl/win32.mak

    r19345 r19521  
    4545GSDL_VC4 = 0
    4646LOCAL_LIBRARY = 0
     47DEBUG = 0
    4748DLL = 0
    4849DLLDEBUG = 0
    4950
     51!IF $(DEBUG)
     52CXXFLAGS = -DEBUG -Z7 /errorReport:prompt
     53!ELSE
     54CXXFLAGS =
     55!ENDIF
    5056
    5157!IF $(GSDL_VC4)
    52 CPPFLAGS = -GX
     58CXXFLAGS = $(CXXFLAGS) -GX
    5359!ELSE
    54 CPPFLAGS = -EHsc
     60CXXFLAGS = $(CXXFLAGS) -EHsc
    5561!ENDIF
    5662
    57 CPPFLAGS = $(CPPFLAGS) -MT
     63CXXFLAGS = $(CXXFLAGS) -MT
    5864
    5965CC = cl
    … …  
    7379
    7480
    75 COMPILE = $(CC) -nologo -c $(CPPFLAGS) $(DEFS) $(INCLUDES)
     81COMPILE = $(CC) -nologo -c $(CXXFLAGS) $(DEFS) $(INCLUDES)
    7682LINK = $(CC) -nologo $(LDFLAGS) -Fe"$@"
    7783

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

    r18077 r19521  
    3838
    3939GSDL_VC4 = 0
     40DEBUG = 0
    4041ENABLE_ACCENTFOLD = 1
    4142USE_SQLITE = 1
    4243
     44!IF $(DEBUG)
     45CXXFLAGS = -DEBUG -Z7 /errorReport:prompt
     46LDFLAGS = -DEBUG -Z7 /errorReport:prompt
     47!ELSE
     48CXXFLAGS =
     49LDFLAGS =
     50!ENDIF
     51
    4352
    4453!IF $(GSDL_VC4)
    45 CPPFLAGS = -GX
     54CXXFLAGS = $(CXXFLAGS) -GX
    4655!ELSE
    47 CPPFLAGS = -EHsc
     56CXXFLAGS = $(CXXFLAGS) -EHsc
    4857!ENDIF
    4958
    … …  
    6978        -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mg\src\text" \
    7079        -I"$(INDEXERS_DIR)\mgpp\lib" -I"$(INDEXERS_DIR)\mgpp\text"
    71 LDFLAGS =
     80
    7281LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \
    7382        "$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\gdbm.lib" $(ACCENTFOLD_LIBS) $(SQLITE_LIBS)
    … …  
    8594
    8695
    87 COMPILE = $(CC) -nologo -c $(CPPFLAGS) $(DEFS) $(INCLUDES)
     96COMPILE = $(CC) -nologo -c $(CXXFLAGS) $(DEFS) $(INCLUDES)
    8897LINK = $(CC) -nologo $(LDFLAGS) -Fe"$@"
    8998
    … …  
    157166    del *.obj
    158167    del $(EXECUTABLE)
    159 
     168    if exist *.pdb del *.pdb
    160169
    161170# Resources stuff

  • gsdl/trunk/runtime-src/src/z3950/win32.mak

    r18077 r19521  
    3737
    3838GSDL_VC4 = 0
     39DEBUG = 0
    3940DLL = 0
    4041DLLDEBUG = 0
    … …  
    4243USE_SQLITE = 1
    4344
     45!IF $(DEBUG)
     46CXXFLAGS = -DEBUG -Z7 /errorReport:prompt
     47!ELSE
     48CXXFLAGS =
     49!ENDIF
    4450
    4551!IF $(GSDL_VC4)
    46 CPPFLAGS = -GX
     52CXXFLAGS = $(CXXFLAGS) -GX
    4753!ELSE
    48 CPPFLAGS = -EHsc
     54CXXFLAGS = $(CXXFLAGS) -EHsc
    4955!ENDIF
    5056
    5157!IF $(DLL)
    52 CPPFLAGS = $(CPPFLAGS) -MD
     58CXXFLAGS = $(CXXFLAGS) -MD
    5359!ELSE
    5460!IF ($(DLLDEBUG))
    55 CPPFLAGS = $(CPPFLAGS) -MDd
     61CXXFLAGS = $(CXXFLAGS) -MDd
    5662!ENDIF
    5763!ENDIF
    … …  
    8995
    9096
    91 COMPILE = $(CC) -nologo -c $(CPPFLAGS) $(DEFS) $(INCLUDES)
     97COMPILE = $(CC) -nologo -c $(CXXFLAGS) $(DEFS) $(INCLUDES)
    9298LINK = $(CC) -nologo -Fe"$@" $(LDFLAGS)
    9399

  • gsdl/trunk/runtime-src/win32.mak

    r19344 r19521  
    3131LOCAL_LIBRARY = 0
    3232APACHE_HTTPD = 0
     33DEBUG = 0
    3334DLL = 0
    3435DLLDEBUG = 0
    … …  
    5859MAKECMD = $(MAKECMD) APACHE_HTTPD=1
    5960INSTALLDIRS = $(INSTALLDIRS) packages\apache-httpd
     61!ENDIF
     62!IF $(DEBUG)
     63MAKECMD = $(MAKECMD) DEBUG=1
    6064!ENDIF
    6165!IF $(DLL)
Note: See TracChangeset for help on using the changeset viewer.