iris/kaizen
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove GB core for now

Browse Source
This commit is contained in:
CocoSimone
2022-07-02 22:08:40 +02:00
parent 474e30da73
commit c15bfce2fc
33 changed files with 135 additions and 598 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/frontend/ParallelRDPWrapper.hpp
View File

@@ -1,9 +1,9 @@
#pragma once
#include "n64/Core.hpp"
#include "parallel-rdp-standalone/vulkan/wsi.hpp"
#include <n64/Core.hpp>
#include <parallel-rdp-standalone/vulkan/wsi.hpp>
#include <SDL2/SDL.h>
#include "n64/core/mmio/VI.hpp"
#include "BaseCore.hpp"
#include <n64/core/mmio/VI.hpp>
#include <BaseCore.hpp>
enum class Platform : bool {
SDL, Qt

6
src/frontend/sdl/CMakeLists.txt
View File

@@ -15,7 +15,5 @@ FetchContent_Declare(
)
FetchContent_MakeAvailable(argparse)
add_subdirectory(../../../external temp)
target_include_directories(natsukashii-sdl PRIVATE . ../../core ../../core/gb ../../core/n64 ../../core/n64/core ../../core/n64/core/cpu/registers)
target_link_libraries(natsukashii-sdl PRIVATE cores argparse::argparse SDL2 parallel-rdp)
target_include_directories(natsukashii-sdl PRIVATE . ../../core)
target_link_libraries(natsukashii-sdl PRIVATE cores argparse::argparse SDL2)

11
src/frontend/sdl/Frontend.cpp
View File

@@ -1,5 +1,4 @@
#include <Frontend.hpp>
#include <gb/Core.hpp>
#include <n64/Core.hpp>
#include <volk.h>
#include "../ParallelRDPWrapper.hpp"
@@ -15,13 +14,7 @@ App::~App() {
App::App(const std::string& rom, const std::string& selectedCore) {
SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_VIDEO_VULKAN);
if(selectedCore == "gb") {
window = SDL_CreateWindow("natukashii", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, 800, 600, SDL_WINDOW_RESIZABLE);
renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED);
SDL_RenderSetLogicalSize(renderer, 160, 144);
windowID = SDL_GetWindowID(window);
g_Core = std::make_unique<gb::core::Core>(rom);
} else if(selectedCore == "n64") {
if(selectedCore == "n64") {
window = SDL_CreateWindow("natukashii", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, 800, 600, SDL_WINDOW_RESIZABLE | SDL_WINDOW_VULKAN);
windowID = SDL_GetWindowID(window);
if(volkInitialize() != VK_SUCCESS) {
@@ -29,7 +22,7 @@ App::App(const std::string& rom, const std::string& selectedCore) {
}
g_Core = std::make_unique<n64::core::Core>(Platform::SDL, rom);
} else {
util::panic("Unimplemented core!");
util::panic("Unimplemented core \"{}\"!", selectedCore);
}
}

1
src/frontend/sdl/Frontend.hpp
View File

@@ -2,7 +2,6 @@
#define SDL_MAIN_HANDLED
#include <SDL2/SDL.h>
#include <SDL2/SDL_vulkan.h>
#include <BaseCore.hpp>
#include <string>
#include <memory>
#include <util.hpp>