Skip to content

Commit

Permalink
Add music.tmp generation(No sound yet).
Browse files Browse the repository at this point in the history
Update CI.
  • Loading branch information
Wolf3s committed Sep 11, 2024
1 parent 86831d0 commit b53aad6
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/continuous_integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ jobs:

- name: Compile PS2
run: |
cmake -S prboom2 -B build -DBUILD_GL=OFF -DSDL2_IMAGE_FOUND=ON -DSDL2_MIXER_FOUND=ON -DZLIB_FOUND=ON -DLIBMAD_FOUND=ON -DVORBIS_FOUND=ON "-DCMAKE_TOOLCHAIN_FILE=${PS2DEV}/share/ps2dev.cmake"
cmake -S prboom2 -B build -DBUILD_GL=OFF "-DCMAKE_TOOLCHAIN_FILE=${PS2DEV}/share/ps2dev.cmake"
cmake --build build
- name: Upload release artifact ELF
Expand Down
5 changes: 5 additions & 0 deletions prboom2/src/SDL/i_sound.c
Original file line number Diff line number Diff line change
Expand Up @@ -926,7 +926,12 @@ void I_InitMusic(void)
#ifdef HAVE_MIXER
if (!music_tmp) {
#ifndef _WIN32

#ifdef __PS2__
music_tmp = strdup(PACKAGE_TARNAME"-music-XXXXXX");
#else
music_tmp = strdup("/tmp/"PACKAGE_TARNAME"-music-XXXXXX");
#endif
{
int fd = mkstemp(music_tmp);
if (fd<0) {
Expand Down
2 changes: 1 addition & 1 deletion prboom2/src/SDL/i_system.c
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@ const char* I_FindFile2(const char* wfname, const char* ext)
return (const char*) I_FindFileInternal(wfname, ext, true);
}

#elif defined(_EE)
#elif defined(__PS2__)
char* I_FindFileInternal(const char* wfname, const char* ext, dboolean isStatic)
{
(void) isStatic;
Expand Down

0 comments on commit b53aad6

Please sign in to comment.