diff --git a/CMakeLists.txt b/CMakeLists.txt
index ff325dd..f00292a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,10 +51,7 @@ endif()
 SET(MOONLIGHT_COMMON_INCLUDE_DIR ./third_party/moonlight-common-c/src)
 SET(GAMESTREAM_INCLUDE_DIR ./libgamestream)
 
-if(CMAKE_BUILD_TYPE MATCHES Debug)
-  list(APPEND MOONLIGHT_DEFINITIONS LC_DEBUG)
-  list(APPEND MOONLIGHT_OPTIONS DEBUG)
-elseif(NOT AMLOGIC_FOUND AND NOT BROADCOM_FOUND AND NOT FREESCALE_FOUND AND NOT SOFTWARE_FOUND)
+if(NOT AMLOGIC_FOUND AND NOT BROADCOM_FOUND AND NOT FREESCALE_FOUND AND NOT SOFTWARE_FOUND)
   message(FATAL_ERROR "No video output available")
 endif()
 
@@ -77,7 +74,7 @@ if (SOFTWARE_FOUND)
   endif()
 endif()
 
-if (AMLOGIC_FOUND OR BROADCOM_FOUND OR FREESCALE_FOUND OR CMAKE_BUILD_TYPE MATCHES Debug)
+if (AMLOGIC_FOUND OR BROADCOM_FOUND OR FREESCALE_FOUND OR X11_FOUND)
   list(APPEND MOONLIGHT_DEFINITIONS HAVE_EMBEDDED)
   list(APPEND MOONLIGHT_OPTIONS EMBEDDED)
 endif()