Skip to content

Commit 2c83a15

Browse files
Xottab-DUTYXottab-DUTY
committed
Remove Static configurations
Due to how resources work and other peculiarities it is hard to make it work good
1 parent 7f7ea46 commit 2c83a15

File tree

6 files changed

+2
-101
lines changed

6 files changed

+2
-101
lines changed

‎include/BugTrap.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@
2929
* BUGTRAP_API functions as being imported from a DLL, whereas this DLL sees symbols
3030
* defined with this macro as being exported.
3131
*/
32-
#ifdef BUGTRAP_STATIC
33-
#define BUGTRAP_API
34-
#elif defined(BUGTRAP_EXPORTS)
32+
#ifdef defined(BUGTRAP_EXPORTS)
3533
#define BUGTRAP_API __declspec(dllexport)
3634
#else
3735
#define BUGTRAP_API __declspec(dllimport)

‎source/BugTrap.props‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,16 @@
1919
<BugTrapUnicode></BugTrapUnicode>
2020
<BugTrapDebug></BugTrapDebug>
2121
<BugTrapNet></BugTrapNet>
22-
<BugTrapStatic></BugTrapStatic>
2322
<BugTrapArch></BugTrapArch>
2423

2524
<BugTrapUnicode Condition="$(Configuration.Contains('Unicode'))">U</BugTrapUnicode>
2625
<BugTrapDebug Condition="$(Configuration.Contains('Debug'))">D</BugTrapDebug>
2726
<BugTrapNet Condition="$(Configuration.Contains('.NET'))">N</BugTrapNet>
28-
<BugTrapStatic Condition="$(Configuration.Contains('Static'))">S</BugTrapStatic>
2927
<BugTrapArch Condition="'$(Platform)'!='Win32'">-$(PlatformShortName)</BugTrapArch>
3028
</PropertyGroup>
3129

3230
<PropertyGroup>
33-
<TargetName>$(ProjectName)$(BugTrapUnicode)$(BugTrapDebug)$(BugTrapNet)$(BugTrapStatic)$(BugTrapArch)</TargetName>
31+
<TargetName>$(ProjectName)$(BugTrapUnicode)$(BugTrapDebug)$(BugTrapNet)$(BugTrapArch)</TargetName>
3432
</PropertyGroup>
3533

3634
<ItemDefinitionGroup>

