From 76e5406e585c0d001fc215cda080d450e93d426f Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Thu, 28 Aug 2014 22:22:21 +0100 Subject: [PATCH] targets/haiku-softpipe: explicitly prefix sw/hgl header Cc: Alexander von Gluck IV Signed-off-by: Emil Velikov --- src/gallium/targets/haiku-softpipe/GalliumContext.cpp | 2 +- src/gallium/targets/haiku-softpipe/SConscript | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/targets/haiku-softpipe/GalliumContext.cpp b/src/gallium/targets/haiku-softpipe/GalliumContext.cpp index c740458..d7d5d9d 100644 --- a/src/gallium/targets/haiku-softpipe/GalliumContext.cpp +++ b/src/gallium/targets/haiku-softpipe/GalliumContext.cpp @@ -26,8 +26,8 @@ extern "C" { #include "state_tracker/st_gl_api.h" #include "state_tracker/st_manager.h" #include "state_tracker/sw_winsys.h" +#include "sw/hgl/hgl_sw_winsys.h" #include "util/u_memory.h" -#include "hgl_sw_winsys.h" #include "target-helpers/inline_sw_helper.h" #include "target-helpers/inline_debug_helper.h" diff --git a/src/gallium/targets/haiku-softpipe/SConscript b/src/gallium/targets/haiku-softpipe/SConscript index d5fd699..210721c 100644 --- a/src/gallium/targets/haiku-softpipe/SConscript +++ b/src/gallium/targets/haiku-softpipe/SConscript @@ -26,7 +26,7 @@ env.Append(CPPPATH = [ '#/src/mesa', '#/src/mesa/main', '#/include/HaikuGL', - '#/src/gallium/winsys/sw/hgl', + '#/src/gallium/winsys', '#/src/gallium/state_trackers/hgl', '/boot/system/develop/headers/private', ]) -- 2.7.4