ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Murdering a wx zombie

This commit is contained in:
Robbie 2017-07-13 19:57:07 -05:00 committed by Ivan
parent 225af34ce9
commit ced539579e
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -41,7 +41,6 @@
/Vulkan/Vulkan-build /Vulkan/Vulkan-build
/Vulkan/glslang-build /Vulkan/glslang-build
/wxWidgets/lib
/bin/rpcs3.ini /bin/rpcs3.ini
/bin/rpcs3.ipdb /bin/rpcs3.ipdb
/bin/rpcs3.iobj /bin/rpcs3.iobj
@ -92,4 +91,4 @@ rpcs3/rpcs3_*_cotire.cmake
moc_*.cpp moc_*.cpp
qrc_resources.cpp qrc_resources.cpp
rpcs3_automoc.cpp rpcs3_automoc.cpp
ui_*.h ui_*.h

2
CMakeLists.txt
View File

@ -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(WITH_GDB "WITH_GDB" OFF)
option(WITHOUT_LLVM "WITHOUT_LLVM" OFF) option(WITHOUT_LLVM "WITHOUT_LLVM" OFF)

3
rpcs3/CMakeLists.txt
View File

@ -268,9 +268,6 @@ if(NOT WIN32 AND NOT "${CMAKE_SYSTEM}" MATCHES "Linux")
set (EXCLUDE_FILES "/RSX/VK/") set (EXCLUDE_FILES "/RSX/VK/")
endif() endif()
# The Gui folder contains wxWidgets stuff, which we no longer want.
set (EXCLUDE_FILES ${EXCLUDE_FILES} "/Gui/")
# Ignore autogenerated moc_* files if present # Ignore autogenerated moc_* files if present
set (EXCLUDE_FILES ${EXCLUDE_FILES} "moc_") set (EXCLUDE_FILES ${EXCLUDE_FILES} "moc_")
set (EXCLUDE_FILES ${EXCLUDE_FILES} "rpcs3_automoc") set (EXCLUDE_FILES ${EXCLUDE_FILES} "rpcs3_automoc")