Skip to content

Commit 61b7a31

Browse files
hector.espesohector.espeso
authored andcommitted
Keep fdbuild on x86 under the AnyCPU solution configuration and set the right output for BookmarkPanel on AnyCPU, it got changed after some merge I think.
1 parent d5b4ff4 commit 61b7a31

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

External/Plugins/BookmarkPanel/BookmarkPanel.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
5151
<DebugType>None</DebugType>
5252
<Optimize>true</Optimize>
53-
<OutputPath>bin\</OutputPath>
53+
<OutputPath>..\..\..\FlashDevelop\Bin\Debug\Plugins\</OutputPath>
5454
<DefineConstants>TRACE</DefineConstants>
5555
<ErrorReport>prompt</ErrorReport>
5656
<WarningLevel>4</WarningLevel>

FlashDevelop.sln

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2010
3+
# Visual Studio 14
4+
VisualStudioVersion = 14.0.23107.0
5+
MinimumVisualStudioVersion = 10.0.40219.1
46
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FlashDevelop", "FlashDevelop\FlashDevelop.csproj", "{EFD07485-9A64-4EEC-94E7-ACBD4DA5CA93}"
57
ProjectSection(ProjectDependencies) = postProject
68
{61885F70-B4DC-4B44-852D-5D6D03F2A734} = {61885F70-B4DC-4B44-852D-5D6D03F2A734}
@@ -347,8 +349,8 @@ Global
347349
{FF680DE0-9CB7-45F4-BAFA-6EFFAAFD9C09}.Debug|Any CPU.Build.0 = Debug|x86
348350
{FF680DE0-9CB7-45F4-BAFA-6EFFAAFD9C09}.Debug|x86.ActiveCfg = Debug|x86
349351
{FF680DE0-9CB7-45F4-BAFA-6EFFAAFD9C09}.Debug|x86.Build.0 = Debug|x86
350-
{FF680DE0-9CB7-45F4-BAFA-6EFFAAFD9C09}.Release|Any CPU.ActiveCfg = Release|Any CPU
351-
{FF680DE0-9CB7-45F4-BAFA-6EFFAAFD9C09}.Release|Any CPU.Build.0 = Release|Any CPU
352+
{FF680DE0-9CB7-45F4-BAFA-6EFFAAFD9C09}.Release|Any CPU.ActiveCfg = Release|x86
353+
{FF680DE0-9CB7-45F4-BAFA-6EFFAAFD9C09}.Release|Any CPU.Build.0 = Release|x86
352354
{FF680DE0-9CB7-45F4-BAFA-6EFFAAFD9C09}.Release|x86.ActiveCfg = Release|x86
353355
{FF680DE0-9CB7-45F4-BAFA-6EFFAAFD9C09}.Release|x86.Build.0 = Release|x86
354356
EndGlobalSection

0 commit comments

Comments
 (0)