tech
/
engine
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Some compile fixes. 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5687 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2020-04-29 15:07:25 +00:00
parent 4b8f303ca9
commit 813c8c54ff
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build_wip.sh
View File

@ -324,7 +324,7 @@ if [ "$BUILD_LINUXx86" != "n" ]; then
cd $SVNROOT/quakec cd $SVNROOT/quakec
cd csaddon/src cd csaddon/src
$BUILDFOLDER/linux_x86/fteqcc32 -srcfile csaddon.src > $BUILDLOGFOLDER/csaddon.txt $BUILDFOLDER/linux_x86/fteqcc32 -srcfile csaddon.src > $BUILDLOGFOLDER/csaddon.txt
mv ../csaddon.dat $BUILDFOLDER/csaddon/ cp ../csaddon.dat $BUILDFOLDER/csaddon/
cd .. cd ..
zip -9 $BUILDFOLDER/csaddon/csaddon.pk3 csaddon.dat zip -9 $BUILDFOLDER/csaddon/csaddon.pk3 csaddon.dat
@ -333,7 +333,7 @@ if [ "$BUILD_LINUXx86" != "n" ]; then
$BUILDFOLDER/linux_x86/fteqcc32 -srcfile menu.src > $BUILDLOGFOLDER/menu.txt $BUILDFOLDER/linux_x86/fteqcc32 -srcfile menu.src > $BUILDLOGFOLDER/menu.txt
rm -f fteqcc.log rm -f fteqcc.log
zip -q -9 -o -r $BUILDFOLDER/csaddon/menusys_src.zip . zip -q -9 -o -r $BUILDFOLDER/csaddon/menusys_src.zip .
mv ../menu.dat $BUILDFOLDER/csaddon/ cp ../menu.dat $BUILDFOLDER/csaddon/
cd .. cd ..
zip -9 $BUILDFOLDER/csaddon/menusys.pk3 menu.dat zip -9 $BUILDFOLDER/csaddon/menusys.pk3 menu.dat
else else

8
engine/client/image_astc.h
View File

@ -1501,6 +1501,8 @@ ASTC_PUBLIC void ASTC_Decode_LDR8(unsigned char *in, unsigned char *out, int pix
} }
} }
} }
#undef N
#undef M
} }
else else
{ //error colour == magenta { //error colour == magenta
@ -1647,12 +1649,12 @@ ASTC_PUBLIC void ASTC_Decode_HDR(unsigned char *in, unsigned short *out, int pix
{ {
#ifdef ASTC_WITH_3D #ifdef ASTC_WITH_3D
r = ((dr*z)*(b.wcount[2]-1)+32)>>6; r = ((dr*z)*(b.wcount[2]-1)+32)>>6;
fr=s&0xf; fr=r&0xf;
#endif #endif
for (y = 0; y < bh; y++, out += stride) for (y = 0; y < bh; y++, out += stride)
{ {
t = ((dt*y)*(b.wcount[1]-1)+32)>>6; t = ((dt*y)*(b.wcount[1]-1)+32)>>6;
ft=s&0xf; ft=t&0xf;
for (x = 0; x < bw; x++) for (x = 0; x < bw; x++)
{ {
p = &b.part[ASTC_ChoosePartition(b.partindex, x,y,0, b.partitions, smallblock)]; p = &b.part[ASTC_ChoosePartition(b.partindex, x,y,0, b.partitions, smallblock)];
@ -1726,6 +1728,8 @@ ASTC_PUBLIC void ASTC_Decode_HDR(unsigned char *in, unsigned short *out, int pix
} }
} }
} }
#undef N
#undef M
} }
else else
{ //error colour == magenta { //error colour == magenta