Skip to content

Commit 0f96db4

Browse files
authored
[CORE] Move WWAudio library files to Core (#802)
1 parent f481133 commit 0f96db4

File tree

92 files changed

+72
-14930
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+72
-14930
lines changed

Core/Libraries/Source/WWVegas/CMakeLists.txt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,36 +7,40 @@ target_compile_definitions(core_wwcommon INTERFACE
77
)
88

99
target_link_libraries(core_wwcommon INTERFACE
10-
d3d8lib
1110
core_config
1211
core_utility
12+
d3d8lib
1313
milesstub
1414
stlport
1515
)
1616

1717
target_include_directories(core_wwcommon INTERFACE
1818
.
19+
# WW3D2
20+
WWAudio
1921
WWDebug
22+
# WWDownload
2023
WWLib
2124
WWMath
2225
WWSaveLoad
2326
)
2427

25-
# add_subdirectory(WWAudio)
28+
# add_subdirectory(WW3D2)
29+
add_subdirectory(WWAudio)
2630
add_subdirectory(WWDebug)
31+
add_subdirectory(WWDownload)
2732
add_subdirectory(WWLib)
2833
add_subdirectory(WWMath)
2934
add_subdirectory(WWSaveLoad)
3035
add_subdirectory(WWStub)
31-
# add_subdirectory(WW3D2)
32-
add_subdirectory(WWDownload)
3336

3437
# Helpful interface to bundle the ww modules together.
3538
add_library(core_wwvegas INTERFACE)
3639

3740
target_include_directories(core_wwvegas INTERFACE
3841
.
3942
#WW3D2
43+
WWAudio
4044
WWDebug
4145
WWDownload
4246
WWLib
@@ -46,6 +50,7 @@ target_include_directories(core_wwvegas INTERFACE
4650

4751
target_link_libraries(core_wwvegas INTERFACE
4852
# core_ww3d2
53+
# core_wwaudio
4954
core_wwdebug
5055
# core_wwdownload
5156
core_wwlib
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
set(WWAUDIO_SRC
2+
AABTreeSoundCullClass.h
3+
AudibleSound.cpp
4+
AudibleSound.h
5+
AudioEvents.h
6+
AudioSaveLoad.cpp
7+
AudioSaveLoad.h
8+
FilteredSound.cpp
9+
FilteredSound.h
10+
Listener.cpp
11+
Listener.h
12+
listenerhandle.cpp
13+
listenerhandle.h
14+
LogicalListener.cpp
15+
LogicalListener.h
16+
LogicalSound.cpp
17+
LogicalSound.h
18+
PriorityVector.h
19+
sound2dhandle.cpp
20+
sound2dhandle.h
21+
Sound3D.cpp
22+
Sound3D.h
23+
sound3dhandle.cpp
24+
sound3dhandle.h
25+
SoundBuffer.cpp
26+
SoundBuffer.h
27+
SoundChunkIDs.h
28+
SoundCullObj.h
29+
soundhandle.cpp
30+
soundhandle.h
31+
SoundPseudo3D.cpp
32+
SoundPseudo3D.h
33+
SoundScene.cpp
34+
SoundScene.h
35+
SoundSceneObj.cpp
36+
SoundSceneObj.h
37+
soundstreamhandle.cpp
38+
soundstreamhandle.h
39+
Threads.cpp
40+
Threads.h
41+
Utils.cpp
42+
Utils.h
43+
WWAudio.cpp
44+
WWAudio.h
45+
)
46+
47+
# @todo Promote this to STATIC library when WW3D2 is a STATIC library as well
48+
49+
add_library(corei_wwaudio INTERFACE)
50+
51+
target_sources(corei_wwaudio INTERFACE ${WWAUDIO_SRC})
52+
53+
target_include_directories(corei_wwaudio INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
54+
55+
target_link_libraries(corei_wwaudio INTERFACE
56+
core_wwcommon
57+
)

0 commit comments

Comments
 (0)