‎source/BugTrap.sln‎

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,12 @@ Global
2525
.NET Debug|x64 = .NET Debug|x64
2626
.NET Release|Win32 = .NET Release|Win32
2727
.NET Release|x64 = .NET Release|x64
28-
Debug Static|Win32 = Debug Static|Win32
29-
Debug Static|x64 = Debug Static|x64
3028
Debug|Win32 = Debug|Win32
3129
Debug|x64 = Debug|x64
32-
Release Static|Win32 = Release Static|Win32
33-
Release Static|x64 = Release Static|x64
3430
Release|Win32 = Release|Win32
3531
Release|x64 = Release|x64
36-
Unicode Debug Static|Win32 = Unicode Debug Static|Win32
37-
Unicode Debug Static|x64 = Unicode Debug Static|x64
3832
Unicode Debug|Win32 = Unicode Debug|Win32
3933
Unicode Debug|x64 = Unicode Debug|x64
40-
Unicode Release Static|Win32 = Unicode Release Static|Win32
41-
Unicode Release Static|x64 = Unicode Release Static|x64
4234
Unicode Release|Win32 = Unicode Release|Win32
4335
Unicode Release|x64 = Unicode Release|x64
4436
EndGlobalSection
@@ -51,34 +43,18 @@ Global
5143
{E8CF1ADA-264A-4127-86C2-FD7057D3792C}..NET Release|Win32.Build.0 = .NET Release|Win32
5244
{E8CF1ADA-264A-4127-86C2-FD7057D3792C}..NET Release|x64.ActiveCfg = .NET Release|x64
5345
{E8CF1ADA-264A-4127-86C2-FD7057D3792C}..NET Release|x64.Build.0 = .NET Release|x64
54-
{E8CF1ADA-264A-4127-86C2-FD7057D3792C}.Debug Static|Win32.ActiveCfg = Debug Static|Win32
55-
{E8CF1ADA-264A-4127-86C2-FD7057D3792C}.Debug Static|Win32.Build.0 = Debug Static|Win32
56-
{E8CF1ADA-264A-4127-86C2-FD7057D3792C}.Debug Static|x64.ActiveCfg = Debug Static|x64
57-
{E8CF1ADA-264A-4127-86C2-FD7057D3792C}.Debug Static|x64.Build.0 = Debug Static|x64
5846
{E8CF1ADA-264A-4127-86C2-FD7057D3792C}.Debug|Win32.ActiveCfg = Debug|Win32
5947
{E8CF1ADA-264A-4127-86C2-FD7057D3792C}.Debug|Win32.Build.0 = Debug|Win32
6048
{E8CF1ADA-264A-4127-86C2-FD7057D3792C}.Debug|x64.ActiveCfg = Debug|x64
6149
{E8CF1ADA-264A-4127-86C2-FD7057D3792C}.Debug|x64.Build.0 = Debug|x64
62-
{E8CF1ADA-264A-4127-86C2-FD7057D3792C}.Release Static|Win32.ActiveCfg = Release Static|Win32
63-
{E8CF1ADA-264A-4127-86C2-FD7057D3792C}.Release Static|Win32.Build.0 = Release Static|Win32
64-
{E8CF1ADA-264A-4127-86C2-FD7057D3792C}.Release Static|x64.ActiveCfg = Release Static|x64
65-
{E8CF1ADA-264A-4127-86C2-FD7057D3792C}.Release Static|x64.Build.0 = Release Static|x64
6650
{E8CF1ADA-264A-4127-86C2-FD7057D3792C}.Release|Win32.ActiveCfg = Release|Win32
6751
{E8CF1ADA-264A-4127-86C2-FD7057D3792C}.Release|Win32.Build.0 = Release|Win32
6852
{E8CF1ADA-264A-4127-86C2-FD7057D3792C}.Release|x64.ActiveCfg = Release|x64
6953
{E8CF1ADA-264A-4127-86C2-FD7057D3792C}.Release|x64.Build.0 = Release|x64
70-
{E8CF1ADA-264A-4127-86C2-FD7057D3792C}.Unicode Debug Static|Win32.ActiveCfg = Unicode Debug Static|Win32
71-
{E8CF1ADA-264A-4127-86C2-FD7057D3792C}.Unicode Debug Static|Win32.Build.0 = Unicode Debug Static|Win32
72-
{E8CF1ADA-264A-4127-86C2-FD7057D3792C}.Unicode Debug Static|x64.ActiveCfg = Unicode Debug Static|x64
73-
{E8CF1ADA-264A-4127-86C2-FD7057D3792C}.Unicode Debug Static|x64.Build.0 = Unicode Debug Static|x64
7454
{E8CF1ADA-264A-4127-86C2-FD7057D3792C}.Unicode Debug|Win32.ActiveCfg = Unicode Debug|Win32
7555
{E8CF1ADA-264A-4127-86C2-FD7057D3792C}.Unicode Debug|Win32.Build.0 = Unicode Debug|Win32
7656
{E8CF1ADA-264A-4127-86C2-FD7057D3792C}.Unicode Debug|x64.ActiveCfg = Unicode Debug|x64
7757
{E8CF1ADA-264A-4127-86C2-FD7057D3792C}.Unicode Debug|x64.Build.0 = Unicode Debug|x64
78-
{E8CF1ADA-264A-4127-86C2-FD7057D3792C}.Unicode Release Static|Win32.ActiveCfg = Unicode Release Static|Win32
79-
{E8CF1ADA-264A-4127-86C2-FD7057D3792C}.Unicode Release Static|Win32.Build.0 = Unicode Release Static|Win32
80-
{E8CF1ADA-264A-4127-86C2-FD7057D3792C}.Unicode Release Static|x64.ActiveCfg = Unicode Release Static|x64
81-
{E8CF1ADA-264A-4127-86C2-FD7057D3792C}.Unicode Release Static|x64.Build.0 = Unicode Release Static|x64
8258
{E8CF1ADA-264A-4127-86C2-FD7057D3792C}.Unicode Release|Win32.ActiveCfg = Unicode Release|Win32
8359
{E8CF1ADA-264A-4127-86C2-FD7057D3792C}.Unicode Release|Win32.Build.0 = Unicode Release|Win32
8460
{E8CF1ADA-264A-4127-86C2-FD7057D3792C}.Unicode Release|x64.ActiveCfg = Unicode Release|x64
@@ -91,34 +67,18 @@ Global
9167
{B5919129-6716-499D-9516-04EC34C86CDF}..NET Release|Win32.Build.0 = MD Release|Win32
9268
{B5919129-6716-499D-9516-04EC34C86CDF}..NET Release|x64.ActiveCfg = MD Release|x64
9369
{B5919129-6716-499D-9516-04EC34C86CDF}..NET Release|x64.Build.0 = MD Release|x64
94-
{B5919129-6716-499D-9516-04EC34C86CDF}.Debug Static|Win32.ActiveCfg = Debug|Win32
95-
{B5919129-6716-499D-9516-04EC34C86CDF}.Debug Static|Win32.Build.0 = Debug|Win32
96-
{B5919129-6716-499D-9516-04EC34C86CDF}.Debug Static|x64.ActiveCfg = Debug|x64
97-
{B5919129-6716-499D-9516-04EC34C86CDF}.Debug Static|x64.Build.0 = Debug|x64
9870
{B5919129-6716-499D-9516-04EC34C86CDF}.Debug|Win32.ActiveCfg = Debug|Win32
9971
{B5919129-6716-499D-9516-04EC34C86CDF}.Debug|Win32.Build.0 = Debug|Win32
10072
{B5919129-6716-499D-9516-04EC34C86CDF}.Debug|x64.ActiveCfg = Debug|x64
10173
{B5919129-6716-499D-9516-04EC34C86CDF}.Debug|x64.Build.0 = Debug|x64
102-
{B5919129-6716-499D-9516-04EC34C86CDF}.Release Static|Win32.ActiveCfg = Release|Win32
103-
{B5919129-6716-499D-9516-04EC34C86CDF}.Release Static|Win32.Build.0 = Release|Win32
104-
{B5919129-6716-499D-9516-04EC34C86CDF}.Release Static|x64.ActiveCfg = Release|x64
105-
{B5919129-6716-499D-9516-04EC34C86CDF}.Release Static|x64.Build.0 = Release|x64
10674
{B5919129-6716-499D-9516-04EC34C86CDF}.Release|Win32.ActiveCfg = Release|Win32
10775
{B5919129-6716-499D-9516-04EC34C86CDF}.Release|Win32.Build.0 = Release|Win32
10876
{B5919129-6716-499D-9516-04EC34C86CDF}.Release|x64.ActiveCfg = Release|x64
10977
{B5919129-6716-499D-9516-04EC34C86CDF}.Release|x64.Build.0 = Release|x64
110-
{B5919129-6716-499D-9516-04EC34C86CDF}.Unicode Debug Static|Win32.ActiveCfg = Debug|Win32
111-
{B5919129-6716-499D-9516-04EC34C86CDF}.Unicode Debug Static|Win32.Build.0 = Debug|Win32
112-
{B5919129-6716-499D-9516-04EC34C86CDF}.Unicode Debug Static|x64.ActiveCfg = Debug|x64
113-
{B5919129-6716-499D-9516-04EC34C86CDF}.Unicode Debug Static|x64.Build.0 = Debug|x64
11478
{B5919129-6716-499D-9516-04EC34C86CDF}.Unicode Debug|Win32.ActiveCfg = Debug|Win32
11579
{B5919129-6716-499D-9516-04EC34C86CDF}.Unicode Debug|Win32.Build.0 = Debug|Win32
11680
{B5919129-6716-499D-9516-04EC34C86CDF}.Unicode Debug|x64.ActiveCfg = Debug|x64
11781
{B5919129-6716-499D-9516-04EC34C86CDF}.Unicode Debug|x64.Build.0 = Debug|x64
118-
{B5919129-6716-499D-9516-04EC34C86CDF}.Unicode Release Static|Win32.ActiveCfg = Release|Win32
119-
{B5919129-6716-499D-9516-04EC34C86CDF}.Unicode Release Static|Win32.Build.0 = Release|Win32
120-
{B5919129-6716-499D-9516-04EC34C86CDF}.Unicode Release Static|x64.ActiveCfg = Release|x64
121-
{B5919129-6716-499D-9516-04EC34C86CDF}.Unicode Release Static|x64.Build.0 = Release|x64
12282
{B5919129-6716-499D-9516-04EC34C86CDF}.Unicode Release|Win32.ActiveCfg = Release|Win32
12383
{B5919129-6716-499D-9516-04EC34C86CDF}.Unicode Release|Win32.Build.0 = Release|Win32
12484
{B5919129-6716-499D-9516-04EC34C86CDF}.Unicode Release|x64.ActiveCfg = Release|x64
@@ -127,20 +87,12 @@ Global
12787
{E6EDE286-05E0-4396-B551-AB273111E967}..NET Debug|x64.ActiveCfg = Debug|Win32
12888
{E6EDE286-05E0-4396-B551-AB273111E967}..NET Release|Win32.ActiveCfg = Release|Win32
12989
{E6EDE286-05E0-4396-B551-AB273111E967}..NET Release|x64.ActiveCfg = Release|Win32
130-
{E6EDE286-05E0-4396-B551-AB273111E967}.Debug Static|Win32.ActiveCfg = Debug|Win32
131-
{E6EDE286-05E0-4396-B551-AB273111E967}.Debug Static|x64.ActiveCfg = Debug|Win32
13290
{E6EDE286-05E0-4396-B551-AB273111E967}.Debug|Win32.ActiveCfg = Debug|Win32
13391
{E6EDE286-05E0-4396-B551-AB273111E967}.Debug|x64.ActiveCfg = Debug|Win32
134-
{E6EDE286-05E0-4396-B551-AB273111E967}.Release Static|Win32.ActiveCfg = Release|Win32
135-
{E6EDE286-05E0-4396-B551-AB273111E967}.Release Static|x64.ActiveCfg = Release|Win32
13692
{E6EDE286-05E0-4396-B551-AB273111E967}.Release|Win32.ActiveCfg = Release|Win32
13793
{E6EDE286-05E0-4396-B551-AB273111E967}.Release|x64.ActiveCfg = Release|Win32
138-
{E6EDE286-05E0-4396-B551-AB273111E967}.Unicode Debug Static|Win32.ActiveCfg = Debug|Win32
139-
{E6EDE286-05E0-4396-B551-AB273111E967}.Unicode Debug Static|x64.ActiveCfg = Debug|Win32
14094
{E6EDE286-05E0-4396-B551-AB273111E967}.Unicode Debug|Win32.ActiveCfg = Debug|Win32
14195
{E6EDE286-05E0-4396-B551-AB273111E967}.Unicode Debug|x64.ActiveCfg = Debug|Win32
142-
{E6EDE286-05E0-4396-B551-AB273111E967}.Unicode Release Static|Win32.ActiveCfg = Release|Win32
143-
{E6EDE286-05E0-4396-B551-AB273111E967}.Unicode Release Static|x64.ActiveCfg = Release|Win32
14496
{E6EDE286-05E0-4396-B551-AB273111E967}.Unicode Release|Win32.ActiveCfg = Release|Win32
14597
{E6EDE286-05E0-4396-B551-AB273111E967}.Unicode Release|x64.ActiveCfg = Release|Win32
14698
EndGlobalSection

