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;