PonyMirrors/libsuperderpy
1
0
Fork 0
mirror of https://gitlab.com/dosowisko.net/libsuperderpy.git synced 2025-02-12 16:14:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

FlacToOgg: fix and make more robust

Browse source
This commit is contained in:
Sebastian Krzyszkowiak 2019-01-11 13:09:55 +01:00
parent 3da81d4388
commit 996c7e4d8e
No known key found for this signature in database
GPG key ID: E8F235CF3BDBC3FF
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
cmake/FlacToOgg.cmake
View file

@ -1,6 +1,16 @@
file(GLOB_RECURSE FLAC_FILES RELATIVE ${DATADIR} ${DATADIR}/*.flac) find_program(OGGENC NAMES oggenc NO_CMAKE_FIND_ROOT_PATH)
if(OGGENC)
foreach(file IN LISTS FLAC_FILES) file(GLOB_RECURSE FLAC_FILES RELATIVE ${DATADIR} ${DATADIR}/*.flac)
execute_process(COMMAND oggenc -Q -b 192 --resample 44100 ${file} WORKING_DIRECTORY ${DATADIR}) message(STATUS "FlacToOgg engaging... (using ${OGGENC})")
file(REMOVE ${DATADIR}/${file}) foreach(file IN LISTS FLAC_FILES)
endforeach(file) message(STATUS ${file})
execute_process(COMMAND ${OGGENC} -Q -b 192 --resample 44100 ${file} WORKING_DIRECTORY ${DATADIR} RESULT_VARIABLE OGGENC_RESULT)
if(OGGENC_RESULT)
message(WARNING "ERROR: ${OGGENC_RESULT}")
else()
file(REMOVE ${DATADIR}/${file})
endif()
endforeach(file)
else(OGGENC)
message(WARNING "FlacToOgg: can't find oggenc!")
endif(OGGENC)

2
cmake/libsuperderpy.cmake
View file

@ -316,7 +316,7 @@ if (NOT LIBSUPERDERPY_CONFIG_INCLUDED)
set(FLACTOOGG_DATADIR "${CMAKE_BINARY_DIR}/android/assets/data") set(FLACTOOGG_DATADIR "${CMAKE_BINARY_DIR}/android/assets/data")
set(FLACTOOGG_DEPEND "") set(FLACTOOGG_DEPEND "")
else (EMSCRIPTEN) else (EMSCRIPTEN)
set(FLACTOOGG_DATADIR "${CMAKE_INSTALL_PREFIX}/${LIBSUPERDERPY_GAMENAME}/data") set(FLACTOOGG_DATADIR "${CMAKE_INSTALL_PREFIX}/share/${LIBSUPERDERPY_GAMENAME}/data")
set(FLACTOOGG_DEPEND ${LIBSUPERDERPY_GAMENAME}_install) set(FLACTOOGG_DEPEND ${LIBSUPERDERPY_GAMENAME}_install)
endif() endif()