Skip to content

Commit 7a9f05b

Browse files
committed
- CodeFormatter: Do not force add brackets
- AStyle: Added support of #end directive for Haxe - AStyle: Removed other projects
1 parent 80bf163 commit 7a9f05b

File tree

17 files changed

+12
-1126
lines changed

17 files changed

+12
-1126
lines changed

External/Plugins/CodeFormatter/AStyle/AStyleInterface.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ private static IntPtr AStyleGetVersion()
4444
private AStyleErrorDelgate AStyleError;
4545

4646
/// AStyleMainUtf16 Constants.
47-
public const String DefaultOptions = "--indent-namespaces --indent-preproc-block --indent-switches --indent-cases --delete-empty-lines --pad-header --keep-one-line-blocks --keep-one-line-statements --close-templates --add-brackets";
47+
public const String DefaultOptions = "--indent-namespaces --indent-preproc-block --indent-preproc-cond --indent-switches --indent-cases --delete-empty-lines --pad-header --keep-one-line-blocks --keep-one-line-statements --close-templates";
4848

4949
/// <summary>
5050
/// Declare callback functions.

External/Tools/AStyle/build/vs2015/AStyle.sln

Lines changed: 0 additions & 34 deletions
This file was deleted.

External/Tools/AStyle/build/vs2015/AStyle/AStyle.vcxproj

Lines changed: 0 additions & 268 deletions
This file was deleted.

External/Tools/AStyle/build/vs2015/AStyle/AStyle.vcxproj.filters

Lines changed: 0 additions & 48 deletions
This file was deleted.

External/Tools/AStyle/build/vs2015/AStyleDll/AStyleDll.vcxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
111111
<LinkIncremental>false</LinkIncremental>
112112
<OutDir>$(SolutionDir)bin\</OutDir>
113-
<TargetName>AStyle-2.06</TargetName>
113+
<TargetName>AStyle</TargetName>
114114
</PropertyGroup>
115115
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static|Win32'">
116116
<LinkIncremental>false</LinkIncremental>
@@ -120,7 +120,7 @@
120120
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
121121
<LinkIncremental>false</LinkIncremental>
122122
<OutDir>$(SolutionDir)$(Platform)\bin\</OutDir>
123-
<TargetName>AStyle-2.06</TargetName>
123+
<TargetName>AStyle64</TargetName>
124124
</PropertyGroup>
125125
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static|x64'">
126126
<LinkIncremental>false</LinkIncremental>
@@ -269,4 +269,4 @@
269269
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
270270
<ImportGroup Label="ExtensionTargets">
271271
</ImportGroup>
272-
</Project>
272+
</Project>

0 commit comments

Comments
 (0)