rename emulator

This commit is contained in:
CocoSimone
2022-11-19 22:26:43 +01:00
parent 35b4d5ab9e
commit f6824eaa4f
5 changed files with 20 additions and 21 deletions

View File

@@ -17,7 +17,7 @@ jobs:
cmake -B build cmake -B build
cd build cd build
sudo make install sudo make install
- name: Build natsukashii - name: Build gadolinium
run: | run: |
cmake \ cmake \
-G Ninja \ -G Ninja \
@@ -31,11 +31,11 @@ jobs:
- name: Collect artifacts - name: Collect artifacts
run: | run: |
mkdir upload mkdir upload
cp -r build/{natsukashii,resources} upload cp -r build/{gadolinium,resources} upload
- name: Upload artifacts - name: Upload artifacts
uses: actions/upload-artifact@master uses: actions/upload-artifact@master
with: with:
name: natsukashii-linux name: gadolinium-linux
path: upload path: upload
if-no-files-found: error if-no-files-found: error
build-windows: build-windows:
@@ -49,14 +49,14 @@ jobs:
vcpkg install sdl2[vulkan]:x64-windows vcpkg install sdl2[vulkan]:x64-windows
vcpkg install fmt:x64-windows vcpkg install fmt:x64-windows
vcpkg install nlohmann-json:x64-windows vcpkg install nlohmann-json:x64-windows
- name: Build natsukashii - name: Build gadolinium
run: | run: |
cmake -B build -T clangcl -DCAPSTONE_ARCHITECTURE_DEFAULT=OFF -DCAPSTONE_BUILD_TESTS=OFF -DCAPSTONE_MIPS_SUPPORT=ON -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=Release -S src cmake -B build -T clangcl -DCAPSTONE_ARCHITECTURE_DEFAULT=OFF -DCAPSTONE_BUILD_TESTS=OFF -DCAPSTONE_MIPS_SUPPORT=ON -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=Release -S src
cmake --build build --config Release cmake --build build --config Release
- name: Collect artifacts - name: Collect artifacts
run: | run: |
mkdir upload mkdir upload
cp build/Release/natsukashii.exe upload cp build/Release/gadolinium.exe upload
mkdir upload/resources mkdir upload/resources
cp build/resources/* upload/resources cp build/resources/* upload/resources
cp build/Release/SDL2.dll upload cp build/Release/SDL2.dll upload
@@ -64,6 +64,6 @@ jobs:
- name: Upload artifacts - name: Upload artifacts
uses: actions/upload-artifact@master uses: actions/upload-artifact@master
with: with:
name: natsukashii-windows name: gadolinium-windows
path: upload path: upload
if-no-files-found: error if-no-files-found: error

View File

@@ -1,8 +1,7 @@
# natsukashii # Gadolinium
### _"Joyful nostalgia"_
[![CodeFactor](https://www.codefactor.io/repository/github/cocosimone/natsukashii/badge/master)](https://www.codefactor.io/repository/github/cocosimone/natsukashii/overview/master) [![CodeFactor](https://www.codefactor.io/repository/github/cocosimone/Gadolinium/badge/master)](https://www.codefactor.io/repository/github/cocosimone/Gadolinium/overview/master)
[![build](https://github.com/CocoSimone/natsukashii/actions/workflows/build.yml/badge.svg)](https://github.com/CocoSimone/natsukashii/actions/workflows/build.yml) [![build](https://github.com/CocoSimone/Gadolinium/actions/workflows/build.yml/badge.svg)](https://github.com/CocoSimone/Gadolinium/actions/workflows/build.yml)
Rewrite of my Nintendo 64 emulator "[shibumi](https://github.com/CocoSimone/shibumi)". Rewrite of my Nintendo 64 emulator "[shibumi](https://github.com/CocoSimone/shibumi)".

View File

@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.20) cmake_minimum_required(VERSION 3.20)
project(natsukashii) project(gadolinium)
set(BUILD_SHARED_LIBS OFF) set(BUILD_SHARED_LIBS OFF)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
@@ -18,7 +18,7 @@ add_subdirectory(../external/parallel-rdp prdp)
add_subdirectory(../external/imgui imgui) add_subdirectory(../external/imgui imgui)
add_subdirectory(../external/nativefiledialog-extended nfd) add_subdirectory(../external/nativefiledialog-extended nfd)
add_executable(natsukashii add_executable(gadolinium
${CORE_SOURCES} ${CORE_SOURCES}
${CORE_HEADERS} ${CORE_HEADERS}
${FRONTEND_SOURCES} ${FRONTEND_SOURCES}
@@ -27,7 +27,7 @@ add_executable(natsukashii
common.hpp common.hpp
util.hpp) util.hpp)
target_include_directories(natsukashii PRIVATE target_include_directories(gadolinium PRIVATE
. .
n64 n64
n64/core n64/core
@@ -53,8 +53,8 @@ file(REMOVE
${PROJECT_BINARY_DIR}/resources/shader.vert) ${PROJECT_BINARY_DIR}/resources/shader.vert)
if(WIN32) if(WIN32)
target_compile_definitions(natsukashii PUBLIC NOMINMAX _CRT_SECURE_NO_WARNINGS) target_compile_definitions(gadolinium PUBLIC NOMINMAX _CRT_SECURE_NO_WARNINGS)
target_compile_options(natsukashii PUBLIC /EHa) target_compile_options(gadolinium PUBLIC /EHa)
endif() endif()
target_link_libraries(natsukashii PRIVATE SDL2::SDL2main SDL2::SDL2 capstone-static nfd parallel-rdp fmt::fmt imgui nlohmann_json::nlohmann_json) target_link_libraries(gadolinium PRIVATE SDL2::SDL2main SDL2::SDL2 capstone-static nfd parallel-rdp fmt::fmt imgui nlohmann_json::nlohmann_json)

View File

@@ -25,9 +25,9 @@ void Window::InitSDL() {
SDL_Init(SDL_INIT_EVERYTHING); SDL_Init(SDL_INIT_EVERYTHING);
n64::InitAudio(); n64::InitAudio();
windowTitle = "natsukashii"; windowTitle = "Gadolinium";
window = SDL_CreateWindow( window = SDL_CreateWindow(
"natsukashii", "Gadolinium",
SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
800, 600, 800, 600,
@@ -158,7 +158,7 @@ void Window::LoadROM(n64::Core& core, const std::string &path) {
name = std::filesystem::path(path).stem().string(); name = std::filesystem::path(path).stem().string();
} }
windowTitle = "natsukashii - " + name; windowTitle = "Gadolinium - " + name;
shadowWindowTitle = windowTitle; shadowWindowTitle = windowTitle;
SDL_SetWindowTitle(window, windowTitle.c_str()); SDL_SetWindowTitle(window, windowTitle.c_str());
@@ -210,7 +210,7 @@ void Window::Render(n64::Core& core) {
LoadROM(core, core.rom); LoadROM(core, core.rom);
} }
if (ImGui::MenuItem("Stop")) { if (ImGui::MenuItem("Stop")) {
windowTitle = "natsukashii"; windowTitle = "Gadolinium";
SDL_SetWindowTitle(window, windowTitle.c_str()); SDL_SetWindowTitle(window, windowTitle.c_str());
core.Stop(); core.Stop();
} }

View File

@@ -80,4 +80,4 @@ struct RDP {
RunCommand(mi, regs, rsp); RunCommand(mi, regs, rsp);
} }
}; };
} // natsukashii } // n64