diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-01-01 20:26:52 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-01-01 20:26:52 +0000 |
| commit | c96a774bbfa60c81ebb5d6e35e205f05d565290d (patch) | |
| tree | 9707ec2003f276dd25f3f0bbf91cb2a2277b73b5 /include/makeinclude/outputdir.bor | |
| parent | 4b3c67f6eddbc901a20c88c87fc574c26043295d (diff) | |
| download | ATCD-c96a774bbfa60c81ebb5d6e35e205f05d565290d.tar.gz | |
ChangeLogTag: Thu Jan 1 20:26:13 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'include/makeinclude/outputdir.bor')
| -rw-r--r-- | include/makeinclude/outputdir.bor | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/include/makeinclude/outputdir.bor b/include/makeinclude/outputdir.bor index d11537b388f..586b38e6f27 100644 --- a/include/makeinclude/outputdir.bor +++ b/include/makeinclude/outputdir.bor @@ -18,12 +18,16 @@ # MAKE_OBJDIR - command to be used for creating OBJDIR # -!ifndef STATIC_DIR !ifdef STATIC +!ifndef STATIC_DIR STATIC_DIR=Static +!endif +OBJSTATIC_DIR=Static !else +!ifndef STATIC_DIR STATIC_DIR=Dynamic !endif +OBJSTATIC_DIR=Dynamic !endif !ifdef DEBUG @@ -39,16 +43,28 @@ OBJDEBUG_DIR=Release !endif !ifdef PASCAL +!ifndef PASCAL_DIR PASCAL_DIR=Pascal +!endif +OBJPASCAL_DIR=Pascal !else +!ifndef PASCAL_DIR PASCAL_DIR=. !endif +OBJPASCAL_DIR=. +!endif !ifdef UNICODE +!ifndef UNICODE_DIR UNICODE_DIR=Unicode +!endif +OBJUNICODE_DIR=Unicode !else +!ifndef UNICODE_DIR UNICODE_DIR=. !endif +OBJUNICODE_DIR=. +!endif # By default binaries are built underneath the current build directory !ifndef BASE_BINDIR @@ -78,7 +94,7 @@ MAKE_BINDIR=if not exist "$(BINDIR)" mkdir "$(BINDIR)" !endif !ifndef OBJDIR -OBJDIR=$(BASE_OBJDIR)\$(NAME)\$(STATIC_DIR)\$(OBJDEBUG_DIR)\$(PASCAL_DIR)\$(UNICODE_DIR) +OBJDIR=$(BASE_OBJDIR)\$(NAME)\$(OBJSTATIC_DIR)\$(OBJDEBUG_DIR)\$(OBJPASCAL_DIR)\$(OBJUNICODE_DIR) !endif !ifdef MKDIR |