rename emulator
This commit is contained in:
12
.github/workflows/build.yml
vendored
12
.github/workflows/build.yml
vendored
@@ -17,7 +17,7 @@ jobs:
|
||||
cmake -B build
|
||||
cd build
|
||||
sudo make install
|
||||
- name: Build natsukashii
|
||||
- name: Build gadolinium
|
||||
run: |
|
||||
cmake \
|
||||
-G Ninja \
|
||||
@@ -31,11 +31,11 @@ jobs:
|
||||
- name: Collect artifacts
|
||||
run: |
|
||||
mkdir upload
|
||||
cp -r build/{natsukashii,resources} upload
|
||||
cp -r build/{gadolinium,resources} upload
|
||||
- name: Upload artifacts
|
||||
uses: actions/upload-artifact@master
|
||||
with:
|
||||
name: natsukashii-linux
|
||||
name: gadolinium-linux
|
||||
path: upload
|
||||
if-no-files-found: error
|
||||
build-windows:
|
||||
@@ -49,14 +49,14 @@ jobs:
|
||||
vcpkg install sdl2[vulkan]:x64-windows
|
||||
vcpkg install fmt:x64-windows
|
||||
vcpkg install nlohmann-json:x64-windows
|
||||
- name: Build natsukashii
|
||||
- name: Build gadolinium
|
||||
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 --build build --config Release
|
||||
- name: Collect artifacts
|
||||
run: |
|
||||
mkdir upload
|
||||
cp build/Release/natsukashii.exe upload
|
||||
cp build/Release/gadolinium.exe upload
|
||||
mkdir upload/resources
|
||||
cp build/resources/* upload/resources
|
||||
cp build/Release/SDL2.dll upload
|
||||
@@ -64,6 +64,6 @@ jobs:
|
||||
- name: Upload artifacts
|
||||
uses: actions/upload-artifact@master
|
||||
with:
|
||||
name: natsukashii-windows
|
||||
name: gadolinium-windows
|
||||
path: upload
|
||||
if-no-files-found: error
|
||||
@@ -1,8 +1,7 @@
|
||||
# natsukashii
|
||||
### _"Joyful nostalgia"_
|
||||
# Gadolinium
|
||||
|
||||
[](https://www.codefactor.io/repository/github/cocosimone/natsukashii/overview/master)
|
||||
[](https://github.com/CocoSimone/natsukashii/actions/workflows/build.yml)
|
||||
[](https://www.codefactor.io/repository/github/cocosimone/Gadolinium/overview/master)
|
||||
[](https://github.com/CocoSimone/Gadolinium/actions/workflows/build.yml)
|
||||
|
||||
Rewrite of my Nintendo 64 emulator "[shibumi](https://github.com/CocoSimone/shibumi)".
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
cmake_minimum_required(VERSION 3.20)
|
||||
project(natsukashii)
|
||||
project(gadolinium)
|
||||
|
||||
set(BUILD_SHARED_LIBS OFF)
|
||||
set(CMAKE_CXX_STANDARD 17)
|
||||
@@ -18,7 +18,7 @@ add_subdirectory(../external/parallel-rdp prdp)
|
||||
add_subdirectory(../external/imgui imgui)
|
||||
add_subdirectory(../external/nativefiledialog-extended nfd)
|
||||
|
||||
add_executable(natsukashii
|
||||
add_executable(gadolinium
|
||||
${CORE_SOURCES}
|
||||
${CORE_HEADERS}
|
||||
${FRONTEND_SOURCES}
|
||||
@@ -27,7 +27,7 @@ add_executable(natsukashii
|
||||
common.hpp
|
||||
util.hpp)
|
||||
|
||||
target_include_directories(natsukashii PRIVATE
|
||||
target_include_directories(gadolinium PRIVATE
|
||||
.
|
||||
n64
|
||||
n64/core
|
||||
@@ -53,8 +53,8 @@ file(REMOVE
|
||||
${PROJECT_BINARY_DIR}/resources/shader.vert)
|
||||
|
||||
if(WIN32)
|
||||
target_compile_definitions(natsukashii PUBLIC NOMINMAX _CRT_SECURE_NO_WARNINGS)
|
||||
target_compile_options(natsukashii PUBLIC /EHa)
|
||||
target_compile_definitions(gadolinium PUBLIC NOMINMAX _CRT_SECURE_NO_WARNINGS)
|
||||
target_compile_options(gadolinium PUBLIC /EHa)
|
||||
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)
|
||||
@@ -25,9 +25,9 @@ void Window::InitSDL() {
|
||||
SDL_Init(SDL_INIT_EVERYTHING);
|
||||
n64::InitAudio();
|
||||
|
||||
windowTitle = "natsukashii";
|
||||
windowTitle = "Gadolinium";
|
||||
window = SDL_CreateWindow(
|
||||
"natsukashii",
|
||||
"Gadolinium",
|
||||
SDL_WINDOWPOS_CENTERED,
|
||||
SDL_WINDOWPOS_CENTERED,
|
||||
800, 600,
|
||||
@@ -158,7 +158,7 @@ void Window::LoadROM(n64::Core& core, const std::string &path) {
|
||||
name = std::filesystem::path(path).stem().string();
|
||||
}
|
||||
|
||||
windowTitle = "natsukashii - " + name;
|
||||
windowTitle = "Gadolinium - " + name;
|
||||
shadowWindowTitle = windowTitle;
|
||||
|
||||
SDL_SetWindowTitle(window, windowTitle.c_str());
|
||||
@@ -210,7 +210,7 @@ void Window::Render(n64::Core& core) {
|
||||
LoadROM(core, core.rom);
|
||||
}
|
||||
if (ImGui::MenuItem("Stop")) {
|
||||
windowTitle = "natsukashii";
|
||||
windowTitle = "Gadolinium";
|
||||
SDL_SetWindowTitle(window, windowTitle.c_str());
|
||||
core.Stop();
|
||||
}
|
||||
|
||||
@@ -80,4 +80,4 @@ struct RDP {
|
||||
RunCommand(mi, regs, rsp);
|
||||
}
|
||||
};
|
||||
} // natsukashii
|
||||
} // n64
|
||||
|
||||
Reference in New Issue
Block a user