diff --git a/pkg/apple/RetroArch_iOS10.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_iOS10.xcodeproj/project.pbxproj
index 131c944d53..18c568d4ab 100644
--- a/pkg/apple/RetroArch_iOS10.xcodeproj/project.pbxproj
+++ b/pkg/apple/RetroArch_iOS10.xcodeproj/project.pbxproj
@@ -329,11 +329,11 @@
 				OTHER_CFLAGS = (
 					"-DDONT_WANT_ARM_OPTIMIZATIONS",
 					"-DHAVE_NETWORKGAMEPAD",
-					"-DHAVE_CORETEXT",
+					"-DHAVE_STB_FONT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
-               "-DHAVE_NETPLAYDISCOVERY",
-               "-DHAVE_RUNAHEAD",
+                                        "-DHAVE_NETPLAYDISCOVERY",
+                                        "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",
@@ -415,11 +415,11 @@
 					"-DNDEBUG",
 					"-DDONT_WANT_ARM_OPTIMIZATIONS",
 					"-DHAVE_NETWORKGAMEPAD",
-					"-DHAVE_CORETEXT",
+					"-DHAVE_STB_FONT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
-               "-DHAVE_NETPLAYDISCOVERY",
-               "-DHAVE_RUNAHEAD",
+                                        "-DHAVE_NETPLAYDISCOVERY",
+                                        "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",
@@ -468,11 +468,11 @@
 					"-DNDEBUG",
 					"-DDONT_WANT_ARM_OPTIMIZATIONS",
 					"-DHAVE_NETWORKGAMEPAD",
-					"-DHAVE_CORETEXT",
+					"-DHAVE_STB_FONT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
-               "-DHAVE_NETPLAYDISCOVERY",
-               "-DHAVE_RUNAHEAD",
+                                        "-DHAVE_NETPLAYDISCOVERY",
+                                        "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",
@@ -555,11 +555,11 @@
 				OTHER_CFLAGS = (
 					"-DDONT_WANT_ARM_OPTIMIZATIONS",
 					"-DHAVE_NETWORKGAMEPAD",
-					"-DHAVE_CORETEXT",
+					"-DHAVE_STB_FONT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
-               "-DHAVE_NETPLAYDISCOVERY",
-               "-DHAVE_RUNAHEAD",
+                                        "-DHAVE_NETPLAYDISCOVERY",
+                                        "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",
@@ -626,11 +626,11 @@
 					"-DNDEBUG",
 					"-DDONT_WANT_ARM_OPTIMIZATIONS",
 					"-DHAVE_NETWORKGAMEPAD",
-					"-DHAVE_CORETEXT",
+					"-DHAVE_STB_FONT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
-               "-DHAVE_NETPLAYDISCOVERY",
-               "-DHAVE_RUNAHEAD",
+                                        "-DHAVE_NETPLAYDISCOVERY",
+                                        "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",
diff --git a/pkg/apple/RetroArch_iOS10_static.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_iOS10_static.xcodeproj/project.pbxproj
index fb7e6c8e37..cc6e0b6ed6 100644
--- a/pkg/apple/RetroArch_iOS10_static.xcodeproj/project.pbxproj
+++ b/pkg/apple/RetroArch_iOS10_static.xcodeproj/project.pbxproj
@@ -338,10 +338,10 @@
 					"-DDONT_WANT_ARM_OPTIMIZATIONS",
 					"-DHAVE_APPLE_STORE",
 					"-DHAVE_NETWORKGAMEPAD",
-					"-DHAVE_CORETEXT",
+					"-DHAVE_STB_FONT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
-               "-DHAVE_NETPLAYDISCOVERY",
+                                        "-DHAVE_NETPLAYDISCOVERY",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",
@@ -424,10 +424,10 @@
 					"-DDONT_WANT_ARM_OPTIMIZATIONS",
 					"-DHAVE_APPLE_STORE",
 					"-DHAVE_NETWORKGAMEPAD",
-					"-DHAVE_CORETEXT",
+					"-DHAVE_STB_FONT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
-               "-DHAVE_NETPLAYDISCOVERY",
+                                        "-DHAVE_NETPLAYDISCOVERY",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",
@@ -476,10 +476,10 @@
 					"-DDONT_WANT_ARM_OPTIMIZATIONS",
 					"-DHAVE_APPLE_STORE",
 					"-DHAVE_NETWORKGAMEPAD",
-					"-DHAVE_CORETEXT",
+					"-DHAVE_STB_FONT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
-               "-DHAVE_NETPLAYDISCOVERY",
+                                        "-DHAVE_NETPLAYDISCOVERY",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",
@@ -562,10 +562,10 @@
 					"-DDONT_WANT_ARM_OPTIMIZATIONS",
 					"-DHAVE_APPLE_STORE",
 					"-DHAVE_NETWORKGAMEPAD",
-					"-DHAVE_CORETEXT",
+					"-DHAVE_STB_FONT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
-               "-DHAVE_NETPLAYDISCOVERY",
+                                        "-DHAVE_NETPLAYDISCOVERY",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",
@@ -632,10 +632,10 @@
 					"-DDONT_WANT_ARM_OPTIMIZATIONS",
 					"-DHAVE_APPLE_STORE",
 					"-DHAVE_NETWORKGAMEPAD",
-					"-DHAVE_CORETEXT",
+					"-DHAVE_STB_FONT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
-               "-DHAVE_NETPLAYDISCOVERY",
+                                        "-DHAVE_NETPLAYDISCOVERY",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",
diff --git a/pkg/apple/RetroArch_iOS11.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_iOS11.xcodeproj/project.pbxproj
index bff1861b0b..3719c56c6a 100644
--- a/pkg/apple/RetroArch_iOS11.xcodeproj/project.pbxproj
+++ b/pkg/apple/RetroArch_iOS11.xcodeproj/project.pbxproj
@@ -584,7 +584,7 @@
 				OTHER_CFLAGS = (
 					"-DDONT_WANT_ARM_OPTIMIZATIONS",
 					"-DHAVE_NETWORKGAMEPAD",
-					"-DHAVE_CORETEXT",
+					"-DHAVE_STB_FONT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
 					"-DHAVE_NETPLAYDISCOVERY",
@@ -672,7 +672,7 @@
 					"-DNDEBUG",
 					"-DDONT_WANT_ARM_OPTIMIZATIONS",
 					"-DHAVE_NETWORKGAMEPAD",
-					"-DHAVE_CORETEXT",
+					"-DHAVE_STB_FONT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
 					"-DHAVE_NETPLAYDISCOVERY",
@@ -788,7 +788,7 @@
 				OTHER_CFLAGS = (
 					"-DDONT_WANT_ARM_OPTIMIZATIONS",
 					"-DHAVE_NETWORKGAMEPAD",
-					"-DHAVE_CORETEXT",
+					"-DHAVE_STB_FONT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
 					"-DHAVE_NETPLAYDISCOVERY",
@@ -902,7 +902,7 @@
 					"-DNDEBUG",
 					"-DDONT_WANT_ARM_OPTIMIZATIONS",
 					"-DHAVE_NETWORKGAMEPAD",
-					"-DHAVE_CORETEXT",
+					"-DHAVE_STB_FONT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
 					"-DHAVE_NETPLAYDISCOVERY",
@@ -989,7 +989,7 @@
 				OTHER_CFLAGS = (
 					"-DDONT_WANT_ARM_OPTIMIZATIONS",
 					"-DHAVE_NETWORKGAMEPAD",
-					"-DHAVE_CORETEXT",
+					"-DHAVE_STB_FONT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
 					"-DHAVE_NETPLAYDISCOVERY",
@@ -1060,7 +1060,7 @@
 					"-DNDEBUG",
 					"-DDONT_WANT_ARM_OPTIMIZATIONS",
 					"-DHAVE_NETWORKGAMEPAD",
-					"-DHAVE_CORETEXT",
+					"-DHAVE_STB_FONT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
 					"-DHAVE_NETPLAYDISCOVERY",
diff --git a/pkg/apple/RetroArch_iOS11_static.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_iOS11_static.xcodeproj/project.pbxproj
index 9f78a78644..f8f518633d 100644
--- a/pkg/apple/RetroArch_iOS11_static.xcodeproj/project.pbxproj
+++ b/pkg/apple/RetroArch_iOS11_static.xcodeproj/project.pbxproj
@@ -338,7 +338,7 @@
 					"-DDONT_WANT_ARM_OPTIMIZATIONS",
 					"-DHAVE_APPLE_STORE",
 					"-DHAVE_NETWORKGAMEPAD",
-					"-DHAVE_CORETEXT",
+					"-DHAVE_STB_FONT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
 					"-DHAVE_NETPLAYDISCOVERY",
@@ -424,7 +424,7 @@
 					"-DDONT_WANT_ARM_OPTIMIZATIONS",
 					"-DHAVE_APPLE_STORE",
 					"-DHAVE_NETWORKGAMEPAD",
-					"-DHAVE_CORETEXT",
+					"-DHAVE_STB_FONT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
 					"-DHAVE_NETPLAYDISCOVERY",
@@ -476,7 +476,7 @@
 					"-DDONT_WANT_ARM_OPTIMIZATIONS",
 					"-DHAVE_APPLE_STORE",
 					"-DHAVE_NETWORKGAMEPAD",
-					"-DHAVE_CORETEXT",
+					"-DHAVE_STB_FONT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
 					"-DHAVE_NETPLAYDISCOVERY",
@@ -562,7 +562,7 @@
 					"-DDONT_WANT_ARM_OPTIMIZATIONS",
 					"-DHAVE_APPLE_STORE",
 					"-DHAVE_NETWORKGAMEPAD",
-					"-DHAVE_CORETEXT",
+					"-DHAVE_STB_FONT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
 					"-DHAVE_NETPLAYDISCOVERY",
@@ -632,7 +632,7 @@
 					"-DDONT_WANT_ARM_OPTIMIZATIONS",
 					"-DHAVE_APPLE_STORE",
 					"-DHAVE_NETWORKGAMEPAD",
-					"-DHAVE_CORETEXT",
+					"-DHAVE_STB_FONT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
 					"-DHAVE_NETPLAYDISCOVERY",
diff --git a/pkg/apple/RetroArch_iOS6.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_iOS6.xcodeproj/project.pbxproj
index ad669c8a6c..edeecc892f 100644
--- a/pkg/apple/RetroArch_iOS6.xcodeproj/project.pbxproj
+++ b/pkg/apple/RetroArch_iOS6.xcodeproj/project.pbxproj
@@ -341,11 +341,11 @@
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = (
 					"-DHAVE_NETWORKGAMEPAD",
-					"-DHAVE_CORETEXT",
+					"-DHAVE_STB_FONT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
-               "-DHAVE_NETPLAYDISCOVERY",
-               "-DHAVE_RUNAHEAD",
+                                        "-DHAVE_NETPLAYDISCOVERY",
+                                        "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",
@@ -355,7 +355,6 @@
 					"-DHAVE_CHEEVOS",
 					"-DRC_DISABLE_LUA",
 					"-DHAVE_IMAGEVIEWER",
-					"-DHAVE_CORETEXT",
 					"-DHAVE_RGUI",
 					"-DHAVE_MENU",
 					"-DHAVE_LIBRETRODB",
@@ -425,11 +424,11 @@
 					"-DNS_BLOCK_ASSERTIONS=1",
 					"-DNDEBUG",
 					"-DHAVE_NETWORKGAMEPAD",
-					"-DHAVE_CORETEXT",
+					"-DHAVE_STB_FONT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
-               "-DHAVE_NETPLAYDISCOVERY",
-               "-DHAVE_RUNAHEAD",
+                                        "-DHAVE_NETPLAYDISCOVERY",
+                                        "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",
@@ -475,11 +474,11 @@
 					"-DNS_BLOCK_ASSERTIONS=1",
 					"-DNDEBUG",
 					"-DHAVE_NETWORKGAMEPAD",
-					"-DHAVE_CORETEXT",
+					"-DHAVE_STB_FONT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
-               "-DHAVE_NETPLAYDISCOVERY",
-               "-DHAVE_RUNAHEAD",
+                                        "-DHAVE_NETPLAYDISCOVERY",
+                                        "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",
@@ -558,11 +557,11 @@
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = (
 					"-DHAVE_NETWORKGAMEPAD",
-					"-DHAVE_CORETEXT",
+					"-DHAVE_STB_FONT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
-               "-DHAVE_NETPLAYDISCOVERY",
-               "-DHAVE_RUNAHEAD",
+                                        "-DHAVE_NETPLAYDISCOVERY",
+                                        "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",
@@ -628,11 +627,11 @@
 					"-DNS_BLOCK_ASSERTIONS=1",
 					"-DNDEBUG",
 					"-DHAVE_NETWORKGAMEPAD",
-					"-DHAVE_CORETEXT",
+					"-DHAVE_STB_FONT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
-               "-DHAVE_NETPLAYDISCOVERY",
-               "-DHAVE_RUNAHEAD",
+                                        "-DHAVE_NETPLAYDISCOVERY",
+                                        "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",
diff --git a/pkg/apple/RetroArch_iOS8.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_iOS8.xcodeproj/project.pbxproj
index 4ef2164d68..3c175d35aa 100644
--- a/pkg/apple/RetroArch_iOS8.xcodeproj/project.pbxproj
+++ b/pkg/apple/RetroArch_iOS8.xcodeproj/project.pbxproj
@@ -343,11 +343,11 @@
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = (
 					"-DHAVE_NETWORKGAMEPAD",
-					"-DHAVE_CORETEXT",
+					"-DHAVE_STB_FONT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
-               "-DHAVE_NETPLAYDISCOVERY",
-               "-DHAVE_RUNAHEAD",
+                                        "-DHAVE_NETPLAYDISCOVERY",
+                                        "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",
@@ -413,11 +413,11 @@
 					"-DNS_BLOCK_ASSERTIONS=1",
 					"-DNDEBUG",
 					"-DHAVE_NETWORKGAMEPAD",
-					"-DHAVE_CORETEXT",
+					"-DHAVE_STB_FONT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
-               "-DHAVE_NETPLAYDISCOVERY",
-               "-DHAVE_RUNAHEAD",
+                                        "-DHAVE_NETPLAYDISCOVERY",
+                                        "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",
@@ -489,11 +489,11 @@
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = (
 					"-DHAVE_NETWORKGAMEPAD",
-					"-DHAVE_CORETEXT",
+					"-DHAVE_STB_FONT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
-               "-DHAVE_NETPLAYDISCOVERY",
-               "-DHAVE_RUNAHEAD",
+                                        "-DHAVE_NETPLAYDISCOVERY",
+                                        "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",
@@ -575,11 +575,11 @@
 					"-DNS_BLOCK_ASSERTIONS=1",
 					"-DNDEBUG",
 					"-DHAVE_NETWORKGAMEPAD",
-					"-DHAVE_CORETEXT",
+					"-DHAVE_STB_FONT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
-               "-DHAVE_NETPLAYDISCOVERY",
-               "-DHAVE_RUNAHEAD",
+                                        "-DHAVE_NETPLAYDISCOVERY",
+                                        "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",
@@ -627,11 +627,11 @@
 					"-DNS_BLOCK_ASSERTIONS=1",
 					"-DNDEBUG",
 					"-DHAVE_NETWORKGAMEPAD",
-					"-DHAVE_CORETEXT",
+					"-DHAVE_STB_FONT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
-               "-DHAVE_NETPLAYDISCOVERY",
-               "-DHAVE_RUNAHEAD",
+                                        "-DHAVE_NETPLAYDISCOVERY",
+                                        "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",
diff --git a/pkg/apple/RetroArch_iOS9.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_iOS9.xcodeproj/project.pbxproj
index 06082a81ae..2977491736 100644
--- a/pkg/apple/RetroArch_iOS9.xcodeproj/project.pbxproj
+++ b/pkg/apple/RetroArch_iOS9.xcodeproj/project.pbxproj
@@ -360,10 +360,10 @@
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = (
 					"-DHAVE_NETWORKGAMEPAD",
-					"-DHAVE_CORETEXT",
+					"-DHAVE_STB_FONT",
 					"-DHAVE_NETWORKING",
-               "-DHAVE_NETPLAYDISCOVERY",
-               "-DHAVE_RUNAHEAD",
+                                        "-DHAVE_NETPLAYDISCOVERY",
+                                        "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",
@@ -445,10 +445,10 @@
 					"-DNS_BLOCK_ASSERTIONS=1",
 					"-DNDEBUG",
 					"-DHAVE_NETWORKGAMEPAD",
-					"-DHAVE_CORETEXT",
+					"-DHAVE_STB_FONT",
 					"-DHAVE_NETWORKING",
-               "-DHAVE_NETPLAYDISCOVERY",
-               "-DHAVE_RUNAHEAD",
+                                        "-DHAVE_NETPLAYDISCOVERY",
+                                        "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",
@@ -496,10 +496,10 @@
 					"-DNS_BLOCK_ASSERTIONS=1",
 					"-DNDEBUG",
 					"-DHAVE_NETWORKGAMEPAD",
-					"-DHAVE_CORETEXT",
+					"-DHAVE_STB_FONT",
 					"-DHAVE_NETWORKING",
-               "-DHAVE_NETPLAYDISCOVERY",
-               "-DHAVE_RUNAHEAD",
+                                        "-DHAVE_NETPLAYDISCOVERY",
+                                        "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",
@@ -581,11 +581,11 @@
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = (
 					"-DHAVE_NETWORKGAMEPAD",
-					"-DHAVE_CORETEXT",
+					"-DHAVE_STB_FONT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
-               "-DHAVE_NETPLAYDISCOVERY",
-               "-DHAVE_RUNAHEAD",
+                                        "-DHAVE_NETPLAYDISCOVERY",
+                                        "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",
@@ -651,11 +651,11 @@
 					"-DNS_BLOCK_ASSERTIONS=1",
 					"-DNDEBUG",
 					"-DHAVE_NETWORKGAMEPAD",
-					"-DHAVE_CORETEXT",
+					"-DHAVE_STB_FONT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
-               "-DHAVE_NETPLAYDISCOVERY",
-               "-DHAVE_RUNAHEAD",
+                                        "-DHAVE_NETPLAYDISCOVERY",
+                                        "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",