diff --git a/.gitignore b/.gitignore index ac3c6bebfc..29e4637a7b 100644 --- a/.gitignore +++ b/.gitignore @@ -41,7 +41,6 @@ /Vulkan/Vulkan-build /Vulkan/glslang-build -/wxWidgets/lib /bin/rpcs3.ini /bin/rpcs3.ipdb /bin/rpcs3.iobj @@ -92,4 +91,4 @@ rpcs3/rpcs3_*_cotire.cmake moc_*.cpp qrc_resources.cpp rpcs3_automoc.cpp -ui_*.h \ No newline at end of file +ui_*.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 7ec8233dae..89bc070fc5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.0.2) option(WITH_GDB "WITH_GDB" OFF) option(WITHOUT_LLVM "WITHOUT_LLVM" OFF) diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt index 61f5b4e7ee..2edf366e59 100644 --- a/rpcs3/CMakeLists.txt +++ b/rpcs3/CMakeLists.txt @@ -268,9 +268,6 @@ if(NOT WIN32 AND NOT "${CMAKE_SYSTEM}" MATCHES "Linux") set (EXCLUDE_FILES "/RSX/VK/") endif() -# The Gui folder contains wxWidgets stuff, which we no longer want. -set (EXCLUDE_FILES ${EXCLUDE_FILES} "/Gui/") - # Ignore autogenerated moc_* files if present set (EXCLUDE_FILES ${EXCLUDE_FILES} "moc_") set (EXCLUDE_FILES ${EXCLUDE_FILES} "rpcs3_automoc")