diff --git a/ps3emu_api/ps3emu_api.cpp b/ps3emu_api/ps3emu_api.cpp deleted file mode 100644 index 62cb1a510d..0000000000 --- a/ps3emu_api/ps3emu_api.cpp +++ /dev/null @@ -1,65 +0,0 @@ -#include "ps3emu_api.h" - -ps3emu_api::ps3emu_api(const std::string &path) -{ - load(path); -} - -bool ps3emu_api::load(const std::string &path) -{ - if (!m_library.load(path)) - { - return false; - } - - bool is_no_errors = true; - - if (!m_library.get(get_api_version, "ps3emu_api_get_api_version") || get_api_version() != ps3emu_api_version) - { - is_no_errors = false; - } - - is_no_errors = is_no_errors && m_library.get(initialize, "ps3emu_api_initialize"); - is_no_errors = is_no_errors && m_library.get(destroy, "ps3emu_api_destroy"); - - is_no_errors = is_no_errors && m_library.get(get_version_string, "ps3emu_api_get_version_string"); - is_no_errors = is_no_errors && m_library.get(get_version_number, "ps3emu_api_get_version_number"); - is_no_errors = is_no_errors && m_library.get(get_name_string, "ps3emu_api_get_name_string"); - - is_no_errors = is_no_errors && m_library.get(load_elf, "ps3emu_api_load_elf"); - - is_no_errors = is_no_errors && m_library.get(set_state, "ps3emu_api_set_state"); - is_no_errors = is_no_errors && m_library.get(get_state, "ps3emu_api_get_state"); - - if (!is_no_errors) - { - close(); - return false; - } - - return true; -} - -bool ps3emu_api::loaded() const -{ - return m_library.loaded(); -} - -void ps3emu_api::close() -{ - initialize = nullptr; - destroy = nullptr; - get_version_string = nullptr; - get_version_number = nullptr; - get_name_string = nullptr; - load_elf = nullptr; - set_state = nullptr; - get_state = nullptr; - - m_library.close(); -} - -ps3emu_api::operator bool() const -{ - return loaded(); -} diff --git a/ps3emu_api/ps3emu_api.h b/ps3emu_api/ps3emu_api.h deleted file mode 100644 index 6469086d28..0000000000 --- a/ps3emu_api/ps3emu_api.h +++ /dev/null @@ -1,35 +0,0 @@ -#pragma once - -#include -#include -#include "ps3emu_api_enums.h" -#include "ps3emu_api_structs.h" - -class ps3emu_api -{ - utils::dynamic_library m_library; - -public: - ps3emu_api() = default; - ps3emu_api(const std::string &path); - - unsigned int(*get_api_version)() = nullptr; - ps3emu_api_error_code(*initialize)(const ps3emu_api_initialize_callbacks *callbacks) = nullptr; - ps3emu_api_error_code(*destroy)() = nullptr; - - ps3emu_api_error_code(*get_version_string)(char *dest_buffer, int dest_buffer_size) = nullptr; - ps3emu_api_error_code(*get_version_number)(int *version_number) = nullptr; - ps3emu_api_error_code(*get_name_string)(char *dest_buffer, int dest_buffer_size) = nullptr; - - ps3emu_api_error_code(*load_elf)(const char *path) = nullptr; - - ps3emu_api_error_code(*set_state)(ps3emu_api_state state) = nullptr; - ps3emu_api_error_code(*get_state)(ps3emu_api_state *state) = nullptr; - - bool load(const std::string &path); - bool loaded() const; - void close(); - - explicit operator bool() const; -}; - diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj index 69a5642073..a37d8c5e76 100644 --- a/rpcs3/emucore.vcxproj +++ b/rpcs3/emucore.vcxproj @@ -69,9 +69,6 @@ - - NotUsing - NotUsing @@ -350,7 +347,6 @@ - @@ -569,8 +565,6 @@ - - diff --git a/rpcs3/emucore.vcxproj.filters b/rpcs3/emucore.vcxproj.filters index 90e27868e3..90de377ef9 100644 --- a/rpcs3/emucore.vcxproj.filters +++ b/rpcs3/emucore.vcxproj.filters @@ -674,9 +674,6 @@ Source Files - - Source Files - Source Files @@ -1321,15 +1318,6 @@ Utilities - - Header Files - - - Header Files - - - Header Files - Header Files