‎source/Client/BugTrap.vcxproj‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,6 @@
3232
<Link>
3333
<AdditionalDependencies>ws2_32.lib;comctl32.lib;shlwapi.lib;version.lib;wininet.lib;nothrownew.obj;%(AdditionalDependencies)</AdditionalDependencies>
3434
</Link>
35-
<Lib>
36-
<AdditionalDependencies>ws2_32.lib;comctl32.lib;shlwapi.lib;version.lib;wininet.lib;nothrownew.obj;%(AdditionalDependencies)</AdditionalDependencies>
37-
</Lib>
38-
</ItemDefinitionGroup>
39-
<ItemDefinitionGroup Condition="$(Configuration.Contains('Static'))">
40-
<ClCompile>
41-
<PreprocessorDefinitions>BUGTRAP_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
42-
</ClCompile>
43-
<ProjectReference>
44-
<LinkLibraryDependencies>true</LinkLibraryDependencies>
45-
</ProjectReference>
4635
</ItemDefinitionGroup>
4736
<ItemDefinitionGroup Condition="$(Configuration.Contains('.NET'))">
4837
<Link>

‎source/project_configuration.props‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@
66
<!--EnableUnitySupport Condition="'$(CI)'!=''">true</EnableUnitySupport-->
77
</PropertyGroup>
88

