Skip to content
Snippets Groups Projects
Commit 33b66b74 authored by Tim Übelhör's avatar Tim Übelhör
Browse files

fixed x86 builds

parent a37782a9
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Basics/Basics.csproj
+ 1
− 0
View file @ 33b66b74
......@@ -20,6 +20,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<PlatformTarget>x86</PlatformTarget>
<OutputPath>bin\x86\Debug\</OutputPath>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<PlatformTarget>x86</PlatformTarget>
......
FmiWrapper @ 0888d008
Compare 61235b39 to 0888d008
Subproject commit 61235b3993374b0878e0f2b4ab8cddc9da2dfe39
Subproject commit 0888d008f646c8edd2361952dc5c65a231a10451
LabChartExport @ 1c2f2f85
Compare 429b6c6c to 1c2f2f85
Subproject commit 429b6c6c546023c39e089387c6de778837514041
Subproject commit 1c2f2f85c8788190bdf255eb178bcfa454e534cd
LocalMode/LocalMode.csproj
+ 1
− 0
View file @ 33b66b74
......@@ -21,6 +21,7 @@
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\x86\Release\</OutputPath>
......
ModeliChart/ModeliChart.csproj
+ 9
− 1
View file @ 33b66b74
......@@ -185,7 +185,7 @@
</Content>
<Content Include="irt_icon.ico" />
</ItemGroup>
<ItemGroup>
<ItemGroup Condition="$(Platform)==x64">
<Content Include="..\FmiWrapper\src\visual_studio\FmiWrapper\bin\$(Platform)\$(Configuration)\FmiWrapper.dll" Link="FmiWrapper.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
......@@ -193,6 +193,14 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup Condition="$(Platform)==x86">
<Content Include="..\FmiWrapper\src\visual_studio\FmiWrapper\bin\Win32\$(Configuration)\FmiWrapper.dll" Link="FmiWrapper.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="..\FmiWrapper\src\visual_studio\FmiWrapper\bin\Win32\$(Configuration)\FmiWrapper.pdb" Link="FmiWrapper.pdb">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<WCFMetadata Include="Service References\" />
</ItemGroup>
......
UI/ChannelLinkArea.Designer.cs
+ 8
− 5
View file @ 33b66b74
......@@ -43,10 +43,11 @@
this.tableLayoutPanel.Controls.Add(this.btnAdd, 0, 0);
this.tableLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel.Location = new System.Drawing.Point(0, 0);
this.tableLayoutPanel.Margin = new System.Windows.Forms.Padding(1, 2, 1, 2);
this.tableLayoutPanel.Name = "tableLayoutPanel";
this.tableLayoutPanel.RowCount = 1;
this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tableLayoutPanel.Size = new System.Drawing.Size(584, 361);
this.tableLayoutPanel.Size = new System.Drawing.Size(270, 180);
this.tableLayoutPanel.TabIndex = 0;
//
// btnAdd
......@@ -55,9 +56,10 @@
this.btnAdd.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btnAdd.Image = global::ModeliChart.UI.Properties.Resources.add_46;
this.btnAdd.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnAdd.Location = new System.Drawing.Point(3, 3);
this.btnAdd.Location = new System.Drawing.Point(1, 2);
this.btnAdd.Margin = new System.Windows.Forms.Padding(1, 2, 1, 2);
this.btnAdd.Name = "btnAdd";
this.btnAdd.Size = new System.Drawing.Size(240, 58);
this.btnAdd.Size = new System.Drawing.Size(148, 52);
this.btnAdd.TabIndex = 2;
this.btnAdd.Text = "New Link";
this.btnAdd.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -66,12 +68,13 @@
//
// ChannelLinkArea
//
this.AutoScaleDimensions = new System.Drawing.SizeF(13F, 26F);
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(584, 361);
this.ClientSize = new System.Drawing.Size(270, 180);
this.Controls.Add(this.tableLayoutPanel);
this.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.HideOnClose = true;
this.Margin = new System.Windows.Forms.Padding(1, 2, 1, 2);
this.Name = "ChannelLinkArea";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "ChannelLinkArea";
......
UI/MainWindow.Designer.cs
+ 5
− 8
View file @ 33b66b74
......@@ -263,17 +263,15 @@ namespace ModeliChart.UI
this.dockPanel.DockLeftPortion = 200D;
this.dockPanel.DockRightPortion = 200D;
this.dockPanel.DocumentStyle = WeifenLuo.WinFormsUI.Docking.DocumentStyle.DockingWindow;
this.dockPanel.Location = new System.Drawing.Point(0, 146);
this.dockPanel.Margin = new System.Windows.Forms.Padding(6);
this.dockPanel.Location = new System.Drawing.Point(0, 160);
this.dockPanel.Name = "dockPanel";
this.dockPanel.Size = new System.Drawing.Size(2310, 825);
this.dockPanel.Size = new System.Drawing.Size(962, 345);
this.dockPanel.TabIndex = 1;
//
// Ribbon
//
this.Ribbon.Font = new System.Drawing.Font("Segoe UI", 9F);
this.Ribbon.Location = new System.Drawing.Point(0, 0);
this.Ribbon.Margin = new System.Windows.Forms.Padding(6);
this.Ribbon.Minimized = false;
this.Ribbon.Name = "Ribbon";
//
......@@ -294,7 +292,7 @@ namespace ModeliChart.UI
this.Ribbon.OrbStyle = System.Windows.Forms.RibbonOrbStyle.Office_2013;
this.Ribbon.OrbText = "File";
this.Ribbon.RibbonTabFont = new System.Drawing.Font("Trebuchet MS", 9F);
this.Ribbon.Size = new System.Drawing.Size(2310, 146);
this.Ribbon.Size = new System.Drawing.Size(962, 160);
this.Ribbon.TabIndex = 0;
this.Ribbon.Tabs.Add(this.ribbonTabSimulation);
this.Ribbon.Tabs.Add(this.ribTabChannels);
......@@ -471,14 +469,13 @@ namespace ModeliChart.UI
//
// MainWindow
//
this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 25F);
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(2310, 971);
this.ClientSize = new System.Drawing.Size(962, 505);
this.Controls.Add(this.dockPanel);
this.Controls.Add(this.Ribbon);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.KeyPreview = true;
this.Margin = new System.Windows.Forms.Padding(6);
this.Name = "MainWindow";
this.Text = "ModeliChart";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
......
UI/UI.csproj
+ 1
− 0
View file @ 33b66b74
......@@ -43,6 +43,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<PlatformTarget>x86</PlatformTarget>
<OutputPath>bin\x86\Debug\</OutputPath>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<PlatformTarget>x86</PlatformTarget>
......
UserControls/UserControls.csproj
+ 1
− 0
View file @ 33b66b74
......@@ -44,6 +44,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<PlatformTarget>x86</PlatformTarget>
<OutputPath>bin\x86\Debug\</OutputPath>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<PlatformTarget>x86</PlatformTarget>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment