Rename to Kaizen internally
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 Gadolinium
|
||||
- name: Build Kaizen
|
||||
run: |
|
||||
cmake \
|
||||
-G Ninja \
|
||||
@@ -28,11 +28,11 @@ jobs:
|
||||
- name: Collect artifacts
|
||||
run: |
|
||||
mkdir upload
|
||||
cp -r build/{gadolinium,resources} upload
|
||||
cp -r build/{kaizen,resources} upload
|
||||
- name: Upload artifacts
|
||||
uses: actions/upload-artifact@master
|
||||
with:
|
||||
name: gadolinium-linux
|
||||
name: kaizen-linux
|
||||
path: upload
|
||||
if-no-files-found: error
|
||||
build-windows:
|
||||
@@ -46,14 +46,14 @@ jobs:
|
||||
vcpkg install sdl2[vulkan]:x64-windows
|
||||
vcpkg install fmt:x64-windows
|
||||
vcpkg install nlohmann-json:x64-windows
|
||||
- name: Build Gadolinium
|
||||
- name: Build Kaizen
|
||||
run: |
|
||||
cmake -B build -T clangcl -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/gadolinium.exe upload
|
||||
cp build/Release/kaizen.exe upload
|
||||
mkdir upload/resources
|
||||
cp build/resources/* upload/resources
|
||||
cp build/Release/SDL2.dll upload
|
||||
@@ -61,6 +61,6 @@ jobs:
|
||||
- name: Upload artifacts
|
||||
uses: actions/upload-artifact@master
|
||||
with:
|
||||
name: gadolinium-windows
|
||||
name: kaizen-windows
|
||||
path: upload
|
||||
if-no-files-found: error
|
||||
22
README.md
22
README.md
@@ -1,21 +1,21 @@
|
||||
# Gadolinium
|
||||
# Kaizen
|
||||
|
||||
[](https://www.codefactor.io/repository/github/SimoneN64/Gadolinium/overview/master)
|
||||
[](https://github.com/SimoneN64/Gadolinium/actions/workflows/build.yml)
|
||||
[](https://www.codefactor.io/repository/github/SimoneN64/Kaizen/overview/master)
|
||||
[](https://github.com/SimoneN64/Kaizen/actions/workflows/build.yml)
|
||||
|
||||
Rewrite of my Nintendo 64 emulator "[shibumi](https://github.com/SimoneN64/shibumi)".
|
||||
|
||||

|
||||
|
||||
## Pre-built binaries
|
||||
| Release |
|
||||
|------------------------------------------------------------------------------------------------------|
|
||||
| [Windows](https://nightly.link/SimoneN64/Gadolinium/workflows/build/master/gadolinium-windows.zip) |
|
||||
| [ Linux ](https://nightly.link/SimoneN64/Gadolinium/workflows/build/master/gadolinium-linux.zip) |
|
||||
| Release |
|
||||
|--------------------------------------------------------------------------------------------|
|
||||
| [Windows](https://nightly.link/SimoneN64/Kaizen/workflows/build/master/kaizen-windows.zip) |
|
||||
| [ Linux ](https://nightly.link/SimoneN64/Kaizen/workflows/build/master/kaizen-linux.zip) |
|
||||
|
||||
|
||||
## Build instructions:
|
||||
First clone the repository: `git clone --recursive https://github.com/SimoneN64/Gadolinium`
|
||||
First clone the repository: `git clone --recursive https://github.com/SimoneN64/Kaizen`
|
||||
|
||||
### Windows
|
||||
|
||||
@@ -28,7 +28,7 @@ Dependencies:
|
||||
- nlohmann-json (install it by making sure that you're choosing the x64-windows triplet: `vcpkg install nlohmann-json:x64-windows`)
|
||||
|
||||
```
|
||||
cd path/to/gadolinium
|
||||
cd path/to/kaizen
|
||||
mkdir build
|
||||
cd build
|
||||
cmake -T clangcl -DCMAKE_TOOLCHAIN_FILE=path/to/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=Release -S ../src
|
||||
@@ -46,7 +46,7 @@ Dependencies:
|
||||
- nlohmann-json
|
||||
|
||||
```
|
||||
cd path/to/gadolinium
|
||||
cd path/to/kaizen
|
||||
mkdir build
|
||||
cd build
|
||||
cmake -DCMAKE_BUILD_TYPE=Release -S ../src
|
||||
@@ -55,7 +55,7 @@ cmake --build . --config Release
|
||||
|
||||
## Running:
|
||||
```
|
||||
./path/to/gadolinium [ROM] [Mupen Movie]
|
||||
./path/to/kaizen [ROM] [Mupen Movie]
|
||||
```
|
||||
|
||||
Your GPU needs to support Vulkan 1.1+, because the RDP is implemented via [ParaLLEl-RDP](https://github.com/Themaister/parallel-rdp).
|
||||
|
||||
2
external/nativefiledialog-extended
vendored
2
external/nativefiledialog-extended
vendored
Submodule external/nativefiledialog-extended updated: 43fe9cf958...06a5c1f0ad
@@ -1,5 +1,5 @@
|
||||
cmake_minimum_required(VERSION 3.20)
|
||||
project(gadolinium)
|
||||
project(kaizen)
|
||||
|
||||
set(BUILD_SHARED_LIBS OFF)
|
||||
set(CMAKE_CXX_STANDARD 17)
|
||||
@@ -59,7 +59,7 @@ add_subdirectory(../external/imgui imgui)
|
||||
add_subdirectory(../external/nativefiledialog-extended nfd)
|
||||
add_subdirectory(../external/parallel-rdp parallel-rdp)
|
||||
|
||||
add_executable(gadolinium main.cpp)
|
||||
add_executable(kaizen main.cpp)
|
||||
|
||||
file(COPY ${PROJECT_SOURCE_DIR}/../resources/ DESTINATION ${PROJECT_BINARY_DIR}/resources/)
|
||||
file(REMOVE
|
||||
@@ -67,11 +67,11 @@ file(REMOVE
|
||||
${PROJECT_BINARY_DIR}/resources/shader.frag
|
||||
${PROJECT_BINARY_DIR}/resources/shader.vert)
|
||||
|
||||
target_link_libraries(gadolinium PUBLIC frontend frontend-imgui
|
||||
target_link_libraries(kaizen PUBLIC frontend frontend-imgui
|
||||
discord-rpc imgui nfd parallel-rdp backend fmt::fmt nlohmann_json::nlohmann_json core jit registers interpreter mmio rsp SDL2::SDL2main SDL2::SDL2)
|
||||
|
||||
if(WIN32)
|
||||
target_compile_definitions(gadolinium PUBLIC NOMINMAX _CRT_SECURE_NO_WARNINGS)
|
||||
target_compile_definitions(kaizen PUBLIC NOMINMAX _CRT_SECURE_NO_WARNINGS)
|
||||
if(MSVC)
|
||||
target_compile_options(parallel-rdp PUBLIC /EHa)
|
||||
endif()
|
||||
|
||||
@@ -31,7 +31,7 @@ inline void UpdateRPC(State state, const std::string& game = "") {
|
||||
presence.details = textDetails.c_str();
|
||||
presence.state = textState.c_str();
|
||||
presence.startTimestamp = time(nullptr);
|
||||
presence.largeImageText = "Gadolinium";
|
||||
presence.largeImageText = "Kaizen";
|
||||
presence.largeImageKey = "logo";
|
||||
Discord_UpdatePresence(&presence);
|
||||
}
|
||||
|
||||
@@ -31,9 +31,9 @@ void Window::InitSDL() {
|
||||
SDL_Init(SDL_INIT_EVERYTHING);
|
||||
n64::InitAudio();
|
||||
|
||||
windowTitle = "Gadolinium";
|
||||
windowTitle = "Kaizen";
|
||||
window = SDL_CreateWindow(
|
||||
"Gadolinium",
|
||||
"Kaizen",
|
||||
SDL_WINDOWPOS_CENTERED,
|
||||
SDL_WINDOWPOS_CENTERED,
|
||||
1024, 768,
|
||||
@@ -159,7 +159,7 @@ void Window::LoadROM(n64::Core& core, const std::string &path) {
|
||||
}
|
||||
|
||||
Util::UpdateRPC(Util::Playing, gameName);
|
||||
windowTitle = "Gadolinium - " + gameName;
|
||||
windowTitle = "Kaizen - " + gameName;
|
||||
shadowWindowTitle = windowTitle;
|
||||
|
||||
SDL_SetWindowTitle(window, windowTitle.c_str());
|
||||
@@ -199,7 +199,7 @@ void Window::RenderMainMenuBar(n64::Core &core) {
|
||||
LoadROM(core, core.rom);
|
||||
}
|
||||
if (ImGui::MenuItem("Stop")) {
|
||||
windowTitle = "Gadolinium";
|
||||
windowTitle = "Kaizen";
|
||||
core.rom.clear();
|
||||
Util::UpdateRPC(Util::Idling);
|
||||
SDL_SetWindowTitle(window, windowTitle.c_str());
|
||||
|
||||
@@ -20,7 +20,7 @@ struct Window {
|
||||
private:
|
||||
bool showSettings = false;
|
||||
SDL_Window* window{};
|
||||
std::string windowTitle{"Gadolinium"};
|
||||
std::string windowTitle{"Kaizen"};
|
||||
std::string shadowWindowTitle{windowTitle};
|
||||
std::string gameName{};
|
||||
void InitSDL();
|
||||
|
||||
Reference in New Issue
Block a user