9-
<PropertyGroup Condition="$(Configuration.Contains('Static'))" Label="Configuration">
10-
<ConfigurationType>StaticLibrary</ConfigurationType>
11-
</PropertyGroup>
12-
139
<PropertyGroup Condition="$(Configuration.Contains('Unicode'))" Label="Configuration">
1410
<CharacterSet>Unicode</CharacterSet>
1511
</PropertyGroup>

‎source/project_configurations.props‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -33,22 +33,6 @@
3333
<Configuration>Release</Configuration>
3434
<Platform>x64</Platform>
3535
</ProjectConfiguration>
36-
<ProjectConfiguration Include="Debug Static|Win32">
37-
<Configuration>Debug Static</Configuration>
38-
<Platform>Win32</Platform>
39-
</ProjectConfiguration>
40-
<ProjectConfiguration Include="Debug Static|x64">
41-
<Configuration>Debug Static</Configuration>
42-
<Platform>x64</Platform>
43-
</ProjectConfiguration>
44-
<ProjectConfiguration Include="Release Static|Win32">
45-
<Configuration>Release Static</Configuration>
46-
<Platform>Win32</Platform>
47-
</ProjectConfiguration>
48-
<ProjectConfiguration Include="Release Static|x64">
49-
<Configuration>Release Static</Configuration>
50-
<Platform>x64</Platform>
51-
</ProjectConfiguration>
5236
<ProjectConfiguration Include="Unicode Debug|Win32">
5337
<Configuration>Unicode Debug</Configuration>
5438
<Platform>Win32</Platform>
@@ -65,21 +49,5 @@
6549
<Configuration>Unicode Release</Configuration>
6650
<Platform>x64</Platform>
6751
</ProjectConfiguration>
68-
<ProjectConfiguration Include="Unicode Debug Static|Win32">
69-
<Configuration>Unicode Debug Static</Configuration>
70-
<Platform>Win32</Platform>
71-
</ProjectConfiguration>
72-
<ProjectConfiguration Include="Unicode Debug Static|x64">
73-
<Configuration>Unicode Debug Static</Configuration>
74-
<Platform>x64</Platform>
75-
</ProjectConfiguration>
76-
<ProjectConfiguration Include="Unicode Release Static|Win32">
77-
<Configuration>Unicode Release Static</Configuration>
78-
<Platform>Win32</Platform>
79-
</ProjectConfiguration>
80-
<ProjectConfiguration Include="Unicode Release Static|x64">
81-
<Configuration>Unicode Release Static</Configuration>
82-
<Platform>x64</Platform>
83-
</ProjectConfiguration>
8452
</ItemGroup>
8553
</Project>

0 commit comments

Comments
 (0)