zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-24 10:40:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

A couple of OSX fixes: one 64-bit cleanup, compilation fix on ppc (is that ever used?), nasm command line fix for x86

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@1903 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2011-06-15 10:38:12 +00:00
parent 97cab051df
commit dd355636ff
5 changed files with 13 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
polymer/eduke32/build/Makefile
View file

@ -58,6 +58,8 @@ UTILLIBS=-lpthread
ENGINEOBJS=
ifeq (0,$(NOASM))
ENGINEOBJS+= $(OBJ)/a.$o
else
ENGINEOBJS+= $(OBJ)/a-c.$o
endif
ifneq ($(PLATFORM),WINDOWS)
@ -66,7 +68,6 @@ endif
ENGINEOBJS+= \
$(OBJ)/a-c.$o \
$(OBJ)/baselayer.$o \
$(OBJ)/cache1d.$o \
$(OBJ)/compat.$o \
@ -109,8 +110,8 @@ endif
ifeq ($(PLATFORM),DARWIN)
ENGINEOBJS += $(OBJ)/StartupWinController.editor.$o \
$(OBJ)//osxbits.$o
ASFLAGS += -f Mach-O
OURCFLAGS += -fno-pic
ASFLAGS += -DUNDERSCORES -f macho
OURCFLAGS += -DUNDERSCORES -fno-pic
TARGETOPTS += -DNOASM
endif
ifeq ($(PLATFORM),BSD)

4
polymer/eduke32/build/src/build.c
View file

@ -4665,9 +4665,9 @@ end_point_dragging:
pos.z = getflorzofslope(sectorofwall(wal0-wall), pos.x, pos.y);
message("Outer wall coordinates must coincide for both components");
OSD_Printf("wal0:%d (%d,%d)--(%d,%d)\n",wal0-wall, wal0->x,wal0->y,
OSD_Printf("wal0:%d (%d,%d)--(%d,%d)\n",(int)(wal0-wall), wal0->x,wal0->y,
wall[wal0->point2].x,wall[wal0->point2].y);
OSD_Printf("wal1:%d (%d,%d)--(%d,%d)\n",wal1-wall, wal1->x,wal1->y,
OSD_Printf("wal1:%d (%d,%d)--(%d,%d)\n",(int)(wal1-wall), wal1->x,wal1->y,
wall[wal1->point2].x,wall[wal1->point2].y);
goto end_join_sectors;

6
polymer/eduke32/build/src/mdsprite.c
View file

@ -1381,7 +1381,7 @@ static md3model_t *md3load(int32_t fil)
#if B_BIG_ENDIAN != 0
{
int32_t *l;
int32_t j, *l;
for (i = m->head.numframes-1; i>=0; i--)
{
@ -1406,7 +1406,7 @@ static md3model_t *md3load(int32_t fil)
#if B_BIG_ENDIAN != 0
{
int32_t *l;
int32_t j, *l;
s->id = B_LITTLE32(s->id);
l = (int32_t *)&s->flags;
for (j=1+1+1+1+1+1+1+1+1+1-1; j>=0; j--) l[j] = B_LITTLE32(l[j]);
@ -1438,7 +1438,7 @@ static md3model_t *md3load(int32_t fil)
#if B_BIG_ENDIAN != 0
{
int32_t *l;
int32_t j, *l;
for (i=s->numtris-1; i>=0; i--)
{

15
polymer/eduke32/source/jaudiolib/src/fx_man.c
View file

@ -37,18 +37,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "fx_man.h"
#ifdef __POWERPC__
static inline uint16_t SWAP16(uint16_t s)
{
return (s >> 8) | (s << 8);
}
static inline uint32_t SWAP32(uint32_t s)
{
return (s >> 24) | (s << 24) | ((s&0xff00) << 8) | ((s & 0xff0000) >> 8);
}
#define LITTLE16 SWAP16
#define LITTLE32 SWAP32
#define LITTLE16(s) (((uint16_t)(s) >> 8) | ((uint16_t)(s) << 8))
#define LITTLE32(s) ((uint32_t)(s) >> 24) | ((uint32_t)(s) << 24) | (((uint32_t)(s)&0xff00) << 8) | (((uint32_t)(s) & 0xff0000) >> 8)
#else
#define LITTLE16
#define LITTLE32
@ -977,7 +967,6 @@ int32_t FX_SetPrintf(void (*function)(const char *, ...))
return FX_Ok;
}
/*---------------------------------------------------------------------
Function: FX_PlayLoopedAuto

3
polymer/eduke32/source/jmact/animlib.c
View file

@ -169,7 +169,8 @@ static void decodeframe(uint8_t * srcP, uint8_t * dstP)
}
/* long op */
count = B_LITTLE16(*((uint16_t *)((srcP += sizeof(int16_t)) - sizeof(int16_t))));
count = B_LITTLE16(*(uint16_t *)srcP);
srcP += sizeof(int16_t);
if (!count) /* stop sign */
return;