Forks/citra
1
0
Fork 0
mirror of https://github.com/PabloMK7/citra.git synced 2025-10-31 05:40:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove scripting switch in cmake

Browse source
This commit is contained in:
Weiyi Wang 2019-01-29 18:01:30 -05:00
parent 6347b5cbb4
commit 008197a569
8 changed files with 12 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/core/CMakeLists.txt
View file

@ -423,6 +423,14 @@ add_library(core STATIC
movie.h
perf_stats.cpp
perf_stats.h
rpc/packet.cpp
rpc/packet.h
rpc/rpc_server.cpp
rpc/rpc_server.h
rpc/server.cpp
rpc/server.h
rpc/udp_server.cpp
rpc/udp_server.h
settings.cpp
settings.h
telemetry_session.cpp
@ -431,18 +439,6 @@ add_library(core STATIC
tracer/recorder.cpp
tracer/recorder.h
)
if (ENABLE_SCRIPTING)
target_sources(core PRIVATE
rpc/packet.cpp
rpc/packet.h
rpc/rpc_server.cpp
rpc/rpc_server.h
rpc/server.cpp
rpc/server.h
rpc/udp_server.cpp
rpc/udp_server.h
)
endif()
create_target_directory_groups(core)

6
src/core/core.cpp
View file

@ -27,9 +27,7 @@
#include "core/hw/hw.h"
#include "core/loader/loader.h"
#include "core/movie.h"
#ifdef ENABLE_SCRIPTING
#include "core/rpc/rpc_server.h"
#endif
#include "core/settings.h"
#include "network/network.h"
#include "video_core/video_core.h"
@ -201,9 +199,7 @@ System::ResultStatus System::Init(EmuWindow& emu_window, u32 system_mode) {
telemetry_session = std::make_unique<Core::TelemetrySession>();
#ifdef ENABLE_SCRIPTING
rpc_server = std::make_unique<RPC::RPCServer>();
#endif
service_manager = std::make_shared<Service::SM::ServiceManager>(*this);
archive_manager = std::make_unique<Service::FS::ArchiveManager>(*this);
@ -294,9 +290,7 @@ void System::Shutdown() {
kernel.reset();
HW::Shutdown();
telemetry_session.reset();
#ifdef ENABLE_SCRIPTING
rpc_server.reset();
#endif
cheat_engine.reset();
service_manager.reset();
dsp_core.reset();

4
src/core/core.h
View file

@ -24,11 +24,9 @@ namespace AudioCore {
class DspInterface;
}
#ifdef ENABLE_SCRIPTING
namespace RPC {
class RPCServer;
}
#endif
namespace Service {
namespace SM {
@ -267,10 +265,8 @@ private:
/// Cheats manager
std::unique_ptr<Cheats::CheatEngine> cheat_engine;
#ifdef ENABLE_SCRIPTING
/// RPC Server for scripting support
std::unique_ptr<RPC::RPCServer> rpc_server;
#endif
std::unique_ptr<Service::FS::ArchiveManager> archive_manager;