From dfd7c0d00732d1a5f43616cb9afb993d7948d0b3 Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olv@lunarg.com>
Date: Sat, 11 Apr 2015 13:06:46 +0800
Subject: demos: set EXTERNAL_SPV from CMakeLists.txt

Do not abuse XCB_NVIDIA.
---
 demos/CMakeLists.txt | 2 ++
 demos/cube.c         | 8 --------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt
index 06279099..4e19030a 100644
--- a/demos/CMakeLists.txt
+++ b/demos/CMakeLists.txt
@@ -53,6 +53,8 @@ if(WIN32)
     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DXCB_NVIDIA -D_CRT_SECURE_NO_WARNINGS -D_USE_MATH_DEFINES")
     set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DXCB_NVIDIA -D_CRT_SECURE_NO_WARNINGS -D_USE_MATH_DEFINES")
     set (LIBRARIES ${LIBRARIES} xcb_nvidia)
+else()
+    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DEXTERNAL_SPV")
 endif()
 
 add_executable(xglinfo xglinfo.c)
diff --git a/demos/cube.c b/demos/cube.c
index bd272e68..fcec0e04 100644
--- a/demos/cube.c
+++ b/demos/cube.c
@@ -18,14 +18,6 @@
 #define DEMO_BUFFER_COUNT 2
 #define DEMO_TEXTURE_COUNT 1
 
-/*
- * When not defined, code will use built-in GLSL compiler
- * which may not be supported on all drivers
- */
-#if !defined(XCB_NVIDIA)
-#define EXTERNAL_SPV
-#endif
-
 /*
  * structure to track all objects related to a texture.
  */
-- 
cgit v1.2.3