diff --git a/CMakeLists.txt b/CMakeLists.txt
index e0c45882..cbb1ef3f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -180,19 +180,18 @@ if ( "${PLATFORM}" MATCHES "osx" )
 elseif ( "${PLATFORM}" MATCHES "rpi" )
 	SET ( DEFAULT_DISPMANX   ON )
 	SET ( DEFAULT_DEV_WS281XPWM  ON )
-elseif ( "${PLATFORM}" STREQUAL "amlogic" )
+elseif ( "${PLATFORM}" MATCHES "^amlogic" )
 	SET ( DEFAULT_AMLOGIC     ON )
-elseif ( "${PLATFORM}" STREQUAL "amlogic-dev" )
-	SET ( DEFAULT_AMLOGIC     ON )
-	SET ( DEFAULT_DISPMANX    OFF )
-	SET ( DEFAULT_QT          OFF )
-	SET ( DEFAULT_CEC         OFF )
-elseif ( "${PLATFORM}" STREQUAL "amlogic64" )
-	SET ( DEFAULT_AMLOGIC     ON )
-elseif ( "${PLATFORM}" MATCHES "x11" )
+    if ( "${PLATFORM}" MATCHES "-dev$" )
+		SET ( DEFAULT_AMLOGIC     ON )
+		SET ( DEFAULT_DISPMANX    OFF )
+		SET ( DEFAULT_QT          OFF )
+		SET ( DEFAULT_CEC         OFF )
+	endif()
+elseif ( "${PLATFORM}" MATCHES "^x11" )
 	SET ( DEFAULT_X11        ON )
 	SET ( DEFAULT_XCB        ON )
-	if ( "${PLATFORM}" STREQUAL "x11-dev" )
+	if ( "${PLATFORM}" MATCHES "-dev$" )
 		SET ( DEFAULT_AMLOGIC    ON)
 		SET ( DEFAULT_DEV_WS281XPWM  ON )
 	endif()
@@ -201,7 +200,7 @@ elseif ( "${PLATFORM}" STREQUAL "imx6" )
 endif()
 
 # enable tests for -dev builds
-if ( "${PLATFORM}" MATCHES "-dev" )
+if ( "${PLATFORM}" MATCHES "-dev$" )
 	SET ( DEFAULT_TESTS      ON )
 endif()