From bda87aa13ff93826050161e55f6f3193bb9472c2 Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@alumni.brown.edu>
Date: Thu, 11 Jul 2019 16:32:35 -0700
Subject: [PATCH] trying to fix android

---
 cmake/macros/AutoScribeShader.cmake             | 17 +++++++++--------
 libraries/entities-renderer/src/paintStroke.slv |  3 ---
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/cmake/macros/AutoScribeShader.cmake b/cmake/macros/AutoScribeShader.cmake
index f0f1fe1d05..20aa334134 100755
--- a/cmake/macros/AutoScribeShader.cmake
+++ b/cmake/macros/AutoScribeShader.cmake
@@ -316,10 +316,11 @@ macro(AUTOSCRIBE_SHADER_LIB)
                 if (HAS_FRAGMENT EQUAL -1)
                     set(DEFINES "${VERTEX_DEFINES}")
                     set(SHADER_LIST "")
-                    unset(SHADER_FILE)
-                    unset(SHADER_FILE CACHE)
-                    find_file(SHADER_FILE "${VERTEX_NAME}.slv" PATHS "${PROGRAM_FOLDER}" PATH_SUFFIXES "..")
-                    message("boop ${SHADER_FILE} ${VERTEX_NAME} ${PROGRAM_FOLDER}")
+                    set(SHADER_FILE "${PROGRAM_FOLDER}/${VERTEX_NAME}.slv")
+                    if (NOT EXISTS "${SHADER_FILE}")
+                        set(SHADER_FILE "${PROGRAM_FOLDER}/../${VERTEX_NAME}.slv")
+                    endif()
+                    find_file(SHADER_FILE "" PATHS "${PROGRAM_FOLDER}" PATH_SUFFIXES ".." NO_DEFAULT_PATH)
                     AUTOSCRIBE_SHADER(${ALL_SHADER_HEADERS})
                     string(CONCAT VERTEX_ENUMS "${VERTEX_ENUMS}" "${SHADER_LIST}")
                 else()
@@ -335,10 +336,10 @@ macro(AUTOSCRIBE_SHADER_LIB)
                 if (HAS_VERTEX EQUAL -1)
                     set(DEFINES "${FRAGMENT_DEFINES}")
                     set(SHADER_LIST "")
-                    unset(SHADER_FILE)
-                    unset(SHADER_FILE CACHE)
-                    find_file(SHADER_FILE "${FRAGMENT_NAME}.slf" PATHS "${PROGRAM_FOLDER}" PATH_SUFFIXES "..")
-                    message("boop2 ${SHADER_FILE} ${FRAGMENT_NAME} ${PROGRAM_FOLDER}")
+                    set(SHADER_FILE "${PROGRAM_FOLDER}/${FRAGMENT_NAME}.slf")
+                    if (NOT EXISTS "${SHADER_FILE}")
+                        set(SHADER_FILE "${PROGRAM_FOLDER}/../${FRAGMENT_NAME}.slf")
+                    endif()
                     AUTOSCRIBE_SHADER(${ALL_SHADER_HEADERS})
                     string(CONCAT FRAGMENT_ENUMS "${FRAGMENT_ENUMS}" "${SHADER_LIST}")
                 else()
diff --git a/libraries/entities-renderer/src/paintStroke.slv b/libraries/entities-renderer/src/paintStroke.slv
index 2a2025e59f..9a44223dd4 100644
--- a/libraries/entities-renderer/src/paintStroke.slv
+++ b/libraries/entities-renderer/src/paintStroke.slv
@@ -3,9 +3,6 @@
 // <$_SCRIBE_FILENAME$>
 //  Generated on <$_SCRIBE_DATE$>
 //
-//  paintStroke.vert
-//  vertex shader
-//
 //  Created by Eric Levin on 7/20/15.
 //  Copyright 2014 High Fidelity, Inc.
 //