aaron/ispc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1162 from dbabokin/win_build

Browse Source 
Win build
This commit is contained in:
Dmitry Babokin
2016-02-02 17:37:37 +03:00
parent 9eedbeeb72 9ae39d8361
commit 1c8f606fd2
3 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ispc.vcxproj
View File

@@ -100,6 +100,7 @@
<ClInclude Include="expr.h" /> <ClInclude Include="expr.h" />
<ClInclude Include="func.h" /> <ClInclude Include="func.h" />
<ClInclude Include="ispc.h" /> <ClInclude Include="ispc.h" />
<ClInclude Include="ispc_version.h" />
<ClInclude Include="llvmutil.h" /> <ClInclude Include="llvmutil.h" />
<ClInclude Include="module.h" /> <ClInclude Include="module.h" />
<ClInclude Include="opt.h" /> <ClInclude Include="opt.h" />

2
ispc_version.h
View File

@@ -1,5 +1,5 @@
/* /*
Copyright (c) 2015, Intel Corporation Copyright (c) 2015-2016, Intel Corporation
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without

16
main.cpp
View File

@@ -1,5 +1,5 @@
/* /*
Copyright (c) 2010-2015, Intel Corporation Copyright (c) 2010-2016, Intel Corporation
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
@@ -56,14 +56,28 @@
#define BUILD_DATE __DATE__ #define BUILD_DATE __DATE__
#endif #endif
#define BUILD_VERSION "" #define BUILD_VERSION ""
#if _MSC_VER >= 1900
#define ISPC_VS_VERSION "Visual Studio 2015 and later"
#else
#define ISPC_VS_VERSION "Visual Studio 2013 and earlier"
#endif
#endif // ISPC_IS_WINDOWS #endif // ISPC_IS_WINDOWS
static void static void
lPrintVersion() { lPrintVersion() {
#ifdef ISPC_IS_WINDOWS
printf("Intel(r) SPMD Program Compiler (ispc), %s (build date %s, LLVM %s)\n"
"Supported Visual Studio versions: %s.\n",
ISPC_VERSION, BUILD_DATE,
ISPC_LLVM_VERSION_STRING,
ISPC_VS_VERSION
);
#else
printf("Intel(r) SPMD Program Compiler (ispc), %s (build %s @ %s, LLVM %s)\n", printf("Intel(r) SPMD Program Compiler (ispc), %s (build %s @ %s, LLVM %s)\n",
ISPC_VERSION, BUILD_VERSION, BUILD_DATE, ISPC_VERSION, BUILD_VERSION, BUILD_DATE,
ISPC_LLVM_VERSION_STRING ISPC_LLVM_VERSION_STRING
); );
#endif
} }