diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-01-26 18:10:08 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-01-26 18:10:08 +0000 |
| commit | c36f502b2e36eca272e75c8207bfe3ce9e9783fd (patch) | |
| tree | 834c5f987cd9040422f9a4aa2e823aee5eff69ea | |
| parent | fa0dc0bfa3c2d55226d7291f42fa19850e76067d (diff) | |
| download | ATCD-c36f502b2e36eca272e75c8207bfe3ce9e9783fd.tar.gz | |
ChangeLogTag: Mon Jan 26 18:10:32 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | include/makeinclude/build_lib.bor | 9 | ||||
| -rw-r--r-- | include/makeinclude/compiler.bor | 5 |
2 files changed, 14 insertions, 0 deletions
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 |