Fused ui-qt and ui-console together into ui-cpp.

The corresp. CMake option now simply chooses which part of the main is compiled (and which sources are considered at all).
DTolm · Aug 28, 2017 · daca12b · daca12b
1 parent 766f44c
commit daca12b
Show file tree

Hide file tree

Showing 63 changed files with 487 additions and 696 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -182,10 +182,9 @@ add_subdirectory( core )
 if( SPIRIT_BUILD_FOR_CXX )
 	if ( UI_CXX_USE_QT )
 		add_subdirectory( VFRendering )
-		add_subdirectory( ui-qt )
-	else()
-		add_subdirectory( ui-console )
+		add_definitions( -DUI_CXX_USE_QT )
 	endif()
+	add_subdirectory( ui-cpp )
 endif()
 ### Web UI
 if( SPIRIT_BUILD_FOR_JS )

diff --git a/ui-console/CMakeLists.txt b/ui-console/CMakeLists.txt
diff --git a/ui-console/README.md b/ui-console/README.md
diff --git a/ui-console/include/InputParser.hpp b/ui-console/include/InputParser.hpp
diff --git a/ui-console/include/Threading.hpp b/ui-console/include/Threading.hpp
diff --git a/ui-console/main.cpp b/ui-console/main.cpp