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

removing winstuff

Browse Source
This commit is contained in:
Ilia Filippov
2014-04-02 12:45:21 +04:00
parent 5a16b3eb10
commit b1bf08c0d9
5 changed files with 6 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
alloy.py
View File

@@ -292,6 +292,8 @@ def build_ispc(version_LLVM, make):
p_temp = os.getenv("LLVM_INSTALL_DIR") p_temp = os.getenv("LLVM_INSTALL_DIR")
v_temp = os.getenv("LLVM_VERSION") v_temp = os.getenv("LLVM_VERSION")
os.environ["LLVM_INSTALL_DIR"] = os.environ["LLVM_HOME"] + "\\bin-" + version_LLVM os.environ["LLVM_INSTALL_DIR"] = os.environ["LLVM_HOME"] + "\\bin-" + version_LLVM
if version_LLVM == "3.2":
temp = "3_2"
if version_LLVM == "3.3": if version_LLVM == "3.3":
temp = "3_3" temp = "3_3"
if version_LLVM == "3.4": if version_LLVM == "3.4":

7
ispc.vcxproj
View File

@@ -105,7 +105,6 @@
<ClInclude Include="sym.h" /> <ClInclude Include="sym.h" />
<ClInclude Include="type.h" /> <ClInclude Include="type.h" />
<ClInclude Include="util.h" /> <ClInclude Include="util.h" />
<ClInclude Include="winstuff\unistd.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<CustomBuild Include="stdlib.ispc"> <CustomBuild Include="stdlib.ispc">
@@ -396,7 +395,7 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PreprocessorDefinitions>NOMINMAX;%LLVM_VERSION%</PreprocessorDefinitions> <PreprocessorDefinitions>NOMINMAX;%LLVM_VERSION%</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(LLVM_INSTALL_DIR)\include;.;.\winstuff;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(LLVM_INSTALL_DIR)\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4146;4800;4996;4355;4624;4244</DisableSpecificWarnings> <DisableSpecificWarnings>4146;4800;4996;4355;4624;4244</DisableSpecificWarnings>
</ClCompile> </ClCompile>
<Link> <Link>
@@ -415,7 +414,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>NOMINMAX;%LLVM_VERSION%</PreprocessorDefinitions> <PreprocessorDefinitions>NOMINMAX;%LLVM_VERSION%</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(LLVM_INSTALL_DIR)\include;.;.\winstuff;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(LLVM_INSTALL_DIR)\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4146;4800;4996;4355;4624;4244</DisableSpecificWarnings> <DisableSpecificWarnings>4146;4800;4996;4355;4624;4244</DisableSpecificWarnings>
</ClCompile> </ClCompile>
<Link> <Link>
@@ -431,4 +430,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
</Project> </Project>

2
run_tests.py
View File

@@ -211,7 +211,7 @@ def run_test(testname):
obj_name = "%s.obj" % os.path.basename(filename) obj_name = "%s.obj" % os.path.basename(filename)
exe_name = "%s.exe" % os.path.basename(filename) exe_name = "%s.exe" % os.path.basename(filename)
cc_cmd = "%s /I. /I../winstuff /Zi /nologo /DTEST_SIG=%d %s %s /Fe%s" % \ cc_cmd = "%s /I. /Zi /nologo /DTEST_SIG=%d %s %s /Fe%s" % \
(options.compiler_exe, match, add_prefix("test_static.cpp"), obj_name, exe_name) (options.compiler_exe, match, add_prefix("test_static.cpp"), obj_name, exe_name)
if should_fail: if should_fail:
cc_cmd += " /DEXPECT_FAILURE" cc_cmd += " /DEXPECT_FAILURE"

14
winstuff/stdint.h
View File

@@ -1,14 +0,0 @@
#ifndef MY_STDINT_H
#define MY_STDINT_H 1
typedef signed char int8_t;
typedef signed __int16 int16_t;
typedef signed __int32 int32_t;
typedef signed __int64 int64_t;
typedef unsigned char uint8_t;
typedef unsigned __int16 uint16_t;
typedef unsigned __int32 uint32_t;
typedef unsigned __int64 uint64_t;
#endif // MY_STDINT_H

6
winstuff/unistd.h
View File

@@ -1,6 +0,0 @@
#ifndef MY_UNISTD_H
#define MY_UNISTD_H 1
inline bool isatty(int) { return false; }
#endif // MY_UNISTD_H