Skip to content

Commit 418afa0

Browse files
committed
Build BugTrap for different architectures into different folders
Prevents conflicts with dbghelp.dll in unified BugTrap archive
1 parent 02c7ba8 commit 418afa0

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,11 @@ The BugTrap source code and binaries in this repository are granted by the origi
1212
Check the releases section in this repository for the latest builds:
1313
[**BugTrap.zip**](https://github.com/bchavez/BugTrap/releases) contains all BugTrap components required for Win32/x64 projects:
1414

15-
* `BugTrap[U][D][N][-x64].dll` - BugTrap DLL module.
16-
* `BugTrap[U][D][N][-x64].lib` - BugTrap library file used by linker.
15+
* `BugTrap[U][D][N].dll` - BugTrap DLL module.
16+
* `BugTrap[U][D][N].lib` - BugTrap library file used by linker.
1717
* **`[U]`** - Unicode aware version has 'U' letter. ANSI version doesn't have 'U' letter.
1818
* **`[D]`** - Debug version has 'D' letter. Release version doesn't have 'D' letter.
1919
* **`[N]`** - managed (.NET) version has 'N' letter. Native version doesn't have 'N' letter.
20-
* **`[-x64]`** - 64 bit version for AMD-64 platform has '-x64' suffix. x86 version doesn't have this suffix.
2120
* `dbghelp.dll` - DbgHelp library (see ["BugTrap Developer's Guide"](https://raw.githubusercontent.com/bchavez/BugTrap/master/doc/BugTrap.pdf) for details).
2221
* `BugTrap.h` - Header file with BugTrap API definitions.
2322
* `BTTrace.h` - C++ wrapper of custom logging functions.

source/BugTrap.props

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,22 @@
1111
</PropertyGroup>
1212

1313
<PropertyGroup Label="OutputDirectories">
14-
<OutDir>$(ProjectDir)..\..\bin\</OutDir>
14+
<OutDir>$(ProjectDir)..\..\bin\$(Platform)\$(Configuration)\</OutDir>
1515
<IntDir>$(ProjectDir)..\..\intermediate\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
1616
</PropertyGroup>
1717

1818
<PropertyGroup Label="UserMacros">
1919
<BugTrapUnicode></BugTrapUnicode>
2020
<BugTrapDebug></BugTrapDebug>
2121
<BugTrapNet></BugTrapNet>
22-
<BugTrapArch></BugTrapArch>
2322

2423
<BugTrapUnicode Condition="$(Configuration.Contains('Unicode'))">U</BugTrapUnicode>
2524
<BugTrapDebug Condition="$(Configuration.Contains('Debug'))">D</BugTrapDebug>
2625
<BugTrapNet Condition="$(Configuration.Contains('.NET'))">N</BugTrapNet>
27-
<BugTrapArch Condition="'$(Platform)'!='Win32'">-$(PlatformShortName)</BugTrapArch>
2826
</PropertyGroup>
2927

3028
<PropertyGroup>
31-
<TargetName>$(ProjectName)$(BugTrapUnicode)$(BugTrapDebug)$(BugTrapNet)$(BugTrapArch)</TargetName>
29+
<TargetName>$(ProjectName)$(BugTrapUnicode)$(BugTrapDebug)$(BugTrapNet)</TargetName>
3230
</PropertyGroup>
3331

3432
<ItemDefinitionGroup>

0 commit comments

Comments
 (0)