4 files changed, 18 insertions, 9 deletions
diff --git a/src/libjin/Graphics/Shader/je_jsl_compiler.cpp b/src/libjin/Graphics/Shader/je_jsl_compiler.cpp
index 490caea..2683969 100644
--- a/src/libjin/Graphics/Shader/je_jsl_compiler.cpp
+++ b/src/libjin/Graphics/Shader/je_jsl_compiler.cpp
@@ -1,3 +1,6 @@
+#include "../../core/je_configuration.h"
+#if defined(jin_graphics) && (jin_graphics & jin_graphics_shader)
+
 #include "je_jsl_compiler.h"
 
 namespace JinEngine
@@ -8,4 +11,6 @@ namespace JinEngine
 
 
     } // namespace Graphics
-} // namespace JinEngine 
-\ No newline at end of file
+} // namespace JinEngine 
+
+#endif // (jin_graphics) && (jin_graphics & jin_graphics_shader)
+\ No newline at end of file
diff --git a/src/libjin/Graphics/Shader/je_jsl_compiler.h b/src/libjin/Graphics/Shader/je_jsl_compiler.h
index b530466..1817a7b 100644
--- a/src/libjin/Graphics/Shader/je_jsl_compiler.h
+++ b/src/libjin/Graphics/Shader/je_jsl_compiler.h
@@ -1,6 +1,9 @@
 #ifndef __JE_JSL_COMPILER_H
 #define __JE_JSL_COMPILER_H
 
+#include "../../core/je_configuration.h"
+#if defined(jin_graphics) && (jin_graphics & jin_graphics_shader)
+
 #include "../../common/je_singleton.hpp"
 
 namespace JinEngine
@@ -21,7 +24,9 @@ namespace JinEngine
 
         };
 
-    }
-}
+    } // namespace Graphics
+} // namespace JinEngine
+
+#endif // (jin_graphics) && (jin_graphics & jin_graphics_shader)
 
-#endif
-\ No newline at end of file
+#endif // __JE_JSL_COMPILER_H
+\ No newline at end of file
diff --git a/src/libjin/Graphics/Shader/je_shader.cpp b/src/libjin/Graphics/Shader/je_shader.cpp
index 6066864..6c8076a 100644
--- a/src/libjin/Graphics/Shader/je_shader.cpp
+++ b/src/libjin/Graphics/Shader/je_shader.cpp
@@ -1,6 +1,5 @@
-#include <regex>
 #include "../../core/je_configuration.h"
-#if defined(jin_graphics_shader)
+#if defined(jin_graphics) && (jin_graphics & jin_graphics_shader)
 
 #include <iostream>
 
@@ -285,4 +284,4 @@ namespace JinEngine
 	} // namespace Graphics
 } // namespace JinEngine
 
-#endif // jin_graphics_shader
-\ No newline at end of file
+#endif // (jin_graphics) && (jin_graphics & jin_graphics_shader)
+\ No newline at end of file
diff --git a/src/libjin/Graphics/Shader/je_shader.h b/src/libjin/Graphics/Shader/je_shader.h
index 69746de..928fb0a 100644
--- a/src/libjin/Graphics/Shader/je_shader.h
+++ b/src/libjin/Graphics/Shader/je_shader.h
@@ -2,7 +2,7 @@
 #define __JE_SHADER_H
 
 #include "../../core/je_configuration.h"
-#if defined(jin_graphics) && defined(jin_graphics_shader)
+#if defined(jin_graphics) && (jin_graphics & jin_graphics_shader)
 
 #include <string>
 #include <map>
@@ -195,6 +195,6 @@ namespace JinEngine
 	} // namespace Graphics
 } // namespace JinEngine
 
-#endif // jin_graphics && jin_graphics_shader
+#endif // (jin_graphics) && (jin_graphics & jin_graphics_shader)
 
 #endif // __JE_SHADER_H
 \ No newline at end of file