diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-10-03 14:51:51 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-10-03 15:00:24 +0300 |
| commit | 8717cbc9848efc1ee1284fac15ffc5c4ff080297 (patch) | |
| tree | 57956d2835e023a92687615eaedb57862cd393ce | |
| parent | fd26de3b4a4e8be165f7627cb22029841ba4ab31 (diff) | |
GLSL files should go into $(LIBO_ETC_FOLDER)/opengl
(And not $(LIBO_BIN_FOLDER)/opengl. Note that on Linux and Windows,
LIBO_ETC_FOLDER and LIBO_BIN_FOLDER are the same, "program".)
That's where getShaderFolder() in vcl/source/opengl/OpenGLHelper.cxx
looks for them. Also, as they are data and not executable code, to
conform to strict OS X code signing and sandboxing requirements, they
definitely should not be in $(LIBO_BIN_FOLDER)
Change-Id: I902e08f7a1f142697df827d50e0bda74be918eb4
| -rw-r--r-- | canvas/Package_opengl.mk | 2 | ||||
| -rw-r--r-- | chart2/Package_opengl.mk | 2 | ||||
| -rw-r--r-- | slideshow/Package_opengl.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/canvas/Package_opengl.mk b/canvas/Package_opengl.mk index af256bffa190..5e54b735e12f 100644 --- a/canvas/Package_opengl.mk +++ b/canvas/Package_opengl.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Package_Package,canvas_opengl_shader,$(SRCDIR)/canvas/opengl)) -$(eval $(call gb_Package_add_files,canvas_opengl_shader,$(LIBO_BIN_FOLDER)/opengl,\ +$(eval $(call gb_Package_add_files,canvas_opengl_shader,$(LIBO_ETC_FOLDER)/opengl,\ dummyVertexShader.glsl \ linearMultiColorGradientFragmentShader.glsl \ linearTwoColorGradientFragmentShader.glsl \ diff --git a/chart2/Package_opengl.mk b/chart2/Package_opengl.mk index 820cf35fc693..aa12a9578366 100644 --- a/chart2/Package_opengl.mk +++ b/chart2/Package_opengl.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Package_Package,chart2_opengl_shader,$(SRCDIR)/chart2/opengl)) -$(eval $(call gb_Package_add_files,chart2_opengl_shader,$(LIBO_BIN_FOLDER)/opengl,\ +$(eval $(call gb_Package_add_files,chart2_opengl_shader,$(LIBO_ETC_FOLDER)/opengl,\ backgroundFragmentShader.glsl \ backgroundVertexShader.glsl \ commonFragmentShader.glsl \ diff --git a/slideshow/Package_opengl.mk b/slideshow/Package_opengl.mk index a7e9a8cead73..d5634a426a3f 100644 --- a/slideshow/Package_opengl.mk +++ b/slideshow/Package_opengl.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Package_Package,slideshow_opengl_shader,$(SRCDIR)/slideshow/opengl)) -$(eval $(call gb_Package_add_files,slideshow_opengl_shader,$(LIBO_BIN_FOLDER)/opengl,\ +$(eval $(call gb_Package_add_files,slideshow_opengl_shader,$(LIBO_ETC_FOLDER)/opengl,\ basicVertexShader.glsl \ dissolveFragmentShader.glsl \ staticFragmentShader.glsl \ |