summaryrefslogtreecommitdiff
path: root/psxdev
diff options
context:
space:
mode:
authorPixel <Pixel>2002-06-23 15:37:45 +0000
committerPixel <Pixel>2002-06-23 15:37:45 +0000
commitb3c377e647b5eb14c2ed0ff27db4ac14a3fd4e2d (patch)
tree7905392c81d466a6e5c0fc89ca118a044c26cb52 /psxdev
parent7514019f385767caf7e68ae281d3a4befb7b4e8f (diff)
Attribute ((packed)) fix...
Diffstat (limited to 'psxdev')
-rw-r--r--psxdev/Makefile8
-rw-r--r--psxdev/xadecode.h4
2 files changed, 8 insertions, 4 deletions
diff --git a/psxdev/Makefile b/psxdev/Makefile
index 5cc33ca..fb1cc78 100644
--- a/psxdev/Makefile
+++ b/psxdev/Makefile
@@ -1,15 +1,17 @@
+#!/usr/bin/make -f
+
TARGETS=xadecode.o bs.o idctfst.o jfdctint.o vlc.o
CC=gcc
-CPPFLAGS=-Wall -g -O3 -mcpu=i686 -pedantic
+CPPFLAGS=-Wall -g -O3 -mcpu=i686 -pedantic -I..
# -Werror
# -pedantic-errors
-all: $(TARGETS)
+all: ${TARGETS}
bstoppm: xadecode.o bs.o idctfst.o jfdtint.o vlc.o bstoppm.o
${CC} ${LDFLAGS} xadecode.o bs.o idcfst.o jfdtint.o vlc.o bstoppm.o -o bstoppm
clean:
- rm -f *.o
+ rm -f *.o ${TARGETS}
diff --git a/psxdev/xadecode.h b/psxdev/xadecode.h
index 264012c..025d36a 100644
--- a/psxdev/xadecode.h
+++ b/psxdev/xadecode.h
@@ -3,6 +3,8 @@
slightly modified by dbalster
*/
+#include "generic.h"
+
#ifndef XADECODE_H
#define XADECODE_H
@@ -50,7 +52,7 @@ typedef char SoundGroup[128];
typedef struct SoundSector {
char sectorFiller[8];
SoundGroup SoundGroups[kNumOfSGs];
-} __attribute__((packed)) SoundSector;
+} PACKED SoundSector;
typedef unsigned long DWORD;
typedef unsigned short WORD;