diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2000-03-08 07:41:51 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2000-03-08 07:41:51 +0000 |
| commit | 9fcbbaf654ea15cd104d750b9f95fbaf7b7ab58b (patch) | |
| tree | c3a353fab6e96db46fb4f47dd7f77683a41b1d8d /include/makeinclude | |
| parent | 9aa995c4c462365a97a6339789e863537855caf6 (diff) | |
| download | ATCD-9fcbbaf654ea15cd104d750b9f95fbaf7b7ab58b.tar.gz | |
ChangeLogTag:Wed Mar 8 01:33:21 2000 Christopher Kohlhoff <chris@kohlhoff.com>
Diffstat (limited to 'include/makeinclude')
| -rw-r--r-- | include/makeinclude/compiler.bor | 24 | ||||
| -rw-r--r-- | include/makeinclude/make_flags.bor | 6 | ||||
| -rw-r--r-- | include/makeinclude/outputdir.bor | 10 |
3 files changed, 33 insertions, 7 deletions
diff --git a/include/makeinclude/compiler.bor b/include/makeinclude/compiler.bor index 51b2357fecb..69e064e4c3d 100644 --- a/include/makeinclude/compiler.bor +++ b/include/makeinclude/compiler.bor @@ -59,15 +59,23 @@ STATIC_CFLAGS = -tWR STATIC_LFLAGS = !endif +!ifdef CODEGUARD +CODEGUARD_CFLAGS = -vG +!else +# CFLAGS compatibility with a default application generated by +# the BCB IDE, however these flags do not work with codeguard. +CODEGUARD_CFLAGS = -b- -Ve -Vx +!endif + THREAD_CFLAGS = -D_MT -tWM WARNINGS_CFLAGS = -w-rvl -w-rch -w-par -w-ccc -w-obs -w-aus -w-pia DEFINES_CFLAGS = -DWIN32;_NO_VCL QUIET_CFLAGS = -q -MISC_CFLAGS = -a8 -b- -Ve -Vx +ALIGN_CFLAGS = -a8 COMMON_CFLAGS = $(QUIET_CFLAGS) $(DEBUG_CFLAGS) $(THREAD_CFLAGS) \ $(STATIC_CFLAGS) $(WARNINGS_CFLAGS) $(DEFINES_CFLAGS) \ - $(MISC_CFLAGS) + $(ALIGN_CFLAGS) $(CODEGUARD_CFLAGS) COMMON_LFLAGS = $(DEBUG_LFLAGS) $(STATIC_LFLAGS) -x -w-dup -Gn @@ -120,16 +128,20 @@ VCLVER = 40 # Libraries to be linked # +!ifdef CODEGUARD +CODEGUARD_LIB = cg32.lib +!endif + !ifdef STATIC !ifdef PASCAL -COMMON_LIBS = import32.lib vcl$(VCLVER).lib vcle$(VCLVER).lib cp32mt.lib ws2_32.lib +COMMON_LIBS = $(CODEGUARD_LIB) import32.lib vcl$(VCLVER).lib vcle$(VCLVER).lib cp32mt.lib ws2_32.lib !else -COMMON_LIBS = import32.lib cw32mt.lib ws2_32.lib +COMMON_LIBS = $(CODEGUARD_LIB) import32.lib cw32mt.lib ws2_32.lib !endif !else !ifdef PASCAL -COMMON_LIBS = import32.lib vcl$(VCLVER).bpi vcle$(VCLVER).lib cp32mti.lib ws2_32.lib +COMMON_LIBS = $(CODEGUARD_LIB) import32.lib vcl$(VCLVER).bpi vcle$(VCLVER).lib cp32mti.lib ws2_32.lib !else -COMMON_LIBS = import32.lib cw32mti.lib ws2_32.lib +COMMON_LIBS = $(CODEGUARD_LIB) import32.lib cw32mti.lib ws2_32.lib !endif !endif diff --git a/include/makeinclude/make_flags.bor b/include/makeinclude/make_flags.bor index e6fe899eb9e..75827afb063 100644 --- a/include/makeinclude/make_flags.bor +++ b/include/makeinclude/make_flags.bor @@ -14,4 +14,8 @@ STATIC_FLAG = -DSTATIC PASCAL_FLAG = -DPASCAL !endif -MAKE_FLAGS = $(DEBUG_FLAG) $(STATIC_FLAG) $(PASCAL_FLAG) +!ifdef CODEGUARD +CODEGUARD_FLAG = -DCODEGUARD +!endif + +MAKE_FLAGS = $(DEBUG_FLAG) $(STATIC_FLAG) $(PASCAL_FLAG) $(CODEGUARD_FLAG) diff --git a/include/makeinclude/outputdir.bor b/include/makeinclude/outputdir.bor index 719e2721a1b..5bf73ab3ebf 100644 --- a/include/makeinclude/outputdir.bor +++ b/include/makeinclude/outputdir.bor @@ -51,10 +51,20 @@ BINDIR=$(BASE_BINDIR)\$(STATIC_DIR)\$(DEBUG_DIR)\$(PASCAL_DIR) CORE_BINDIR=$(ACE_ROOT)\bin\$(STATIC_DIR)\$(DEBUG_DIR)\$(PASCAL_DIR) !endif +!ifdef MKDIR +MAKE_BINDIR=$(MKDIR) "$(BINDIR)" +!else +# Use default mkdir provided by command shell. May not work on Win9x. MAKE_BINDIR=if not exist "$(BINDIR)" mkdir "$(BINDIR)" +!endif !ifndef OBJDIR OBJDIR=$(BASE_OBJDIR)\$(NAME)\$(STATIC_DIR)\$(DEBUG_DIR) !endif +!ifdef MKDIR +MAKE_OBJDIR=$(MKDIR) "$(OBJDIR)" +!else +# Use default mkdir provided by command shell. May not work on Win9x. MAKE_OBJDIR=if not exist "$(OBJDIR)" mkdir "$(OBJDIR)" +!endif |