Merge remote-tracking branch 'upstream/master' into nvptx

2013-11-22 08:10:08 +01:00
parent cddddfd255 0f7ac1cc90
commit 828a5d45cd
33 changed files with 795 additions and 394 deletions
--- a/4
+++ b/4
@@ -83,6 +83,10 @@ ifeq ($(LLVM_VERSION),LLVM_3_4)
    ISPC_LIBS += -lcurses
 endif

+ifeq ($(LLVM_VERSION),LLVM_3_5)
+    ISPC_LIBS += -lcurses
+endif
+
 ifeq ($(ARCH_OS),Linux)
 	ISPC_LIBS += -ldl
 endif