Build fix

Made sure both LLVM and Subzero has the /src directory in their
include directory list. Removed unused ../ in front of "Common"
includes as a cleanup.

Change-Id: Ib4a6fb772fa03a9a3cad82594db1b1650007e47f
Reviewed-on: https://swiftshader-review.googlesource.com/20728
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Alexis Hétu <sugoi@google.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 04c9ab8..9576681 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1721,6 +1721,7 @@ if(${REACTOR_BACKEND} STREQUAL "Subzero")
     )
 
     set(SUBZERO_INCLUDE_DIR
+        ${SOURCE_DIR}/
         ${SUBZERO_DIR}/
         ${SUBZERO_LLVM_DIR}/include/
         ${SUBZERO_DIR}/pnacl-llvm/include/

diff --git a/src/Reactor/LLVMRoutine.cpp b/src/Reactor/LLVMRoutine.cpp
index 3deb7b4..0fb8227 100644 (file)
--- a/src/Reactor/LLVMRoutine.cpp
+++ b/src/Reactor/LLVMRoutine.cpp
@@ -14,9 +14,9 @@
 
 #include "LLVMRoutine.hpp"
 
-#include "../Common/Memory.hpp"
-#include "../Common/Thread.hpp"
-#include "../Common/Types.hpp"
+#include "Common/Memory.hpp"
+#include "Common/Thread.hpp"
+#include "Common/Types.hpp"
 
 namespace sw
 {

diff --git a/src/Reactor/LLVMRoutineManager.cpp b/src/Reactor/LLVMRoutineManager.cpp
index 3b73799..a8fceb9 100644 (file)
--- a/src/Reactor/LLVMRoutineManager.cpp
+++ b/src/Reactor/LLVMRoutineManager.cpp
@@ -18,9 +18,9 @@
 
 #include "LLVMRoutine.hpp"
 #include "llvm/Function.h"
-#include "../Common/Memory.hpp"
-#include "../Common/Thread.hpp"
-#include "../Common/Debug.hpp"
+#include "Common/Memory.hpp"
+#include "Common/Thread.hpp"
+#include "Common/Debug.hpp"
 
 namespace sw
 {

diff --git a/src/Reactor/Routine.cpp b/src/Reactor/Routine.cpp
index df82ab8..a048b19 100644 (file)
--- a/src/Reactor/Routine.cpp
+++ b/src/Reactor/Routine.cpp
@@ -14,7 +14,7 @@
 
 #include "Routine.hpp"
 
-#include "../Common/Thread.hpp"
+#include "Common/Thread.hpp"
 
 #include <cassert>