diff options
| author | Chris Cleeland <chris.cleeland@gmail.com> | 2002-08-25 04:27:09 +0000 |
|---|---|---|
| committer | Chris Cleeland <chris.cleeland@gmail.com> | 2002-08-25 04:27:09 +0000 |
| commit | f5db345a0399bd329edc7185fb800a64f6200b23 (patch) | |
| tree | 2ae9e994c5aed2e72720b0d4a091ab9d2189a6e8 /include | |
| parent | c04516cb75cc6d171441442d2747b2530670335c (diff) | |
| download | ATCD-f5db345a0399bd329edc7185fb800a64f6200b23.tar.gz | |
ChangeLogTag:Sat Aug 24 22:47:22 2002 Christopher Kohlhoff <chris@kohlhoff.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/makeinclude/ace_flags.bor | 6 | ||||
| -rw-r--r-- | include/makeinclude/clean.bor | 2 | ||||
| -rw-r--r-- | include/makeinclude/compiler.bor | 10 |
3 files changed, 11 insertions, 7 deletions
diff --git a/include/makeinclude/ace_flags.bor b/include/makeinclude/ace_flags.bor index 46e76d8c78c..7114ac7cbfb 100644 --- a/include/makeinclude/ace_flags.bor +++ b/include/makeinclude/ace_flags.bor @@ -14,14 +14,10 @@ DLL_NAME=dll # # Compiler flags # -!ifdef DEBUG -ACE_CFLAGS = -I$(ACE_ROOT) -DACE_HAS_DLL=$(DLL_FLAG) -DACE_OS_HAS_DLL=$(DLL_FLAG) -DACE_NO_INLINE=1 -!else -ACE_CFLAGS = -I$(ACE_ROOT) -DACE_HAS_DLL=$(DLL_FLAG) -DACE_OS_HAS_DLL=$(DLL_FLAG) -!endif !ifdef SSL_ROOT SSL_CFLAGS = -I$(SSL_ROOT)\inc32 -DACE_HAS_SSL=1 !endif +ACE_CFLAGS = -I$(ACE_ROOT) -DACE_HAS_DLL=$(DLL_FLAG) -DACE_OS_HAS_DLL=$(DLL_FLAG) ACE_XML_CFLAGS = -I$(ACE_ROOT) -DACEXML_HAS_DLL=$(DLL_FLAG) ACE_XML_PARSER_CFLAGS = -I$(ACE_ROOT) -DACEXML_PARSER_HAS_DLL=$(DLL_FLAG) ACE_SSL_CFLAGS = -I$(ACE_ROOT) -DACE_SSL_HAS_DLL=$(DLL_FLAG) diff --git a/include/makeinclude/clean.bor b/include/makeinclude/clean.bor index 7e2dd6162fd..c814f4a6b8b 100644 --- a/include/makeinclude/clean.bor +++ b/include/makeinclude/clean.bor @@ -57,6 +57,8 @@ realclean: -@del $(TARGET:.exe=.tds) 2>NUL -@del $(TARGET:.dll=.tds) 2>NUL -@del $(TARGET:.dll=.lib) 2>NUL + -@del $(OBJDIR)\$(NAME).csm 2>NUL + -@del $(OBJDIR)\$(NAME).\#* 2>NUL !ifdef CORE_TARGET -@del $(CORE_TARGET) 2>NUL -@del $(CORE_TARGET:.exe=.tds) 2>NUL diff --git a/include/makeinclude/compiler.bor b/include/makeinclude/compiler.bor index 24d3f7a08cf..a19075be82f 100644 --- a/include/makeinclude/compiler.bor +++ b/include/makeinclude/compiler.bor @@ -45,7 +45,7 @@ RC = brcc32 # !ifdef DEBUG -DEBUG_CFLAGS = -v -y -Od -r- -vi- -k -D_DEBUG +DEBUG_CFLAGS = -v -y -Od -r- -vi- -k -D_DEBUG -DACE_NO_INLINE=1 DEBUG_LFLAGS = -v !else DEBUG_CFLAGS = -O2 -DNDEBUG @@ -68,15 +68,21 @@ CODEGUARD_CFLAGS = -vG UNICODE_CFLAGS = -DACE_USES_WCHAR -WU !endif +!ifdef PCH_HEADER +PCH_CFLAGS = -H=$(OBJDIR)\$(NAME).csm -Hh=$(PCH_HEADER) +!endif + THREAD_CFLAGS = -D_MT -tWM WARNINGS_CFLAGS = -w-rvl -w-rch -w-ccc -w-obs -w-aus -w-pia -w-inl DEFINES_CFLAGS = -DWIN32;_NO_VCL QUIET_CFLAGS = -q MISC_CFLAGS = -a8 -b +DECORATOR_CFLAGS = -DACE_LD_DECORATOR_STR=ACE_LIB_TEXT(\"$(LIB_DECORATOR)\") COMMON_CFLAGS = $(QUIET_CFLAGS) $(DEBUG_CFLAGS) $(THREAD_CFLAGS) \ $(STATIC_CFLAGS) $(WARNINGS_CFLAGS) $(DEFINES_CFLAGS) \ - $(MISC_CFLAGS) $(CODEGUARD_CFLAGS) $(UNICODE_CFLAGS) + $(MISC_CFLAGS) $(CODEGUARD_CFLAGS) $(UNICODE_CFLAGS) \ + $(DECORATOR_CFLAGS) $(PCH_CFLAGS) COMMON_LFLAGS = $(DEBUG_LFLAGS) $(STATIC_LFLAGS) -x -w-dup -Gn |