Skip to content

Commit f5f2321

Browse files
committed
CMake: Append XTConvert to Windows deployment
1 parent ade61e1 commit f5f2321

File tree

1 file changed

+34
-0
lines changed

1 file changed

+34
-0
lines changed

_common/deployment_windows.cmake

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,11 @@ if(SevenZipProgram)
7373
list(APPEND MinGW_BuiltDlls "pthreadGC-3.dll")
7474
endif()
7575

76+
if(PGE_BUILD_XTCONVERT)
77+
# XTConvert needs to supply the liblzma-5.dll
78+
list(APPEND MinGW_BuiltDlls "liblzma-5.dll")
79+
endif()
80+
7681
set(PGE_CommonQtFiles)
7782
if(NOT PGE_ENABLE_STATIC_QT)
7883
set(PGE_CommonQtFiles
@@ -138,6 +143,17 @@ if(SevenZipProgram)
138143
"LazyFixTool.readme.txt"
139144
)
140145

146+
if(PGE_BUILD_XTCONVERT)
147+
set(PGE_XTConvertFiles
148+
${MinGW_BuiltDlls}
149+
# FIXME: Get rid of MixerX support and replace with the separated hand-made audio processing library
150+
# which is way more accurate and stable solution of audio decoding and encoding.
151+
"SDL2${PGE_DLL_SUFFIX}.dll"
152+
"SDL2_mixer_ext${PGE_DLL_SUFFIX}.dll"
153+
"xtconvert.exe"
154+
)
155+
endif()
156+
141157
set(PGE_MaintainerFiles
142158
${PGE_CommonQtFiles}
143159
"tools"
@@ -149,6 +165,10 @@ if(SevenZipProgram)
149165
"languages/*.png"
150166
)
151167

168+
if(PGE_BUILD_XTCONVERT)
169+
list(APPEND PGE_MaintainerFiles ${PGE_XTConvertFiles})
170+
endif()
171+
152172
set(PGE_InstallCommonFiles
153173
${PGE_CommonFiles}
154174
"tools"
@@ -187,6 +207,10 @@ if(SevenZipProgram)
187207
"languages/*.png"
188208
)
189209

210+
if(PGE_BUILD_XTCONVERT)
211+
list(APPEND PGE_InstallToolsFiles ${PGE_XTConvertFiles})
212+
endif()
213+
190214
add_custom_target(create_zip_install
191215
WORKING_DIRECTORY "${ZIP_SRC_DIR}"
192216
COMMAND ${SevenZipProgram} a -tzip -mx9
@@ -232,6 +256,16 @@ if(SevenZipProgram)
232256
COMMENT "Packing tools into ZIP archive..."
233257
)
234258

259+
if(PGE_BUILD_XTCONVERT)
260+
add_custom_command(TARGET create_zip_tools
261+
WORKING_DIRECTORY "${ZIP_SRC_DIR}"
262+
COMMAND ${SevenZipProgram} a -tzip -mx9
263+
"${ZIP_PACK_DIR}/XTConvert-${PACKAGE_SUFFIX}-win${PGE_ARCHITECTURE_BITS}.zip"
264+
${PGE_XTConvertFiles}
265+
DEPENDS mkdir_packed_create_zip
266+
)
267+
endif()
268+
235269
add_custom_target(create_zip
236270
WORKING_DIRECTORY "${ZIP_SRC_DIR}"
237271
# Clean-up blank translations

0 commit comments

Comments
 (0)