Game-Decompilation/sotn-decomp
1
0
Fork 0
mirror of https://github.com/Xeeynamo/sotn-decomp.git synced 2024-10-07 10:33:37 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity
2f376b66f9
sotn-decomp/CMakeLists.txt

128 lines
2.6 KiB
CMake
Raw Normal View History

Windows build with cmake (#889) This adds cmake and a windows build to the CI. I haven't tested the result, just got it building. I had to make quite a few changes since MSVC has a number of differences compared to GCC. I added two cmake modules to find sdl2 and sdl2_image from here https://github.com/aminosbh/sdl2-cmake-modules The dirent stuff is just `#ifdef`ed out for now since I think it's unused? I'm keeping the Makefile.pc for the moment until this is more proven. I wasn't able to figure out how to add -fsanitize=address for some reason to gcc/clang builds, open to suggestions there. Otherwise I think the cmake build is more or less the same as the Makefile one.
2023-12-27 09:24:00 +00:00
cmake_minimum_required(VERSION 3.10)
project(Sound)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
Add macOS agent to the CI (#968) `AppleClang` has `-Wimplicit-function-declaration` and `-Wreturn-type` defined by default. I had to disable them to have parity between non-Apple default compiler flags.
2024-01-11 22:46:35 +00:00
if (WIN32)
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
endif()
Windows build with cmake (#889) This adds cmake and a windows build to the CI. I haven't tested the result, just got it building. I had to make quite a few changes since MSVC has a number of differences compared to GCC. I added two cmake modules to find sdl2 and sdl2_image from here https://github.com/aminosbh/sdl2-cmake-modules The dirent stuff is just `#ifdef`ed out for now since I think it's unused? I'm keeping the Makefile.pc for the moment until this is more proven. I wasn't able to figure out how to add -fsanitize=address for some reason to gcc/clang builds, open to suggestions there. Otherwise I think the cmake build is more or less the same as the Makefile one.
2023-12-27 09:24:00 +00:00
Add macOS agent to the CI (#968) `AppleClang` has `-Wimplicit-function-declaration` and `-Wreturn-type` defined by default. I had to disable them to have parity between non-Apple default compiler flags.
2024-01-11 22:46:35 +00:00
if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|AppleClang")
Load VB,VH files, fix memory bugs (#958) This turns on address sanitizer, prevents a bunch of memory corruption bugs, and loads the VB/VH files.
2024-01-11 00:34:12 +00:00
set(CMAKE_BUILD_TYPE Debug)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address")
set(CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} -fsanitize=address")
endif()
Add macOS agent to the CI (#968) `AppleClang` has `-Wimplicit-function-declaration` and `-Wreturn-type` defined by default. I had to disable them to have parity between non-Apple default compiler flags.
2024-01-11 22:46:35 +00:00
if (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-implicit-function-declaration")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-return-type")
endif()
Windows build with cmake (#889) This adds cmake and a windows build to the CI. I haven't tested the result, just got it building. I had to make quite a few changes since MSVC has a number of differences compared to GCC. I added two cmake modules to find sdl2 and sdl2_image from here https://github.com/aminosbh/sdl2-cmake-modules The dirent stuff is just `#ifdef`ed out for now since I think it's unused? I'm keeping the Makefile.pc for the moment until this is more proven. I wasn't able to figure out how to add -fsanitize=address for some reason to gcc/clang builds, open to suggestions there. Otherwise I think the cmake build is more or less the same as the Makefile one.
2023-12-27 09:24:00 +00:00
find_package(SDL2 REQUIRED)
set(SOURCE_FILES_PC
src/pc/main.c
src/pc/log.c
src/pc/stubs.c
src/pc/sotn.c
src/pc/pc.c
src/pc/sdl2.c
Texture render support (#934) Technically unimpressive, but I had to go through quite a good amount of changes. Here is the full changelog to make everything work: * Ensure `ResetPlatform` is always called to avoid memory leaks * Add `g_RawVram` to emulate the PS1 VRAM * ~~The engine will load the optional file `disks/vram.bin`, a RAM dump from an emulator~~ * SDL2 will create 256x256 textures on-the-fly whenever a specific tpage is requested via `GetVramTexture` * The function `GetVramTexture` caches the last called tpage to avoid tanking the performance * `GetVramTexture` for only renders 4bpp and 8bpp textures with their specified palette * Remove `SDL2_image` as the font is now loaded straight from the VRAM * Calling `VSync` will call the set callback, which the game uses for DMA operations * `MyLoadImage` is not yet implemented, but it is a placeholder to then interact with `g_RawVram` * The menu font now uses the texture found in the VRAM * Plugged a custom version of `LoadFileSim` * The file `sim_pc.c` is similar to the original game's code but it is used here to load files from custom paths * Using F5, F6 or F7 can dump the VRAM content on-screen, respectively in 16bpp, 8bpp and 4bpp There are new graphical glitches on the font. In some occasions it appears black. It seems to be related to a flag in `P_TAG.code`. I plan to dig into it when I can render entities on screen to avoid potential mistakes. The same problem is present for the first half of Alucard's portrait. It seems to be related when a texture is transparent? 🤷 I am not sure why the font is completely corrupted when entering in the Equip menu. It is hard to understand if I introduced any regression. Maybe the glitch was always there but it was hidden since I was always forcing the font texture to be rendered. EDIT: Implemented `LoadImage`, `SaveImage` and `ClearImage`
2024-01-01 23:31:56 +00:00
src/pc/sim_pc.c
Add stage dummy (#939) Last test app specific PR for a few days. This adds a dummy stage that gets loaded by `InitStageDummy`. It does very similarly what the game does by copying the exported stage functions into `g_api.o`. The new entrypoint is now `InitRoomEntities`. The dummy stage loads some assets from WRP. The stage layout and tileset are loaded in-memory. I created a very barebone `RenderTilemap` to draw the foreground without any scrolling implemented. I am not sure why the HUD is only showing when entering in the menu and it's black. There is a hack job in the dummy stage to skip the SEL overlay and ask the game to load WRP. Choosing WRP is purely arbitrary as any stage but SEL would result to the same behaviour. This is a bit of a memory hog. I introduced a memory pool instead of using `malloc` for the assets loaded dynamically. The dummy stage will not stay here for long, so I do not find useful to optimise it. <img width="263" alt="image" src="https://github.com/Xeeynamo/sotn-decomp/assets/6128729/4c0c0ed9-ddca-4f5b-a35d-a3fe0f8ababa">
2024-01-02 09:22:44 +00:00
src/pc/stage_dummy.c
Windows build with cmake (#889) This adds cmake and a windows build to the CI. I haven't tested the result, just got it building. I had to make quite a few changes since MSVC has a number of differences compared to GCC. I added two cmake modules to find sdl2 and sdl2_image from here https://github.com/aminosbh/sdl2-cmake-modules The dirent stuff is just `#ifdef`ed out for now since I think it's unused? I'm keeping the Makefile.pc for the moment until this is more proven. I wasn't able to figure out how to add -fsanitize=address for some reason to gcc/clang builds, open to suggestions there. Otherwise I think the cmake build is more or less the same as the Makefile one.
2023-12-27 09:24:00 +00:00
)
Reduce _MSC_VER footprint (#896) Reduce the amount of `#ifdef` by abstracting platform specific code into ad-hoc C files that can be linked and swapped. I trimmed down `libapi.c` and used the `My`/`my_` pattern for those specific PSX API calls. The new `plat_unix.c` contains the usual code, while `plat_win.c` contains placeholder functions waiting for an implementation. I have no rush to do so because I have yet to test if the unix version works. I removed from `sotn.c` and `libcard.c` any reference to SDL, which is now self-contained in `sdl2.c`.
2023-12-27 16:26:24 +00:00
if(WIN32)
list(APPEND SOURCE_FILES_PC src/pc/plat_win.c)
else()
list(APPEND SOURCE_FILES_PC src/pc/plat_unix.c)
endif()
Windows build with cmake (#889) This adds cmake and a windows build to the CI. I haven't tested the result, just got it building. I had to make quite a few changes since MSVC has a number of differences compared to GCC. I added two cmake modules to find sdl2 and sdl2_image from here https://github.com/aminosbh/sdl2-cmake-modules The dirent stuff is just `#ifdef`ed out for now since I think it's unused? I'm keeping the Makefile.pc for the moment until this is more proven. I wasn't able to figure out how to add -fsanitize=address for some reason to gcc/clang builds, open to suggestions there. Otherwise I think the cmake build is more or less the same as the Makefile one.
2023-12-27 09:24:00 +00:00
set(SOURCE_FILES_PSX_SDK
src/main/psxsdk/libgpu/ext.c
)
set(SOURCE_FILES_MOCK_SDK
src/pc/psxsdk/libapi.c
src/pc/psxsdk/libetc.c
src/pc/psxsdk/libgpu.c
src/pc/psxsdk/libgte.c
src/pc/psxsdk/libgs.c
src/pc/psxsdk/libcd.c
src/pc/psxsdk/libcard.c
src/pc/psxsdk/libspu.c
src/pc/psxsdk/libsnd.c
src/pc/psxsdk/cdc.c
)
set(SOURCE_FILES_3RD
src/pc/3rd/cJSON/cJSON.c
)
set(SOURCE_FILES_DRA
src/dra/42398.c
src/dra/play.c
src/dra/loading.c
src/dra/pads.c
src/dra/save_mgr_pre.c
src/dra/save_mgr.c
src/dra/4A538.c
src/dra/collider.c
src/dra/demo.c
Add stage dummy (#939) Last test app specific PR for a few days. This adds a dummy stage that gets loaded by `InitStageDummy`. It does very similarly what the game does by copying the exported stage functions into `g_api.o`. The new entrypoint is now `InitRoomEntities`. The dummy stage loads some assets from WRP. The stage layout and tileset are loaded in-memory. I created a very barebone `RenderTilemap` to draw the foreground without any scrolling implemented. I am not sure why the HUD is only showing when entering in the menu and it's black. There is a hack job in the dummy stage to skip the SEL overlay and ask the game to load WRP. Choosing WRP is purely arbitrary as any stage but SEL would result to the same behaviour. This is a bit of a memory hog. I introduced a memory pool instead of using `malloc` for the assets loaded dynamically. The dummy stage will not stay here for long, so I do not find useful to optimise it. <img width="263" alt="image" src="https://github.com/Xeeynamo/sotn-decomp/assets/6128729/4c0c0ed9-ddca-4f5b-a35d-a3fe0f8ababa">
2024-01-02 09:22:44 +00:00
src/dra/5087C.c
SEL config_us.c (#950) Simple PR that aims to re-use the same `config_us` file from #948 but for SEL. The file is de-duplicated since it is identical. The file `lba_stage` has to be split again since in DRA it comes before `config_us` but in SEL it comes after. That indicates it could have been a stand-alone file. I also imported the exp table responsible for levelling up.
2024-01-07 16:41:18 +00:00
src/dra/lba_stage.c
DRA assets config (#948) Creates the file `config_us.c` with all the configuration needed for the game to know where to locate files in the disc (previously `lba_stage.c`), equipments, accessories, menu strings (previously `lang_us.c`, , spells, relics and enemy structures. There is also an exp table for levelling up but I did not import it yet. This is a major change in the codebase on how we handle assets. Previously they were exported as JSON in `assets/dra`. The main problem is that strings were not properly compiled, still relying on hardcoded offsets expected to be found in the `.rodata` section. I deducted all those information belong to a single C file because the same strings in rodata were referenced from equipment to enemies. If those strings are found in the same C file, the compiler will optimise duplicated strings by de-duplicating them. This is how I reached the conclusion of having all those definitions in a single file. Obviously the major pain point of this is that a JSON was much more declarative and easy to be consumed. Especially if tools were going to use those files. Counting the commas with the struct definition on the side is not the best thing for modding. I had to comment out the HD `lba_stage` as it would require a major work to support the Japanese text.
2024-01-07 02:28:34 +00:00
src/dra/config_us.c
Windows build with cmake (#889) This adds cmake and a windows build to the CI. I haven't tested the result, just got it building. I had to make quite a few changes since MSVC has a number of differences compared to GCC. I added two cmake modules to find sdl2 and sdl2_image from here https://github.com/aminosbh/sdl2-cmake-modules The dirent stuff is just `#ifdef`ed out for now since I think it's unused? I'm keeping the Makefile.pc for the moment until this is more proven. I wasn't able to figure out how to add -fsanitize=address for some reason to gcc/clang builds, open to suggestions there. Otherwise I think the cmake build is more or less the same as the Makefile one.
2023-12-27 09:24:00 +00:00
src/dra/menu.c
src/dra/5D6C4.c
src/dra/627C4.c
src/dra/63ED4.c
src/dra/91EBC.c
src/dra/92F60.c
src/dra/93290.c
src/dra/93BDC.c
src/dra/94F50.c
src/dra/953A0.c
)
Link stage SEL (#963) This depends from #962 . Without `func_800EA7CC` being decompiled, past the title screen you will be welcomed with a black screen. Using the [non matching scratch](https://decomp.me/scratch/dlQDD) will work. The input works regardless the black screen. Getting past the name selection screen there is a crash at `SetReleaseRate1` due to `D_80138FB4` being `NULL`. Getting past it you will get another crash at `HandleVideoPlayback` but I neither investigated on it or tried what's beyond that. There is a divergence between the Make and CMake. For some reason the build from CMake gives a black screen. I am not able to detect where the issue is. I get no warnings or errors. I noticed `g_MegaMenuStrBuffer` gets full much faster in the CMake build. It might due to a silly size of any of the atomic C types. It needs further investigation.
2024-01-11 20:13:33 +00:00
set(SOURCE_FILES_STAGE_SEL
src/pc/stage_sel.c
src/st/sel/banks.c
src/st/sel/CD54.c
src/st/sel/2C048.c
src/st/sel/33164.c
src/st/sel/3410C.c
src/st/sel/3585C.c
src/st/sel/3642C.c
)
Windows build with cmake (#889) This adds cmake and a windows build to the CI. I haven't tested the result, just got it building. I had to make quite a few changes since MSVC has a number of differences compared to GCC. I added two cmake modules to find sdl2 and sdl2_image from here https://github.com/aminosbh/sdl2-cmake-modules The dirent stuff is just `#ifdef`ed out for now since I think it's unused? I'm keeping the Makefile.pc for the moment until this is more proven. I wasn't able to figure out how to add -fsanitize=address for some reason to gcc/clang builds, open to suggestions there. Otherwise I think the cmake build is more or less the same as the Makefile one.
2023-12-27 09:24:00 +00:00
add_executable(${PROJECT_NAME}
${SOURCE_FILES_PC}
${SOURCE_FILES_PSX_SDK}
${SOURCE_FILES_MOCK_SDK}
${SOURCE_FILES_3RD}
${SOURCE_FILES_DRA}
Link stage SEL (#963) This depends from #962 . Without `func_800EA7CC` being decompiled, past the title screen you will be welcomed with a black screen. Using the [non matching scratch](https://decomp.me/scratch/dlQDD) will work. The input works regardless the black screen. Getting past the name selection screen there is a crash at `SetReleaseRate1` due to `D_80138FB4` being `NULL`. Getting past it you will get another crash at `HandleVideoPlayback` but I neither investigated on it or tried what's beyond that. There is a divergence between the Make and CMake. For some reason the build from CMake gives a black screen. I am not able to detect where the issue is. I get no warnings or errors. I noticed `g_MegaMenuStrBuffer` gets full much faster in the CMake build. It might due to a silly size of any of the atomic C types. It needs further investigation.
2024-01-11 20:13:33 +00:00
${SOURCE_FILES_STAGE_SEL}
)
Windows build with cmake (#889) This adds cmake and a windows build to the CI. I haven't tested the result, just got it building. I had to make quite a few changes since MSVC has a number of differences compared to GCC. I added two cmake modules to find sdl2 and sdl2_image from here https://github.com/aminosbh/sdl2-cmake-modules The dirent stuff is just `#ifdef`ed out for now since I think it's unused? I'm keeping the Makefile.pc for the moment until this is more proven. I wasn't able to figure out how to add -fsanitize=address for some reason to gcc/clang builds, open to suggestions there. Otherwise I think the cmake build is more or less the same as the Makefile one.
2023-12-27 09:24:00 +00:00
target_include_directories(${PROJECT_NAME} PRIVATE
${SDL2_INCLUDE_DIRS}
include
src/dra
src/pc/3rd
)
target_link_libraries(${PROJECT_NAME} PRIVATE
${SDL2_LIBRARIES}
)
target_compile_definitions(${PROJECT_NAME} PRIVATE
VERSION_PC
PERMUTER
NON_MATCHING
Link stage SEL (#963) This depends from #962 . Without `func_800EA7CC` being decompiled, past the title screen you will be welcomed with a black screen. Using the [non matching scratch](https://decomp.me/scratch/dlQDD) will work. The input works regardless the black screen. Getting past the name selection screen there is a crash at `SetReleaseRate1` due to `D_80138FB4` being `NULL`. Getting past it you will get another crash at `HandleVideoPlayback` but I neither investigated on it or tried what's beyond that. There is a divergence between the Make and CMake. For some reason the build from CMake gives a black screen. I am not able to detect where the issue is. I get no warnings or errors. I noticed `g_MegaMenuStrBuffer` gets full much faster in the CMake build. It might due to a silly size of any of the atomic C types. It needs further investigation.
2024-01-11 20:13:33 +00:00
HARD_LINK
Windows build with cmake (#889) This adds cmake and a windows build to the CI. I haven't tested the result, just got it building. I had to make quite a few changes since MSVC has a number of differences compared to GCC. I added two cmake modules to find sdl2 and sdl2_image from here https://github.com/aminosbh/sdl2-cmake-modules The dirent stuff is just `#ifdef`ed out for now since I think it's unused? I'm keeping the Makefile.pc for the moment until this is more proven. I wasn't able to figure out how to add -fsanitize=address for some reason to gcc/clang builds, open to suggestions there. Otherwise I think the cmake build is more or less the same as the Makefile one.
2023-12-27 09:24:00 +00:00
DEMO_KEY_PTR=0
_internal_version_us
)
Reference in New Issue Copy Permalink