Skip to content

Commit 62a978d

Browse files
committed
Upgrade to Visual Studio 2017 for LLVM support
1 parent 7c89ec7 commit 62a978d

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

Diff for: .gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@
4141
*.su
4242
*.idb
4343
*.pdb
44+
*.suo
45+
*.db
4446

4547
*.log
4648
*.filters

Diff for: Cone.vcxproj

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -13,18 +13,21 @@
1313
<PropertyGroup Label="Globals">
1414
<ProjectGuid>{87BC1467-6463-4F7E-9DE8-539049C89DFB}</ProjectGuid>
1515
<RootNamespace>Cone</RootNamespace>
16+
<WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
1617
</PropertyGroup>
1718
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
1819
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
1920
<ConfigurationType>Application</ConfigurationType>
2021
<UseDebugLibraries>true</UseDebugLibraries>
2122
<CharacterSet>MultiByte</CharacterSet>
23+
<PlatformToolset>v141</PlatformToolset>
2224
</PropertyGroup>
2325
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
2426
<ConfigurationType>Application</ConfigurationType>
2527
<UseDebugLibraries>false</UseDebugLibraries>
2628
<WholeProgramOptimization>true</WholeProgramOptimization>
2729
<CharacterSet>MultiByte</CharacterSet>
30+
<PlatformToolset>v141</PlatformToolset>
2831
</PropertyGroup>
2932
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
3033
<ImportGroup Label="ExtensionSettings">

Diff for: src/c-compiler/genllvm/genllvm.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
// Generate a term
1515
void genlTerm(AstNode *termnode) {
1616
if (termnode->asttype == ULitNode) {
17-
printf("OMG Found an integer %ld\n", ((ULitAstNode*)termnode)->uintlit);
17+
printf("OMG Found an integer %lld\n", ((ULitAstNode*)termnode)->uintlit);
1818
}
1919
else if (termnode->asttype == FLitNode) {
2020
printf("OMG Found a float %f\n", ((FLitAstNode*)termnode)->floatlit);

Diff for: src/c-compiler/parser/lexer.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ void lexPop() {
6363
}
6464

6565
/** Return value of hex digit, or -1 if not correct */
66-
char *lexHexDigits(int cnt, char *srcp, uint32_t *val) {
66+
char *lexHexDigits(int cnt, char *srcp, uint64_t *val) {
6767
*val = 0;
6868
while (cnt--) {
6969
*val <<= 4;
@@ -82,7 +82,7 @@ char *lexHexDigits(int cnt, char *srcp, uint32_t *val) {
8282
}
8383

8484
/** Turn escape sequence into a single character */
85-
char *lexScanEscape(char *srcp, uint32_t *charval) {
85+
char *lexScanEscape(char *srcp, uint64_t *charval) {
8686
switch (*++srcp) {
8787
case 'a': *charval = '\a'; return ++srcp;
8888
case 'b': *charval = '\b'; return ++srcp;

0 commit comments

Comments
 (0)