mirror of
https://github.com/coop-deluxe/sm64coopdx.git
synced 2024-11-25 13:35:12 +00:00
Fix Luigi sounds compilation issues (you must run make clean in the tools folder before you see the changes)
This commit is contained in:
parent
4687be174c
commit
972687de72
2 changed files with 23 additions and 6 deletions
|
@ -1,10 +1,12 @@
|
||||||
#!/usr/bin/env python3
|
#!/usr/bin/env python3
|
||||||
import sys
|
import sys
|
||||||
import os
|
import os
|
||||||
|
import time
|
||||||
import subprocess
|
import subprocess
|
||||||
|
|
||||||
# example before: tools/aiff_extract_codebook sound/samples/sfx_custom_luigi/00.aiff >build/us_pc/sound/samples/sfx_custom_luigi/00.table
|
# example before: tools/aiff_extract_codebook sound/samples/sfx_custom_luigi/00.aiff >build/us_pc/sound/samples/sfx_custom_luigi/00.table
|
||||||
|
|
||||||
|
|
||||||
s_size = 0
|
s_size = 0
|
||||||
|
|
||||||
# check arguments
|
# check arguments
|
||||||
|
@ -25,14 +27,29 @@ else:
|
||||||
s_cmd = [ a_cmd, a_input ]
|
s_cmd = [ a_cmd, a_input ]
|
||||||
with open(a_output, 'w') as outfile:
|
with open(a_output, 'w') as outfile:
|
||||||
subprocess.call(s_cmd, stdout=outfile, shell=False)
|
subprocess.call(s_cmd, stdout=outfile, shell=False)
|
||||||
|
outfile.flush()
|
||||||
|
os.fsync(outfile.fileno())
|
||||||
|
|
||||||
# get size
|
# try to read the file length repeatedly
|
||||||
|
s_itr = 0
|
||||||
|
while s_size <= 0 and s_itr < 8:
|
||||||
|
# sleep between iterations
|
||||||
|
if s_itr > 0:
|
||||||
|
time.sleep(0.1 + 0.05 * s_itr)
|
||||||
|
s_itr += 1
|
||||||
|
|
||||||
|
# check for existence
|
||||||
|
if not os.path.isfile(a_output):
|
||||||
|
continue
|
||||||
|
|
||||||
|
# read file size
|
||||||
|
with open(a_output, 'r') as outfile:
|
||||||
|
s_text = outfile.read()
|
||||||
|
s_size = len(s_text)
|
||||||
|
|
||||||
|
# check final existence
|
||||||
if not os.path.isfile(a_output):
|
if not os.path.isfile(a_output):
|
||||||
print(sys.argv[0] + ': original output file does not exist "' + a_output + '"', file=sys.stderr)
|
print(sys.argv[0] + ': original output file does not exist "' + a_output + '"', file=sys.stderr)
|
||||||
else:
|
|
||||||
with open(a_output, 'r') as outfile:
|
|
||||||
s_text = outfile.read().strip()
|
|
||||||
s_size = len(s_text)
|
|
||||||
|
|
||||||
# check size
|
# check size
|
||||||
if s_size > 6:
|
if s_size > 6:
|
||||||
|
|
|
@ -8243,7 +8243,7 @@ File *File::open(const char *path, File::AccessMode mode)
|
||||||
flags = O_RDONLY;
|
flags = O_RDONLY;
|
||||||
else if (mode == WriteAccess)
|
else if (mode == WriteAccess)
|
||||||
flags = O_CREAT | O_WRONLY | O_TRUNC;
|
flags = O_CREAT | O_WRONLY | O_TRUNC;
|
||||||
#if defined(WIN32) || defined(__CYGWIN__)
|
#if defined(WIN32) || defined(__CYGWIN__) || defined(_WIN32)
|
||||||
flags |= O_BINARY;
|
flags |= O_BINARY;
|
||||||
#endif
|
#endif
|
||||||
int fd = ::open(path, flags, 0666);
|
int fd = ::open(path, flags, 0666);
|
||||||
|
|
Loading…
Reference in a new issue