10 files changed, 12 insertions, 12 deletions
diff --git a/drivers/gl_context/SCsub b/drivers/gl_context/SCsub
index efc925dae4..a968c10cfd 100644
--- a/drivers/gl_context/SCsub
+++ b/drivers/gl_context/SCsub
@@ -4,7 +4,7 @@ Import('env')
 
 if (env["platform"] in ["haiku", "osx", "windows", "x11"]):
     # Thirdparty source files
-    if (env["glew"] != "system"):  # builtin
+    if (env['builtin_glew'] != 'no'):  # builtin
         thirdparty_dir = "#thirdparty/glew/"
         thirdparty_sources = [
             "glew.c",
diff --git a/drivers/png/SCsub b/drivers/png/SCsub
index aedde3e2b7..6684e36b20 100644
--- a/drivers/png/SCsub
+++ b/drivers/png/SCsub
@@ -5,7 +5,7 @@ Import('env')
 env_png = env.Clone()
 
 # Thirdparty source files
-if (env["libpng"] == "builtin"):
+if (env['builtin_libpng'] != 'no'):
     thirdparty_dir = "#thirdparty/libpng/"
     thirdparty_sources = [
         "png.c",
diff --git a/drivers/unix/ip_unix.cpp b/drivers/unix/ip_unix.cpp
index e3d32618ee..d998c63dfa 100644
--- a/drivers/unix/ip_unix.cpp
+++ b/drivers/unix/ip_unix.cpp
@@ -40,7 +40,7 @@
   #ifndef AI_V4MAPPED
     #define AI_V4MAPPED 0x00000800
   #endif
- #ifdef WINRT_ENABLED
+ #ifdef UWP_ENABLED
   #include <ws2tcpip.h>
   #include <winsock2.h>
   #include <windows.h>
@@ -124,7 +124,7 @@ IP_Address IP_Unix::_resolve_hostname(const String& p_hostname, IP_Address::Addr
 
 #if defined(WINDOWS_ENABLED)
 
-#if defined(WINRT_ENABLED)
+#if defined(UWP_ENABLED)
 
 void IP_Unix::get_local_addresses(List<IP_Address> *r_addresses) const {
 
diff --git a/drivers/unix/socket_helpers.h b/drivers/unix/socket_helpers.h
index 3aaae82da2..5e8e8dfd7a 100644
--- a/drivers/unix/socket_helpers.h
+++ b/drivers/unix/socket_helpers.h
@@ -10,7 +10,7 @@
  #endif
 #endif
 
-#ifdef WINRT_ENABLED
+#ifdef UWP_ENABLED
 #define in6addr_any IN6ADDR_ANY_INIT
 #endif
 
diff --git a/drivers/windows/dir_access_windows.cpp b/drivers/windows/dir_access_windows.cpp
index ad4e8f301c..00d9afe51e 100644
--- a/drivers/windows/dir_access_windows.cpp
+++ b/drivers/windows/dir_access_windows.cpp
@@ -349,7 +349,7 @@ DirAccessWindows::DirAccessWindows() {
 
 	drive_count=0;
 
-#ifdef WINRT_ENABLED
+#ifdef UWP_ENABLED
 	Windows::Storage::StorageFolder ^install_folder = Windows::ApplicationModel::Package::Current->InstalledLocation;
 	change_dir(install_folder->Path->Data());
 
diff --git a/drivers/windows/file_access_windows.cpp b/drivers/windows/file_access_windows.cpp
index 36dcab1d67..00e54e2b3e 100644
--- a/drivers/windows/file_access_windows.cpp
+++ b/drivers/windows/file_access_windows.cpp
@@ -125,8 +125,8 @@ void FileAccessWindows::close() {
 
 		bool rename_error;
 
-#ifdef WINRT_ENABLED
-		// WinRT has no PathFileExists, so we check attributes instead
+#ifdef UWP_ENABLED
+		// UWP has no PathFileExists, so we check attributes instead
 		DWORD fileAttr;
 
 		fileAttr = GetFileAttributesW(save_path.c_str());
diff --git a/drivers/windows/mutex_windows.cpp b/drivers/windows/mutex_windows.cpp
index f63415d0f8..f533626c30 100644
--- a/drivers/windows/mutex_windows.cpp
+++ b/drivers/windows/mutex_windows.cpp
@@ -81,7 +81,7 @@ MutexWindows::MutexWindows() {
 #ifdef WINDOWS_USE_MUTEX
 	mutex = CreateMutex( NULL, FALSE, NULL );
 #else
-	#ifdef WINRT_ENABLED
+	#ifdef UWP_ENABLED
     InitializeCriticalSectionEx( &mutex, 0, 0 );
 	#else
 	InitializeCriticalSection( &mutex );
diff --git a/drivers/windows/semaphore_windows.cpp b/drivers/windows/semaphore_windows.cpp
index 8d11d1b1c1..5ea98f341f 100644
--- a/drivers/windows/semaphore_windows.cpp
+++ b/drivers/windows/semaphore_windows.cpp
@@ -71,7 +71,7 @@ void SemaphoreWindows::make_default() {
 
 SemaphoreWindows::SemaphoreWindows() {
 
-#ifdef WINRT_ENABLED
+#ifdef UWP_ENABLED
 	semaphore=CreateSemaphoreEx(
 		NULL,
 		0,
diff --git a/drivers/windows/shell_windows.cpp b/drivers/windows/shell_windows.cpp
index c69d371a65..283a453be1 100644
--- a/drivers/windows/shell_windows.cpp
+++ b/drivers/windows/shell_windows.cpp
@@ -28,7 +28,7 @@
 /*************************************************************************/
 #ifdef WINDOWS_ENABLED
 
-#ifdef WINRT_ENABLED
+#ifdef UWP_ENABLED
 
 // Use Launcher class on windows 8
 
diff --git a/drivers/windows/thread_windows.cpp b/drivers/windows/thread_windows.cpp
index 884575e81e..2056113412 100644
--- a/drivers/windows/thread_windows.cpp
+++ b/drivers/windows/thread_windows.cpp
@@ -28,7 +28,7 @@
 /*************************************************************************/
 #include "thread_windows.h"
 
-#if defined(WINDOWS_ENABLED) && !defined(WINRT_ENABLED)
+#if defined(WINDOWS_ENABLED) && !defined(UWP_ENABLED)
 
 #include "os/memory.h"