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

Use LLVM_VERSION env variable to get LLVM version with MSVC build.

Browse Source 
Previously, it was set directly in the ispc.vcxproj file.

Issue #371.
This commit is contained in:
Matt Pharr
2012-09-06 06:04:32 -07:00
parent ddcd0a49ec
commit 0ce67f37ac
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
buildispc.bat
View File

@@ -2,8 +2,8 @@
REM If LLVM_INSTALL_DIR isn't set globally in your environment, REM If LLVM_INSTALL_DIR isn't set globally in your environment,
REM it can be set here_ REM it can be set here_
set LLVM_INSTALL_DIR=c:\users\mmp\llvm-dev REM set LLVM_INSTALL_DIR=c:\users\mmp\llvm-dev
set LLVM_VERSION=3.2 REM set LLVM_VERSION=3.2
REM Both the LLVM binaries and python need to be in the path REM Both the LLVM binaries and python need to be in the path
set path=%LLVM_INSTALL_DIR%\bin;%PATH%;c:\cygwin\bin set path=%LLVM_INSTALL_DIR%\bin;%PATH%;c:\cygwin\bin

4
ispc.vcxproj
View File

@@ -380,7 +380,7 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PreprocessorDefinitions>NOMINMAX;LLVM_3_1</PreprocessorDefinitions> <PreprocessorDefinitions>NOMINMAX;%LLVM_VERSION%</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(LLVM_INSTALL_DIR)\include;.;.\winstuff;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(LLVM_INSTALL_DIR)\include;.;.\winstuff;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4146;4800;4996;4355;4624</DisableSpecificWarnings> <DisableSpecificWarnings>4146;4800;4996;4355;4624</DisableSpecificWarnings>
</ClCompile> </ClCompile>
@@ -398,7 +398,7 @@
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>NOMINMAX;LLVM_3_1</PreprocessorDefinitions> <PreprocessorDefinitions>NOMINMAX;%LLVM_VERSION%</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(LLVM_INSTALL_DIR)\include;.;.\winstuff;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(LLVM_INSTALL_DIR)\include;.;.\winstuff;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4146;4800;4996;4355;4624</DisableSpecificWarnings> <DisableSpecificWarnings>4146;4800;4996;4355;4624</DisableSpecificWarnings>
</ClCompile> </ClCompile>