Initial commit

This commit is contained in:
igor725 2024-04-29 14:44:48 +03:00
parent 0d4f404c61
commit bccf42afcf
No known key found for this signature in database
GPG Key ID: 46F13BBE46F8569D
4 changed files with 12 additions and 8 deletions

View File

@ -36,6 +36,7 @@ message("Vulkan Path: ${VulkanPath}")
# # - Gather Infos
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/lib) # Move all libs here post-build, except third_party
add_definitions(-DPSOFF_RENDER_VERSION="${PSOFF_RENDER_VERSION}")
#
include_directories(BEFORE
@ -160,4 +161,4 @@ install(TARGETS psoff
DESTINATION .
)
install(FILES $<TARGET_PDB_FILE:psoff> DESTINATION ${CMAKE_INSTALL_PREFIX}/debug OPTIONAL)
install(FILES $<TARGET_PDB_FILE:psoff> DESTINATION ${CMAKE_INSTALL_PREFIX}/debug OPTIONAL)

View File

@ -28,7 +28,6 @@
#include <memory>
#include <mutex>
#include <optick.h>
#include <psoff_render_version.h>
#include <queue>
#include <thread>
@ -159,7 +158,7 @@ std::string getTitle(int handle, uint64_t frame, size_t fps, FlipRate maxFPS) {
}();
return std::format("{} | {}(v{}): wnd={} frame={} fps={}(locked:{}) version:{}", title, id, ver, handle, frame, fps, magic_enum::enum_name(maxFPS).data(),
psoff_render_version);
PSOFF_RENDER_VERSION);
}
} // namespace
@ -757,7 +756,7 @@ void cbWindow_keyhandler(SDL_Window* window, SDL_Event* event) {
.title = title ? title.value().data() : "Your PS4 Game Name",
.title_id = title_id ? title_id.value().data() : "CUSA00000",
.app_ver = app_ver ? app_ver.value().data() : "v0.0",
.emu_ver = psoff_render_version,
.emu_ver = PSOFF_RENDER_VERSION,
.wnd = window,
.type = IGameReport::Type::USER,
@ -975,4 +974,4 @@ std::thread VideoOut::createSDLThread() {
}
SDL_Quit();
});
}
}

View File

@ -171,6 +171,10 @@ class IVideoOut {
virtual bool isGPULocal(uint64_t vaddr) = 0;
};
#ifndef PSOFF_RENDER_VERSION
#define PSOFF_RENDER_VERSION "unknown"
#endif
#if defined(__APICALL_EXTERN)
#define __APICALL __declspec(dllexport)
#elif defined(__APICALL_IMPORT)

View File

@ -8,12 +8,12 @@
#include "core/runtime/runtimeLinker.h"
#include "core/systemContent/systemContent.h"
#include "core/timer/timer.h"
#include "core/videoout/videoout.h"
#include "logging.h"
#include <chrono>
#include <filesystem>
#include <fstream>
#include <psoff_render_version.h>
#include <set>
#include <thread>
#include <windows.h>
@ -76,7 +76,7 @@ bool loadModule(std::string_view strFullpath) {
int main(int argc, char** argv) {
LOG_USE_MODULE(MAIN);
printf("Emulator version: %s\n", psoff_render_version);
printf("Renderer version: %s\n", PSOFF_RENDER_VERSION);
auto initParams = accessInitParams();
@ -206,4 +206,4 @@ int main(int argc, char** argv) {
__Log::flush();
return 0;
}
}