Skip to content

Commit b485bc6

Browse files
committed
Remove Static configurations
Due to how resources work and other peculiarities it is hard to make it work good
1 parent 7f7ea46 commit b485bc6

File tree

4 files changed

+1
-50
lines changed

4 files changed

+1
-50
lines changed

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/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)