github
/
amigaos-cross-toolchain
mirror of https://github.com/cahirwpz/amigaos-cross-toolchain
1
0
Fork 0
Code Releases Wiki Activity

Fix #61 

* Add WritePixelArrayAlpha to CyberGraphX 4.2 header files
* Use basic sdk name for static libraries
This commit is contained in:
Krystian Bacławski 2017-01-11 22:34:35 +01:00
parent 55f79deef2
commit 8045a343aa
2 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
patches/cgx-4.2/WritePixelArrayAlpha.diff Normal file
View File

@ -0,0 +1,25 @@
--- CGraphX/C/Include/clib/cybergraphics_protos.h.orig 2017-01-11 00:55:08.000000000 +0100
+++ CGraphX/C/Include/clib/cybergraphics_protos.h 2017-01-11 00:54:31.000000000 +0100
@@ -44,6 +44,8 @@
void UnLockBitMap(APTR);
ULONG WritePixelArray(APTR, UWORD, UWORD, UWORD, struct RastPort *, UWORD,
UWORD, UWORD, UWORD, UBYTE);
+ULONG WritePixelArrayAlpha(APTR, UWORD, UWORD, UWORD, struct RastPort *,
+ UWORD, UWORD, UWORD, UWORD, ULONG);
ULONG WriteLUTPixelArray(APTR, UWORD, UWORD, UWORD, struct RastPort *, APTR,
UWORD, UWORD, UWORD, UWORD, UBYTE);
LONG WriteRGBPixel(struct RastPort *, UWORD, UWORD, ULONG);
--- CGraphX/FD/cybergraphics_lib.fd.orig 2017-01-11 00:50:21.000000000 +0100
+++ CGraphX/FD/cybergraphics_lib.fd 2017-01-11 00:52:18.000000000 +0100
@@ -67,4 +67,11 @@
##public
*
WriteLUTPixelArray(srcRect,SrcX,SrcY,SrcMod,RastPort,ColorTab,DestX,DestY,SizeX,SizeY,CTFormat)(a0,d0,d1,d2,a1,a2,d3,d4,d5,d6,d7)
+*
+##private
+cgfxPrivate8()()
+cgfxPrivate9()()
+##public
+*
+WritePixelArrayAlpha(Src,SrcX,SrcY,SrcMod,RastPort,DestX,DestY,Width,Height,GlobalAlpha)(a0,d0,d1,d2,a1,d3,d4,d5,d6,d7)
##end

18
toolchain-m68k
View File

@ -578,8 +578,8 @@ def add_lib(src, libname):
@recipe('install-sdk', 1)
def process_sdk(sdk, dirname, files):
with cwd(path.join('{sources}', dirname)):
def process_sdk(sdk, lib_name, files):
with cwd(path.join('{sources}', sdk)):
for f in files:
kind = f[0]
@ -621,7 +621,7 @@ def process_sdk(sdk, dirname, files):
elif kind == 'lib':
filename = f[1]
c_file = re.sub(r'_lib.sfd$', r'.c', path.basename(filename))
lib_file = 'lib' + sdk + '.a'
lib_file = 'lib' + lib_name + '.a'
info('lib: %s -> %s', filename, c_file)
execute('sfdc', '--quiet', '--target=m68k-amigaos', '--mode=stubs',
@ -667,14 +667,18 @@ def install_sdk(*names):
desc, files = read_sdk(filename)
pkg = name + '-' + desc['version']
_, ext = path.splitext(path.basename(desc['url']))
with cwd('{archives}'):
fetch(path.basename(desc['url']), desc['url'])
fetch(pkg + ext, desc['url'])
basename = path.splitext(path.basename(desc['url']))[0]
unpack(pkg, top_dir='.')
unpack(basename, top_dir='.')
if path.isdir(path.join('{patches}', pkg)):
patch(pkg, work_dir=path.join('{sources}', pkg))
process_sdk(name, basename, files)
process_sdk(pkg, name, files)
def test():