Skip to content

Commit 00f3329

Browse files
ddobrevddobrev
committed
Updated to the latest C++#.
Signed-off-by: Dimitar Dobrev <[email protected]>
1 parent c87bf12 commit 00f3329

File tree

6 files changed

+21
-24
lines changed

6 files changed

+21
-24
lines changed

‎QtSharp.CLI/QtSharp.CLI.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,27 +63,27 @@
6363
</PropertyGroup>
6464
<ItemGroup>
6565
<Reference Include="CppSharp, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
66-
<HintPath>..\packages\CppSharp.0.7.4\lib\CppSharp.dll</HintPath>
66+
<HintPath>..\packages\CppSharp.0.7.7\lib\CppSharp.dll</HintPath>
6767
<Private>True</Private>
6868
</Reference>
6969
<Reference Include="CppSharp.AST, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
70-
<HintPath>..\packages\CppSharp.0.7.4\lib\CppSharp.AST.dll</HintPath>
70+
<HintPath>..\packages\CppSharp.0.7.7\lib\CppSharp.AST.dll</HintPath>
7171
<Private>True</Private>
7272
</Reference>
7373
<Reference Include="CppSharp.Generator, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
74-
<HintPath>..\packages\CppSharp.0.7.4\lib\CppSharp.Generator.dll</HintPath>
74+
<HintPath>..\packages\CppSharp.0.7.7\lib\CppSharp.Generator.dll</HintPath>
7575
<Private>True</Private>
7676
</Reference>
7777
<Reference Include="CppSharp.Parser, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
78-
<HintPath>..\packages\CppSharp.0.7.4\lib\CppSharp.Parser.dll</HintPath>
78+
<HintPath>..\packages\CppSharp.0.7.7\lib\CppSharp.Parser.dll</HintPath>
7979
<Private>True</Private>
8080
</Reference>
8181
<Reference Include="CppSharp.Parser.CLI, Version=0.0.0.0, Culture=neutral, processorArchitecture=AMD64">
82-
<HintPath>..\packages\CppSharp.0.7.4\lib\CppSharp.Parser.CLI.dll</HintPath>
82+
<HintPath>..\packages\CppSharp.0.7.7\lib\CppSharp.Parser.CLI.dll</HintPath>
8383
<Private>True</Private>
8484
</Reference>
8585
<Reference Include="CppSharp.Runtime, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
86-
<HintPath>..\packages\CppSharp.0.7.4\lib\CppSharp.Runtime.dll</HintPath>
86+
<HintPath>..\packages\CppSharp.0.7.7\lib\CppSharp.Runtime.dll</HintPath>
8787
<Private>True</Private>
8888
</Reference>
8989
<Reference Include="System" />

‎QtSharp.CLI/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Baseclass.Contrib.Nuget.Output" version="2.1.0" targetFramework="net451" />
4-
<package id="CppSharp" version="0.7.4" targetFramework="net451" developmentDependency="true" />
4+
<package id="CppSharp" version="0.7.7" targetFramework="net451" developmentDependency="true" />
55
</packages>

‎QtSharp/CompileInlinesPass.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public override bool VisitASTContext(ASTContext context)
4848
}
4949
}
5050
var parserOptions = new ParserOptions();
51-
parserOptions.addLibraryDirs(dir);
51+
parserOptions.AddLibraryDirs(dir);
5252
parserOptions.LibraryFile = inlines;
5353
using (var parserResult = CppSharp.Parser.ClangParser.ParseLibrary(parserOptions))
5454
{

‎QtSharp/QtSharp.cs‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -228,16 +228,13 @@ public void Setup(Driver driver)
228228
driver.ParserOptions.TargetTriple = this.qtInfo.Target;
229229
driver.ParserOptions.Abi = CppAbi.Itanium;
230230
driver.ParserOptions.Verbose = true;
231-
driver.ParserOptions.addDefines("__float128=void");
231+
driver.ParserOptions.AddDefines("__float128=void");
232232
driver.Options.GeneratorKind = GeneratorKind.CSharp;
233-
driver.Options.GeneratePropertiesAdvanced = true;
234233
driver.Options.UnityBuild = true;
235234
driver.Options.IgnoreParseWarnings = true;
236235
driver.Options.CheckSymbols = true;
237-
driver.Options.GenerateInlines = true;
238236
driver.Options.CompileCode = true;
239237
driver.Options.GenerateDefaultValuesForArguments = true;
240-
driver.Options.GenerateConversionOperators = true;
241238
driver.Options.MarshalCharAsManagedChar = true;
242239

243240
string dir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
@@ -302,18 +299,18 @@ public void Setup(Driver driver)
302299
}
303300

