Changeset 11256


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

Added a "GSDL_VC4" option that has to be specified with the nmake command when using Visual C++ 4. This is used to determine whether "-GX" (Visual C++ 4) or "-EHsc" (Visual C++ 6/Visual Studio 2005) is specified as a command-line option to the compiler.

Location:
trunk/gsdl
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/gsdl/lib/win32.mak

    r11253 r11256  
    2626
    2727GSDLHOME = ..
     28GSDL_VC4 = 0
    2829USE_STLPORT = 0
    2930LOCAL_LIBRARY = 0
    … …  
    3536CC = cl
    3637
     38!IF $(GSDL_VC4)
    3739CPPFLAGS = -GX
     40!ELSE
     41CPPFLAGS = -EHsc
     42!ENDIF
     43
    3844!IF $(DLL)
    3945CPPFLAGS = $(CPPFLAGS) -MD

  • trunk/gsdl/packages/d2m/win32.mak

    r11253 r11256  
    66
    77GSDLHOME = ..\..
     8GSDL_VC4 = 0
    89CC = cl
    910AR = lib
    … …  
    1213DLLDEBUG = 0
    1314
     15!IF $(GSDL_VC4)
    1416CPPFLAGS = -GX
     17!ELSE
     18CPPFLAGS = -EHsc
     19!ENDIF
     20
    1521!IF $(DLL)
    1622CPPFLAGS = $(CPPFLAGS) -MD

  • trunk/gsdl/packages/mg/lib/WIN32.MAK

    r11253 r11256  
    2626 
    2727GSDLHOME = ..\..\..
     28GSDL_VC4 = 0
    2829DLL = 0
    2930DLLDEBUG = 0
    … …  
    3233CC = cl
    3334
     35!IF $(GSDL_VC4)
    3436CPPFLAGS = -GX
     37!ELSE
     38CPPFLAGS = -EHsc
     39!ENDIF
     40
    3541!IF $(DLL)
    3642CPPFLAGS = $(CPPFLAGS) -MD

  • trunk/gsdl/packages/mg/src/text/WIN32.MAK

    r11253 r11256  
    2626
    2727GSDLHOME = ..\..\..\..
     28GSDL_VC4 = 0
    2829DLL = 0
    2930DLLDEBUG = 0
    … …  
    3132CC = cl
    3233
     34!IF $(GSDL_VC4)
    3335CPPFLAGS = -GX
     36!ELSE
     37CPPFLAGS = -EHsc
     38!ENDIF
     39
    3440!IF $(DLL)
    3541CPPFLAGS = $(CPPFLAGS) -MD

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

    r11254 r11256  
    2626
    2727GSDLHOME = ..\..
     28GSDL_VC4 = 0
    2829USE_STLPORT = 0
    2930DLL = 0
    … …  
    3536CC = cl
    3637
     38!IF $(GSDL_VC4)
    3739CPPFLAGS = -GX
     40!ELSE
     41CPPFLAGS = -EHsc
     42!ENDIF
     43
    3844!IF $(DLL)
    3945CPPFLAGS = $(CPPFLAGS) -MD

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

    r11253 r11256  
    2626
    2727GSDLHOME = ..\..
     28GSDL_VC4 = 0
    2829USE_STLPORT = 0
    2930STLPATH = "$(GSDLHOME)\packages\windows\stlport\stlport"
    … …  
    3132AR = lib
    3233CC = cl
    33 CPPFLAGS =
     34
     35!IF $(GSDL_VC4)
     36CPPFLAGS = -GX
     37!ELSE
     38CPPFLAGS = -EHsc
     39!ENDIF
     40
    3441LDFLAGS =
    3542
    … …  
    4552       "$(GSDLHOME)\packages\windows\gdbm\gdbm\gdbm.lib"
    4653
    47 COMPILE = $(CC) -nologo -c -GX $(DEFS) $(INCLUDES)
     54COMPILE = $(CC) -nologo -c $(CPPFLAGS) $(DEFS) $(INCLUDES)
    4855LINK = $(CC) -nologo $(LDFLAGS)
    4956

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

    r11253 r11256  
    2626 
    2727GSDLHOME = ..\..
     28GSDL_VC4 = 0
    2829
    2930AR = lib
    3031CC = cl
    31 CPPFLAGS =
     32
     33!IF $(GSDL_VC4)
     34CPPFLAGS = -GX
     35!ELSE
     36CPPFLAGS = -EHsc
     37!ENDIF
     38
    3239DEFS = -DHAVE_CONFIG_H -D__WIN32__ -D_CRT_SECURE_NO_DEPRECATE
    3340INCLUDES = -I"$(GSDLHOME)\src\hashfile"
    3441LIBS =
    3542
    36 COMPILE = $(CC) -nologo -c -GX $(DEFS) $(INCLUDES)
     43COMPILE = $(CC) -nologo -c $(CPPFLAGS) $(DEFS) $(INCLUDES)
    3744LINK = $(CC) -nologo $(LDFLAGS)
    3845

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

    r11253 r11256  
    2626
    2727GSDLHOME = ..\..\..
     28GSDL_VC4 = 0
    2829USE_STLPORT = 0
    2930DLL = 0
    … …  
    3334CC = cl
    3435
     36!IF $(GSDL_VC4)
    3537CPPFLAGS = -GX
     38!ELSE
     39CPPFLAGS = -EHsc
     40!ENDIF
     41
    3642!IF $(DLL)
    3743CPPFLAGS = $(CPPFLAGS) -MD

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

    r11253 r11256  
    2626
    2727GSDLHOME = ..\..\..
     28GSDL_VC4 = 0
    2829USE_STLPORT = 0
    2930DLL = 0
    … …  
    3334CC = cl
    3435
     36!IF $(GSDL_VC4)
    3537CPPFLAGS = -GX
     38!ELSE
     39CPPFLAGS = -EHsc
     40!ENDIF
     41
    3642!IF $(DLL)
    3743CPPFLAGS = $(CPPFLAGS) -MD

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

    r11255 r11256  
    2626
    2727GSDLHOME = ..\..
     28GSDL_VC4 = 0
    2829USE_STLPORT = 0
    2930DLL = 0
    … …  
    3839CC = cl
    3940
     41!IF $(GSDL_VC4)
    4042CPPFLAGS = -GX
     43!ELSE
     44CPPFLAGS = -EHsc
     45!ENDIF
     46
    4147!IF $(DLL)
    4248CPPFLAGS = $(CPPFLAGS) -MD

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

    r11254 r11256  
    2626
    2727GSDLHOME = ..\..\..
     28GSDL_VC4 = 0
    2829USE_STLPORT = 0
    2930STLPATH = "$(GSDLHOME)\packages\windows\stlport\stlport"
    … …  
    3132AR = lib
    3233CC = cl
     34
     35!IF $(GSDL_VC4)
    3336CPPFLAGS = -GX
     37!ELSE
     38CPPFLAGS = -EHsc
     39!ENDIF
     40
    3441LDFLAGS =
    3542DEFS = -D__WIN32__

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

    r11255 r11256  
    2626
    2727GSDLHOME = ..\..
     28GSDL_VC4 = 0
    2829USE_STLPORT = 0
    2930LOCAL_LIBRARY = 0
    … …  
    3940CC = cl
    4041
     42!IF $(GSDL_VC4)
    4143CPPFLAGS = -GX
     44!ELSE
     45CPPFLAGS = -EHsc
     46!ENDIF
     47
    4248!IF $(DLL)
    4349CPPFLAGS = $(CPPFLAGS) -MD

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

    r11253 r11256  
    2626
    2727GSDLHOME = ..\..
     28GSDL_VC4 = 0
    2829USE_STLPORT = 0
    2930STLPATH = "$(GSDLHOME)\packages\windows\stlport\stlport"
    … …  
    3132AR = lib
    3233CC = cl
    33 CPPFLAGS =
     34
     35!IF $(GSDL_VC4)
     36CPPFLAGS = -GX
     37!ELSE
     38CPPFLAGS = -EHsc
     39!ENDIF
     40
    3441LDFLAGS =
    3542
    … …  
    4552       "$(GSDLHOME)\packages\windows\gdbm\gdbm\gdbm.lib"
    4653
    47 COMPILE = $(CC) -nologo -c -GX $(DEFS) $(INCLUDES)
     54COMPILE = $(CC) -nologo -c $(CPPFLAGS) $(DEFS) $(INCLUDES)
    4855LINK = $(CC) -nologo $(LDFLAGS)
    4956

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

    r11255 r11256  
    2626
    2727GSDLHOME = ..\..
     28GSDL_VC4 = 0
    2829USE_STLPORT = 0
    2930STLPATH = "$(GSDLHOME)\packages\windows\stlport\stlport"
    … …  
    3233CC = cl
    3334RSC = rc
     35
     36!IF $(GSDL_VC4)
    3437CPPFLAGS = -GX
     38!ELSE
     39CPPFLAGS = -EHsc
     40!ENDIF
     41
    3542LDFLAGS =
    3643DEFS = -DHAVE_CONFIG_H -D_LITTLE_ENDIAN -DPARADOCNUM -D__WIN32__ \

  • trunk/gsdl/win32.mak

    r11251 r11256  
    2525###########################################################################
    2626
    27 AR = lib
    28 CC = cl
    29 CPPFLAGS =
    30 
    3127GSDLHOME = $(MAKEDIR)
     28GSDL_VC4 = 0
    3229USE_STLPORT = 0
    3330LOCAL_LIBRARY = 0
    … …  
    3633
    3734MDEFINES = /f win32.mak
    38 
    39 SOURCES =
    40 
    41 OBJECTS =
    4235
    4336OTHERDIRS = packages\windows\gdbm\gdbm packages\windows\crypt\crypt packages\windows\expat\expat \
Note: See TracChangeset for help on using the changeset viewer.