diff options
| author | Mike Erwin <significant.bit@gmail.com> | 2017-03-17 06:32:35 +0300 |
|---|---|---|
| committer | Mike Erwin <significant.bit@gmail.com> | 2017-03-17 06:32:35 +0300 |
| commit | 4452bea2f170ec7fe48c223c8c499f1eb9b5356c (patch) | |
| tree | 28dcc9ac042fcce5c77f3c60b4ce8af8677fa4a8 /source/blender/gpu/CMakeLists.txt | |
| parent | b4e8dc8c82dfcae60f33e39684272867745a8af2 (diff) | |
move Gawain library to intern
Before now it lived in source/blender/gpu for convenience. Only a few files in the gpu module use Gawain directly.
Tested on Mac, time to push and test on Windows.
Todo: some CMake magic to make it easy to
#include "gawain/some_header.h"
from any C or H file. Main problem here is the many editors that include GPU_immediate.h which includes Gawain's immediate.h -- is there a way to avoid changing every editor's CMakeLists?
Diffstat (limited to 'source/blender/gpu/CMakeLists.txt')
| -rw-r--r-- | source/blender/gpu/CMakeLists.txt | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index 391efdaeb00..1791b34d4c8 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -42,6 +42,7 @@ set(INC ../../../intern/glew-mx ../../../intern/guardedalloc ../../../intern/smoke/extern + ../../../intern/gawain ) set(INC_SYS @@ -70,28 +71,6 @@ set(SRC intern/gpu_uniformbuffer.c intern/gpu_viewport.c - gawain/attrib_binding.c - gawain/attrib_binding.h - gawain/batch.c - gawain/batch.h - gawain/buffer_id.h - gawain/buffer_id.cpp - gawain/common.h - gawain/element.c - gawain/element.h - gawain/immediate.c - gawain/immediate.h - gawain/imm_util.c - gawain/imm_util.h - gawain/primitive.h - gawain/primitive.c - gawain/shader_interface.c - gawain/shader_interface.h - gawain/vertex_buffer.c - gawain/vertex_buffer.h - gawain/vertex_format.c - gawain/vertex_format.h - shaders/gpu_shader_fx_lib.glsl shaders/gpu_shader_fx_ssao_frag.glsl shaders/gpu_shader_fx_dof_frag.glsl |