zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-28 12:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

- moved music code to "common"

Browse source
This commit is contained in:
Christoph Oelckers 2020-04-12 08:08:31 +02:00
parent 6a8efb7520
commit cfe02cebf1
11 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
source/CMakeLists.txt
View file

@ -602,6 +602,8 @@ file( GLOB HEADER_FILES
core/rendering/hwrenderer/postprocessing/*.h core/rendering/hwrenderer/postprocessing/*.h
core/rendering/hwrenderer/utility/*.h core/rendering/hwrenderer/utility/*.h
common/audio/music/*.h*
common/console/*.h
common/utility/*.h common/utility/*.h
common/engine/*.h common/engine/*.h
common/filesystem/*.h common/filesystem/*.h
@ -716,6 +718,11 @@ set (PCH_SOURCES
core/console/c_console.cpp core/console/c_console.cpp
core/console/d_event.cpp core/console/d_event.cpp
common/audio/music/music_midi_base.cpp
common/audio/music/music.cpp
common/audio/music/i_music.cpp
common/audio/music/i_soundfont.cpp
common/audio/music/music_config.cpp
common/thirdparty/sfmt/SFMT.cpp common/thirdparty/sfmt/SFMT.cpp
common/textures/animtexture.cpp common/textures/animtexture.cpp
common/textures/bitmap.cpp common/textures/bitmap.cpp
@ -776,11 +783,6 @@ set (PCH_SOURCES
core/textures/formats/stbtexture.cpp core/textures/formats/stbtexture.cpp
core/textures/formats/arttexture.cpp core/textures/formats/arttexture.cpp
core/music/music.cpp
core/music/i_music.cpp
core/music/i_soundfont.cpp
core/music/music_config.cpp
core/music/music_midi_base.cpp
core/music/s_advsound.cpp core/music/s_advsound.cpp
core/sound/backend/oalsound.cpp core/sound/backend/oalsound.cpp
@ -915,6 +917,7 @@ include_directories(
core/rendering/hwrenderer/utility core/rendering/hwrenderer/utility
core/rendering core/rendering
platform platform
common/audio/music
common/thirdparty common/thirdparty
common/textures common/textures
common/filesystem common/filesystem
@ -1017,7 +1020,6 @@ source_group("Core\\Utility" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/co
source_group("Core\\2D" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/2d/.+") source_group("Core\\2D" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/2d/.+")
source_group("Core\\Console" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/console/.+") source_group("Core\\Console" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/console/.+")
source_group("Core\\Fonts" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/fonts/.+") source_group("Core\\Fonts" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/fonts/.+")
source_group("Core\\Music" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/music/.+")
source_group("Core\\Sound" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/sound/.+") source_group("Core\\Sound" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/sound/.+")
source_group("Core\\Sound\\Backend" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/sound/backend/.+") source_group("Core\\Sound\\Backend" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/sound/backend/.+")
source_group("Core\\DObject" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/dobject/.+") source_group("Core\\DObject" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/dobject/.+")
@ -1029,6 +1031,8 @@ source_group("Platform" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/platfor
source_group("Platform\\Win32" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/platform/win32/.+") source_group("Platform\\Win32" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/platform/win32/.+")
source_group("Platform\\POSIX" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/platform/posix/.+") source_group("Platform\\POSIX" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/platform/posix/.+")
source_group("Common" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/.+") source_group("Common" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/.+")
source_group("Common\\Audio" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/audio/.+")
source_group("Common\\Audio\\Music" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/audio/music.+")
source_group("Common\\Console" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/console/.+") source_group("Common\\Console" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/console/.+")
source_group("Common\\Utility" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/utility/.+") source_group("Common\\Utility" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/utility/.+")
source_group("Common\\Engine" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/engine/.+") source_group("Common\\Engine" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/engine/.+")

0
source/core/music/i_music.cpp → source/common/audio/music/i_music.cpp
View file

0
source/core/music/i_music.h → source/common/audio/music/i_music.h
View file

0
source/core/music/i_soundfont.cpp → source/common/audio/music/i_soundfont.cpp
View file

0
source/core/music/i_soundfont.h → source/common/audio/music/i_soundfont.h
View file

0
source/core/music/music.cpp → source/common/audio/music/music.cpp
View file

0
source/core/music/music_config.cpp → source/common/audio/music/music_config.cpp
View file

0
source/core/music/music_midi_base.cpp → source/common/audio/music/music_midi_base.cpp
View file

0
source/core/music/s_music.h → source/common/audio/music/s_music.h
View file

1
source/core/sound/s_sound.h Normal file
View file

@ -0,0 +1 @@
#include "s_soundinternal.h"

2
source/exhumed/src/save.cpp
View file

@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <stdio.h> #include <stdio.h>
#include <stdarg.h> #include <stdarg.h>
#include "init.h" #include "init.h"
#include "music/z_music.h" #include "raze_music.h"
//#include <fcntl.h> //#include <fcntl.h>
//#include <sys/stat.h> //#include <sys/stat.h>
//#include <io.h> //#include <io.h>