304301
foreach (var systemIncludeDir in this.qtInfo.SystemIncludeDirs)
305-
driver.ParserOptions.addSystemIncludeDirs(systemIncludeDir);
302+
driver.ParserOptions.AddSystemIncludeDirs(systemIncludeDir);
306303

307304
if (Platform.IsMacOS)
308305
{
309306
foreach (var frameworkDir in this.qtInfo.FrameworkDirs)
310-
driver.ParserOptions.addArguments(string.Format("-F{0}", frameworkDir));
311-
driver.ParserOptions.addArguments(string.Format("-F{0}", qtInfo.Libs));
307+
driver.ParserOptions.AddArguments(string.Format("-F{0}", frameworkDir));
308+
driver.ParserOptions.AddArguments(string.Format("-F{0}", qtInfo.Libs));
312309
}
313310

314-
driver.ParserOptions.addIncludeDirs(qtInfo.Headers);
311+
driver.ParserOptions.AddIncludeDirs(qtInfo.Headers);
315312

316-
driver.ParserOptions.addLibraryDirs(Platform.IsWindows ? qtInfo.Bins : qtInfo.Libs);
313+
driver.ParserOptions.AddLibraryDirs(Platform.IsWindows ? qtInfo.Bins : qtInfo.Libs);
317314

318315
// Qt defines its own GUID with the same header guard as the system GUID, so ensure the system GUID is read first
319316
driver.Project.AddFile("guiddef.h");

‎QtSharp/QtSharp.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,27 +38,27 @@
3838
</PropertyGroup>
3939
<ItemGroup>
4040
<Reference Include="CppSharp, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
41-
<HintPath>..\packages\CppSharp.0.7.4\lib\CppSharp.dll</HintPath>
41+
<HintPath>..\packages\CppSharp.0.7.7\lib\CppSharp.dll</HintPath>
4242
<Private>True</Private>
4343
</Reference>
4444
<Reference Include="CppSharp.AST, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\CppSharp.0.7.4\lib\CppSharp.AST.dll</HintPath>
45+
<HintPath>..\packages\CppSharp.0.7.7\lib\CppSharp.AST.dll</HintPath>
4646
<Private>True</Private>
4747
</Reference>
4848
<Reference Include="CppSharp.Generator, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
49-
<HintPath>..\packages\CppSharp.0.7.4\lib\CppSharp.Generator.dll</HintPath>
49+
<HintPath>..\packages\CppSharp.0.7.7\lib\CppSharp.Generator.dll</HintPath>
5050
<Private>True</Private>
5151
</Reference>
5252
<Reference Include="CppSharp.Parser, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
53-
<HintPath>..\packages\CppSharp.0.7.4\lib\CppSharp.Parser.dll</HintPath>
53+
<HintPath>..\packages\CppSharp.0.7.7\lib\CppSharp.Parser.dll</HintPath>
5454
<Private>True</Private>
5555
</Reference>
5656
<Reference Include="CppSharp.Parser.CLI, Version=0.0.0.0, Culture=neutral, processorArchitecture=AMD64">
57-
<HintPath>..\packages\CppSharp.0.7.4\lib\CppSharp.Parser.CLI.dll</HintPath>
57+
<HintPath>..\packages\CppSharp.0.7.7\lib\CppSharp.Parser.CLI.dll</HintPath>
5858
<Private>True</Private>
5959
</Reference>
6060
<Reference Include="CppSharp.Runtime, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
61-
<HintPath>..\packages\CppSharp.0.7.4\lib\CppSharp.Runtime.dll</HintPath>
61+
<HintPath>..\packages\CppSharp.0.7.7\lib\CppSharp.Runtime.dll</HintPath>
6262
<Private>True</Private>
6363
</Reference>
6464
<Reference Include="HtmlAgilityPack, Version=1.4.9.5, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">

‎QtSharp/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Baseclass.Contrib.Nuget.Output" version="2.1.0" targetFramework="net451" />
4-
<package id="CppSharp" version="0.7.4" targetFramework="net451" developmentDependency="true" />
4+
<package id="CppSharp" version="0.7.7" targetFramework="net451" developmentDependency="true" />
55
<package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net451" />
66
<package id="zlib.net" version="1.0.4" targetFramework="net451" />
77
</packages>

0 commit comments

Comments
 (0)