Merge support for Linux into spice2x-24-08-24 #1

Merged
Scan merged 4 commits from spice2x_nix into master 2024-08-28 17:02:56 +00:00
4 changed files with 9 additions and 0 deletions
Showing only changes of commit 915397b28f - Show all commits

View File

@ -5,6 +5,10 @@ games::Game::Game(std::string name) {
this->name = name; this->name = name;
} }
const char *games::Game::title() {
return this->name.c_str();
}
void games::Game::attach() { void games::Game::attach() {
log_info("game", "attach: {}", name); log_info("game", "attach: {}", name);
} }

View File

@ -15,6 +15,7 @@ namespace games {
// where the main magic will happen // where the main magic will happen
virtual void attach(); virtual void attach();
virtual const char *title();
// optional // optional
virtual void pre_attach(); virtual void pre_attach();

View File

@ -121,6 +121,7 @@ std::string LOG_FILE_PATH = "";
int LAUNCHER_ARGC = 0; int LAUNCHER_ARGC = 0;
char **LAUNCHER_ARGV = nullptr; char **LAUNCHER_ARGV = nullptr;
std::unique_ptr<std::vector<Option>> LAUNCHER_OPTIONS; std::unique_ptr<std::vector<Option>> LAUNCHER_OPTIONS;
games::Game *GAME_INSTANCE = nullptr;
std::string CARD_OVERRIDES[2]; std::string CARD_OVERRIDES[2];
// sub-systems // sub-systems
@ -1616,6 +1617,7 @@ int main_implementation(int argc, char *argv[]) {
avs::core::set_default_heap_size("kamunity.dll"); avs::core::set_default_heap_size("kamunity.dll");
games.push_back(new games::qks::QKSGame()); games.push_back(new games::qks::QKSGame());
} }
GAME_INSTANCE = games.back();
// apply user heap size, if defined // apply user heap size, if defined
if (user_heap_size > 0) { if (user_heap_size > 0) {

View File

@ -7,6 +7,7 @@
#include <windows.h> #include <windows.h>
#include "cfg/option.h" #include "cfg/option.h"
#include "games/game.h"
namespace rawinput { namespace rawinput {
class RawInputManager; class RawInputManager;
@ -21,6 +22,7 @@ extern std::string LOG_FILE_PATH;
extern int LAUNCHER_ARGC; extern int LAUNCHER_ARGC;
extern char **LAUNCHER_ARGV; extern char **LAUNCHER_ARGV;
extern std::unique_ptr<std::vector<Option>> LAUNCHER_OPTIONS; extern std::unique_ptr<std::vector<Option>> LAUNCHER_OPTIONS;
extern games::Game *GAME_INSTANCE;
extern std::unique_ptr<api::Controller> API_CONTROLLER; extern std::unique_ptr<api::Controller> API_CONTROLLER;
extern std::unique_ptr<rawinput::RawInputManager> RI_MGR; extern std::unique_ptr<rawinput::RawInputManager> RI_MGR;