CMake: Support compiling a 'generic' architecture target. Will have t…

…o disable JIT first.

CMakeLists.txt

@@ -108,8 +108,10 @@ elseif(ARM)
 	message("Building for ARMv6")
 elseif(MIPS)
 	message("Building for MIPS in x86 mode")
-else()
+elseif(X86)
 	message("Building for x86")
+else()
+	message("Building for Generic")
 endif()
 
 if(ANDROID)
@@ -120,7 +122,6 @@ else()
 	set(CoreLinkType STATIC)
 endif()
 
-#find_package(Qt5Widgets)
 if(RPI)
 	include_directories(/opt/vc/include /opt/vc/include/interface/vcos/pthreads)
 	link_directories(/opt/vc/lib)
@@ -659,7 +660,7 @@ if(ARMV7)
 	set(nativeExtra ${nativeExtra}
     native/math/fast/fast_matrix_neon.S)
 endif()
-if(NOT ARM AND NOT MIPS)
+if(X86 AND NOT MIPS)
 	set(nativeExtra ${nativeExtra}
     native/math/fast/fast_matrix_sse.c)
 endif()
@@ -704,6 +705,10 @@ elseif(USING_QT_UI)
 	include(${QT_USE_FILE})
 	qt4_wrap_cpp(nativeQtHeader native/base/QtMain.h)
 	set(nativeExtra ${nativeExtra} native/base/QtMain.cpp ${nativeQtHeader})
+	if(NOT MOBILE_DEVICE)
+		qt4_wrap_cpp(nativeQtHeader Qt/mainwindow.h)
+		set(nativeExtra ${nativeExtra} Qt/mainwindow.cpp)
+	endif()
 	set(nativeExtraLibs ${nativeExtraLibs} ${QT_LIBRARIES})
 	set(TargetBin PPSSPPQt)
 	if(APPLE)