Changeset 7060


Ignore:
Timestamp:
2004-03-16T16:19:55+13:00 (20 years ago)
Author:
sjboddie
Message:

Added DLL=1 and DLLDEBUG=1 options to the windows makefiles

Location:
trunk/gsdl
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/gsdl/lib/win32.mak

    r3055 r7060  
    2828USE_STLPORT = 0
    2929LOCAL_LIBRARY = 0
     30DLL = 0
     31DLLDEBUG = 0
    3032STLPATH = "$(GSDLHOME)\packages\windows\stlport\stlport"
    3133
    3234AR = lib
    3335CC = cl
     36
    3437CPPFLAGS = -GX
     38!IF $(DLL)
     39CPPFLAGS = $(CPPFLAGS) -MD
     40!ELSE
     41!IF ($(DLLDEBUG))
     42CPPFLAGS = $(CPPFLAGS) -MDd
     43!ENDIF
     44!ENDIF
    3545
    3646DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN \

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

    r2741 r7060  
    2626 
    2727GSDLHOME = ..\..\..
     28DLL = 0
     29DLLDEBUG = 0
    2830
    2931AR = lib
    3032CC = cl
    31 CPPFLAGS =
     33
     34CPPFLAGS = -GX
     35!IF $(DLL)
     36CPPFLAGS = $(CPPFLAGS) -MD
     37!ELSE
     38!IF ($(DLLDEBUG))
     39CPPFLAGS = $(CPPFLAGS) -MDd
     40!ENDIF
     41!ENDIF
    3242
    3343DEFS = -DQUIET -DHAVE_CONFIG_H -D__WIN32__ -D_LITTLE_ENDIAN -DPARADOCNUM \
    … …  
    3646           -I"$(GSDLHOME)"
    3747
    38 COMPILE = $(CC) -c $(DEFS) $(INCLUDES)
     48COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) $(INCLUDES)
    3949 
    4050.SUFFIXES:

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

    r4191 r7060  
    2626
    2727GSDLHOME = ..\..\..\..
     28DLL = 0
     29DLLDEBUG = 0
    2830
    2931CC = cl
    30 CPPFLAGS =
     32
     33CPPFLAGS = -GX
     34!IF $(DLL)
     35CPPFLAGS = $(CPPFLAGS) -MD
     36!ELSE
     37!IF ($(DLLDEBUG))
     38CPPFLAGS = $(CPPFLAGS) -MDd
     39!ENDIF
     40!ENDIF
     41
    3142DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DHAVE_CONFIG_H \
    3243       -D__WIN32__ -D_LITTLE_ENDIAN
    … …  
    3748LIBS = "$(GSDLHOME)\packages\mg\lib\libmg.lib"
    3849
    39 COMPILE = $(CC) -c $(DEFS) $(INCLUDES)
     50COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) $(INCLUDES)
    4051LINK = $(CC) $(LDFLAGS)
    4152

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

    r3055 r7060  
    2727GSDLHOME = ..\..
    2828USE_STLPORT = 0
     29DLL = 0
     30DLLDEBUG = 0
    2931STLPATH = "$(GSDLHOME)\packages\windows\stlport\stlport"
    3032
    3133AR = lib
    3234CC = cl
     35
    3336CPPFLAGS = -GX
     37!IF $(DLL)
     38CPPFLAGS = $(CPPFLAGS) -MD
     39!ELSE
     40!IF ($(DLLDEBUG))
     41CPPFLAGS = $(CPPFLAGS) -MDd
     42!ENDIF
     43!ENDIF
     44
    3445LDFLAGS =
    3546DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX

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

    r2710 r7060  
    2727GSDLHOME = ..\..\..
    2828USE_STLPORT = 0
    29 
     29DLL = 0
     30DLLDEBUG = 0
    3031STLPATH = "$(GSDLHOME)\packages\windows\stlport\stlport"
    3132
    3233CC = cl
    33 CPPFLAGS =
     34
     35CPPFLAGS = -GX
     36!IF $(DLL)
     37CPPFLAGS = $(CPPFLAGS) -MD
     38!ELSE
     39!IF ($(DLLDEBUG))
     40CPPFLAGS = $(CPPFLAGS) -MDd
     41!ENDIF
     42!ENDIF
     43
    3444DEFS = -DSHORT_SUFFIX -DSILENT -DHAVE_CONFIG_H -D__WIN32__
    3545INCLUDES = -I"$(GSDLHOME)"
    … …  
    4353LIBS =
    4454
    45 COMPILE = $(CC) -c $(DEFS) $(INCLUDES)
     55COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) $(INCLUDES)
    4656LINK = $(CC) $(LDFLAGS)
    4757

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

    r3055 r7060  
    2727GSDLHOME = ..\..\..
    2828USE_STLPORT = 0
    29 
     29DLL = 0
     30DLLDEBUG = 0
    3031STLPATH = "$(GSDLHOME)\packages\windows\stlport\stlport"
    3132
    3233CC = cl
     34
    3335CPPFLAGS = -GX
     36!IF $(DLL)
     37CPPFLAGS = $(CPPFLAGS) -MD
     38!ELSE
     39!IF ($(DLLDEBUG))
     40CPPFLAGS = $(CPPFLAGS) -MDd
     41!ENDIF
     42!ENDIF
     43
    3444DEFS = -DSHORT_SUFFIX -DSILENT -DHAVE_CONFIG_H -D__WIN32__ -D__STDC__ -D__GNU_LIBRARY__ -D__MSDOS__
    3545INCLUDES = -I"$(GSDLHOME)\src\mgpp\lib" -I"$(GSDLHOME)"

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

    r4738 r7060  
    2828USE_STLPORT = 0
    2929LOCAL_LIBRARY = 0
     30DLL = 0
     31DLLDEBUG = 0
    3032STLPATH = "$(GSDLHOME)\packages\windows\stlport\stlport"
    3133
    3234AR = lib
    3335CC = cl
     36
    3437CPPFLAGS = -GX
     38!IF $(DLL)
     39CPPFLAGS = $(CPPFLAGS) -MD
     40!ELSE
     41!IF ($(DLLDEBUG))
     42CPPFLAGS = $(CPPFLAGS) -MDd
     43!ENDIF
     44!ENDIF
     45
    3546LDFLAGS =
    3647DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX

  • trunk/gsdl/win32.mak

    r2501 r7060  
    3232USE_STLPORT = 0
    3333LOCAL_LIBRARY = 0
    34 MDEFINES = /nologo /S /c /f win32.mak
     34DLL = 0
     35DLLDEBUG = 0
     36
     37MDEFINES = /f win32.mak
    3538COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) $(INCLUDES)
    3639
    … …  
    4245            packages\mg\lib src\mgpp\lib lib src\colservr
    4346
    44 INSTALLDIRS = packages\mg\src\text src\mgpp\text src\txt2db src\db2txt \
    45           src\hashfile src\phind\generate src\recpt
     47INSTALLDIRS = packages\mg\src\text src\mgpp\text src\recpt
    4648
    4749MAKECMD = $(MAKE) $(MDEFINES) GSDLHOME="$(GSDLHOME)"
    … …  
    5254MAKECMD = $(MAKECMD) LOCAL_LIBRARY=1
    5355INSTALLDIRS = $(INSTALLDIRS) src\w32server
     56!ENDIF
     57!IF $(DLL)
     58MAKECMD = $(MAKECMD) DLL=1
     59!ENDIF
     60!IF $(DLLDEBUG)
     61MAKECMD = $(MAKECMD) DLLDEBUG=1
    5462!ENDIF
    5563
Note: See TracChangeset for help on using the changeset viewer.