diff --git a/CMakeLists.txt b/CMakeLists.txt
index c281dcb0bb..258740b98e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -114,6 +114,8 @@ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^arm")
 	add_definitions(-marm -march=armv7-a)
 	add_definitions(-D_M_ARM=1)
 	add_definitions(-D_M_GENERIC=1)
+# Set generic options so you don't have to pass anything to cmake to build ARM
+	set(USE_GLES 1)
 endif()
 
 # Set these next two lines to test generic
diff --git a/Source/Plugins/Plugin_VideoSoftware/CMakeLists.txt b/Source/Plugins/Plugin_VideoSoftware/CMakeLists.txt
index 0488f728b8..cda287f511 100644
--- a/Source/Plugins/Plugin_VideoSoftware/CMakeLists.txt
+++ b/Source/Plugins/Plugin_VideoSoftware/CMakeLists.txt
@@ -10,7 +10,6 @@ set(SRCS	Src/BPMemLoader.cpp
 			Src/OpcodeDecoder.cpp
 			Src/SWPixelEngine.cpp
 			Src/Rasterizer.cpp
-			Src/RasterFont.cpp
 			Src/SWRenderer.cpp
 			Src/SetupUnit.cpp
 			Src/SWStatistics.cpp
@@ -37,11 +36,11 @@ if(USE_EGL)
 endif()
 
 if(USE_GLES)
-	set(SRCS ${SRCS}
-			../Plugin_VideoOGL/Src/GLUtil.cpp)
+	set(SRCS ${SRCS} ../Plugin_VideoOGL/Src/GLUtil.cpp)
 	set(LIBS ${LIBS}
 		GLESv2)
 else()
+	set(SRCS ${SRCS} Src/RasterFont.cpp)
 	set(LIBS ${LIBS}
 		GLEW
 		${OPENGL_LIBRARIES})