forked from sasq64/chipmachine
-
Notifications
You must be signed in to change notification settings - Fork 2
Expand file tree
/
Copy pathzxtune-engine.patch
More file actions
89 lines (79 loc) · 3.68 KB
/
Copy pathzxtune-engine.patch
File metadata and controls
89 lines (79 loc) · 3.68 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
diff --git a/src/core/plugins/players/CMakeLists.txt b/src/core/plugins/players/CMakeLists.txt
index ddadfb09e..5a27b4bfe 100644
--- a/src/core/plugins/players/CMakeLists.txt
+++ b/src/core/plugins/players/CMakeLists.txt
@@ -1,6 +1,6 @@
project(libcore_plugins_players)
-file(GLOB SRCS_CXX "*.cpp" "asap/*.cpp" "ay/*.cpp" "dac/*.cpp" "gme/*.cpp" "mpt/*.cpp" "multi/*.cpp" "saa/*.cpp" "sid/*.cpp" "tfm/*.cpp" "vgm/*.cpp" "vgmstream/*.cpp" "xmp/*.cpp" "xsf/*.cpp")
+file(GLOB SRCS_CXX "*.cpp" "ay/*.cpp" "dac/*.cpp" "multi/*.cpp" "saa/*.cpp" "tfm/*.cpp")
file(GLOB SRCS_H "*.h" "asap/*.h" "ay/*.h" "dac/*.h" "gme/*.h" "mpt/*.h" "multi/*.h" "saa/*.h" "sid/*.h" "tfm/*.h" "vgm/*.h" "vgmstream/*.h" "xmp/*.h" "xsf/*.h")
add_definitions(-DBUILDING_STATIC -DHAVE_STDINT_H)
diff --git a/src/core/plugins/players/plugins_list.cpp b/src/core/plugins/players/plugins_list.cpp
index 4492567b1..bc8eb9695 100644
--- a/src/core/plugins/players/plugins_list.cpp
+++ b/src/core/plugins/players/plugins_list.cpp
@@ -97,28 +97,13 @@ namespace ZXTune
RegisterFTCSupport(players);
RegisterCOPSupport(players);
RegisterTFESupport(players);
- RegisterXMPPlugins(players);
RegisterET1Support(players);
RegisterAYCSupport(players);
- RegisterSPCSupport(players);
- RegisterMTCSupport(players);
- RegisterAHXSupport(players);
- RegisterPSFSupport(players);
- RegisterUSFSupport(players);
- RegisterGSFSupport(players);
- Register2SFSupport(players);
- RegisterNCSFSupport(players);
- RegisterSDSFSupport(players);
- RegisterMP3Plugin(players);
- RegisterOGGPlugin(players);
- RegisterFLACPlugin(players);
- RegisterVGMPlugins(players);
- RegisterMPTPlugins(players);
- RegisterSIDPlugins(players, archives);
- RegisterGMEPlugins(players, archives);
- RegisterASAPPlugins(players, archives);
- RegisterVGMStreamPlugins(players, archives);
- RegisterV2MSupport(players);
- RegisterWAVPlugin(players); // wav after VGMStream
+ // chipmachine zxtuneplugin: only self-contained Spectrum/AY-family players
+ // are registered (AY/YM/PT/ST/ASC/SQT/PSC/FTC/GTR/VTX/PSG/TXT + DAC + TFM +
+ // SAA/COP). Players backed by external 3rdparty libs (XMP/GME/ASAP/MPT/
+ // VGMStream/V2M/SID/xSF/codecs) are intentionally omitted so the plugin
+ // vendors only fmt+z80ex+lhasa+lzma. See zxtuneplugin/CMakeLists.txt.
+ (void)archives;
}
} // namespace ZXTune
diff --git a/src/formats/archived/CMakeLists.txt b/src/formats/archived/CMakeLists.txt
index 12d1e6a05..80a45a09b 100644
--- a/src/formats/archived/CMakeLists.txt
+++ b/src/formats/archived/CMakeLists.txt
@@ -1,6 +1,6 @@
project(libformats_archived)
-file(GLOB SRCS_CXX "*.cpp")
+file(GLOB SRCS_CXX "*.cpp" "multitrack/*.cpp")
file(GLOB SRCS_H "*.h")
add_library(formats_archived ${SRCS_CXX} ${SRCS_H})
diff --git a/src/module/players/CMakeLists.txt b/src/module/players/CMakeLists.txt
index 57c086e10..13f5a4f95 100644
--- a/src/module/players/CMakeLists.txt
+++ b/src/module/players/CMakeLists.txt
@@ -2,7 +2,7 @@ project(libmodule_players)
include_directories("../../../3rdparty/mgba/include")
-file(GLOB SRCS_CXX "aym/*.cpp" "dac/*.cpp" "saa/*.cpp" "tfm/*.cpp" "xsf/*.cpp" "*.cpp")
+file(GLOB SRCS_CXX "aym/*.cpp" "dac/*.cpp" "saa/*.cpp" "tfm/*.cpp" "*.cpp")
file(GLOB SRCS_H "aym/*.h" "dac/*.h" "saa/*.h" "tfm/*.h" "xsf/*.h" "*.h")
add_library(module_players ${SRCS_CXX} ${SRCS_H})
diff --git a/src/strings/format.h b/src/strings/format.h
index f14304fd6..40cf3bd3c 100644
--- a/src/strings/format.h
+++ b/src/strings/format.h
@@ -13,7 +13,7 @@
#include "string_type.h"
#include "types.h"
-#include "3rdparty/fmt/include/fmt/core.h"
+#include "3rdparty/fmt/include/fmt/format.h"
#include <utility>