Skip to content

Commit b49c7e6

Browse files
Icaro-LimaIcaro-Lima
committed
Corrigido os includes para funcionar em Linux, falta verificar se isso não afetou o funcionamento no Windows
1 parent 1792c2a commit b49c7e6

26 files changed

+5817
-1896
lines changed

‎LabarcFPGASimulatorDesktop/LabarcFPGASimulatorDesktop.csproj‎

Lines changed: 55 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -34,10 +34,6 @@
3434
<ItemGroup>
3535
<Reference Include="PresentationCore" />
3636
<Reference Include="PresentationFramework" />
37-
<Reference Include="ScintillaNET, Version=3.6.3.0, Culture=neutral, processorArchitecture=MSIL">
38-
<SpecificVersion>False</SpecificVersion>
39-
<HintPath>bin\Release\ScintillaNET.dll</HintPath>
40-
</Reference>
4137
<Reference Include="System" />
4238
<Reference Include="System.Core" />
4339
<Reference Include="System.Xaml" />
@@ -74,12 +70,6 @@
7470
<SubType>Designer</SubType>
7571
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
7672
</EmbeddedResource>
77-
<Content Include="include\verilated.mk.in">
78-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
79-
</Content>
80-
<Content Include="include\verilated.v">
81-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
82-
</Content>
8373
<None Include="packages.config" />
8474
<None Include="Properties\Settings.settings">
8575
<Generator>SettingsSingleFileGenerator</Generator>
@@ -95,58 +85,85 @@
9585
<DependentUpon>Settings.settings</DependentUpon>
9686
<DesignTimeSharedInput>True</DesignTimeSharedInput>
9787
</Compile>
98-
<Content Include="include\verilated.cpp">
88+
<Content Include="Main.cpp">
9989
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
10090
</Content>
101-
<Content Include="include\verilated.h">
91+
<Content Include="Readme.txt" />
92+
<None Include="Resources\Resistor.png" />
93+
<Content Include="Verilog.xshd">
10294
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
10395
</Content>
104-
<Content Include="include\verilatedos.h">
105-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
96+
<Content Include="include\verilated.cpp">
97+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
98+
</Content>
99+
<Content Include="include\verilated.h">
100+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
101+
</Content>
102+
<Content Include="include\verilated.mk">
103+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
104+
</Content>
105+
<Content Include="include\verilated.v">
106+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
107+
</Content>
108+
<Content Include="include\verilated_config.h">
109+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
110+
</Content>
111+
<Content Include="include\verilated_config.h.in">
112+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
113+
</Content>
114+
<Content Include="include\verilated_cov.cpp">
115+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
116+
</Content>
117+
<Content Include="include\verilated_cov.h">
118+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
119+
</Content>
120+
<Content Include="include\verilated_cov_key.h">
121+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
106122
</Content>
107123
<Content Include="include\verilated_dpi.cpp">
108-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
124+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
109125
</Content>
110126
<Content Include="include\verilated_dpi.h">
111-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
127+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
112128
</Content>
113129
<Content Include="include\verilated_heavy.h">
114-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
130+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
115131
</Content>
116132
<Content Include="include\verilated_imp.h">
117-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
133+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
134+
</Content>
135+
<Content Include="include\verilatedos.h">
136+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
137+
</Content>
138+
<Content Include="include\verilated_save.cpp">
139+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
140+
</Content>
141+
<Content Include="include\verilated_save.h">
142+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
118143
</Content>
119144
<Content Include="include\verilated_sc.h">
120-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
145+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
121146
</Content>
122147
<Content Include="include\verilated_syms.h">
123-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
148+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
124149
</Content>
125150
<Content Include="include\verilated_vcd_c.cpp">
126-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
151+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
127152
</Content>
128153
<Content Include="include\verilated_vcd_c.h">
129-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
154+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
130155
</Content>
131156
<Content Include="include\verilated_vcd_sc.cpp">
132-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
157+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
133158
</Content>
134159
<Content Include="include\verilated_vcd_sc.h">
135-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
160+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
136161
</Content>
137162
<Content Include="include\verilated_vpi.cpp">
138-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
163+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
139164
</Content>
140165
<Content Include="include\verilated_vpi.h">
141-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
142-
</Content>
143-
<Content Include="Main.cpp">
144-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
145-
</Content>
146-
<Content Include="Readme.txt" />
147-
<None Include="Resources\Resistor.png" />
148-
<Content Include="Verilog.xshd">
149-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
166+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
150167
</Content>
151168
</ItemGroup>
152169
<ItemGroup>
@@ -191,5 +208,8 @@
191208
<ItemGroup>
192209
<None Include="Resources\0035ffc7-2479-49a1-9c7a-190fe34d5445.png" />
193210
</ItemGroup>
211+
<ItemGroup>
212+
<Folder Include="include\" />
213+
</ItemGroup>
194214
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
195215
</Project>

‎LabarcFPGASimulatorDesktop/Main.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
VMain * vmain;
77

8+
using namespace std;
9+
810
int main() {
911
vmain = new VMain;
1012

0 commit comments

Comments
 (0)