github/amigaos-cross-toolchain6
2
0
Fork 0
mirror of https://frontier.innolan.net/github/amigaos-cross-toolchain6.git synced 2024-10-19 10:29:55 +00:00
Code Releases Activity

Fix #35, really ;-)

Browse Source
This commit is contained in:
Krystian Bacławski
2016-04-16 09:22:28 +02:00
parent 3aeb71b204
commit fc3c2d2742
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdk/warp3d.sdk
+2 -2
View File
@@ -9,5 +9,5 @@ Warp3D_Devel/Include/clib/Warp3D_protos.h
Warp3D_Devel/Include/fd/Warp3D.fd = Warp3D_lib.fd Warp3D_Devel/Include/fd/Warp3D.fd = Warp3D_lib.fd
Warp3D_Devel/Include/Warp3D/Warp3D.h Warp3D_Devel/Include/Warp3D/Warp3D.h
fd2sfd : Warp3D_Devel/Include/fd/Warp3D.fd Warp3D_Devel/Include/clib/Warp3D_protos.h fd2sfd : Warp3D_Devel/Include/fd/Warp3D.fd Warp3D_Devel/Include/clib/Warp3D_protos.h
sfdc : Warp3D.sfd sfdc : Warp3D_lib.sfd
stubs : Warp3D.sfd stubs : Warp3D_lib.sfd
toolchain-m68k
+7 -3
View File
@@ -471,13 +471,17 @@ def process_sdk(sdk, dirname, files):
if kind == 'fd2sfd': if kind == 'fd2sfd':
fd, protos = f[1:] fd, protos = f[1:]
sfd = path.splitext(path.basename(fd))[0] + '.sfd' sfd = path.splitext(path.basename(fd))[0]
if not fd.endswith('_lib'):
sfd = sfd + '_lib.sfd'
else:
sfd = sfd + '.sfd'
info('fd2sfd: "%s" "%s" -> "%s"', fd, protos, sfd) info('fd2sfd: "%s" "%s" -> "%s"', fd, protos, sfd)
execute('fd2sfd', '-o', sfd, fd, protos) execute('fd2sfd', '-o', sfd, fd, protos)
copy(sfd, path.join('{target}/os-lib/sfd', sfd)) copy(sfd, path.join('{target}/os-lib/sfd', sfd))
elif kind == 'sfdc': elif kind == 'sfdc':
source = f[1] source = f[1]
basename = re.sub(r'(_lib)?.sfd$', r'', path.basename(source)) basename = re.sub(r'_lib.sfd$', r'', path.basename(source))
proto = path.join('{target}/os-include/proto', basename + '.h') proto = path.join('{target}/os-include/proto', basename + '.h')
inline = path.join('{target}/os-include/inline', basename + '.h') inline = path.join('{target}/os-include/inline', basename + '.h')
@@ -494,7 +498,7 @@ def process_sdk(sdk, dirname, files):
'--output=' + lvo, source) '--output=' + lvo, source)
elif kind == 'stubs': elif kind == 'stubs':
filename = f[1] filename = f[1]
c_file = re.sub(r'(_lib)?\.sfd$', r'.c', path.basename(filename)) c_file = re.sub(r'_lib\.sfd$', r'.c', path.basename(filename))
info('stubs: "%s" -> "%s"', filename, c_file) info('stubs: "%s" -> "%s"', filename, c_file)
execute('sfdc', '--quiet', '--target=m68k-amigaos', '--mode=autoopen', execute('sfdc', '--quiet', '--target=m68k-amigaos', '--mode=autoopen',