From c36f502b2e36eca272e75c8207bfe3ce9e9783fd Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 26 Jan 2004 18:10:08 +0000 Subject: ChangeLogTag: Mon Jan 26 18:10:32 UTC 2004 Johnny Willemsen --- include/makeinclude/build_lib.bor | 9 +++++++++ include/makeinclude/compiler.bor | 5 +++++ 2 files changed, 14 insertions(+) diff --git a/include/makeinclude/build_lib.bor b/include/makeinclude/build_lib.bor index bfb5b6489fe..e56088be672 100644 --- a/include/makeinclude/build_lib.bor +++ b/include/makeinclude/build_lib.bor @@ -39,6 +39,14 @@ TARGET = $(BINDIR)\$(NAME)$(LIB_DECORATOR).lib all: $(TARGET) @echo Do nothing >NUL +!ifdef CBX +!ifdef TARGET +$(TARGET): $(OBJFILES) + @$(MAKE_BINDIR) + -@del $(TARGET) 2>NUL + $(AR) $(LIB_LFLAGS) $(TARGET) $(OBJFILES) +!endif +!else !ifdef TARGET $(TARGET): $(OBJFILES) @$(MAKE_BINDIR) @@ -48,6 +56,7 @@ $(TARGET): $(OBJFILES) + ) ! !endif +!endif !include <$(ACE_ROOT)\include\makeinclude\clean.bor> diff --git a/include/makeinclude/compiler.bor b/include/makeinclude/compiler.bor index e26d8307fd1..157ed143943 100644 --- a/include/makeinclude/compiler.bor +++ b/include/makeinclude/compiler.bor @@ -165,11 +165,16 @@ EXE_STARTUP_OBJ = c0x32.$(OBJ_EXT) # LIB_CFLAGS = +!ifdef CBX +LIB_LFLAGS = cfrv +!else !ifdef DEBUG LIB_LFLAGS = /C /P4096 !else LIB_LFLAGS = /C /P512 !endif +!endif + # # VCL lib version number -- cgit v1.2.1