Mercurial > hg > Members > kono > tree_dandy2
changeset 26:6a8cb917e0ad
merge
| author | Shinji KONO <kono@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Tue, 14 Dec 2010 10:48:26 +0900 |
| parents | 6754fbb63ac7 (current diff) dc3b1d4fe835 (diff) |
| children | 8b80f670cf1c |
| files | Makefile Makefile.fifo64 sgoex.c sound.c |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Tue Dec 14 10:45:02 2010 +0900 +++ b/Makefile Tue Dec 14 10:48:26 2010 +0900 @@ -4,7 +4,7 @@ srcdir = . ABI = -m$(ABIBIT) -CFLAGS += -g $(ABI) -O2 -Wall `sdl-config --cflags` `xml2-config --cflags` $(INCLUDE) +CFLAGS += -g $(ABI) -Wall `sdl-config --cflags` `xml2-config --cflags` $(INCLUDE) LIBS += `sdl-config --libs`,-framework,OpenGL -lSDL_mixer -lSDL_image `xml2-config --libs` LIBS += -lCerium -lFifoManager @@ -23,7 +23,7 @@ $(CC) $(ABI) -o $@ $(OBJS) Dandy.o $(LIBS) clean: - rm -f $(TARGET) $(OBJS) + rm -f $(TARGET) $(OBJS) main.o sgoex.o .c.o: $(CC) $(CFLAGS) $(INCLUDES) -c $<
--- a/sound.c Tue Dec 14 10:45:02 2010 +0900 +++ b/sound.c Tue Dec 14 10:48:26 2010 +0900 @@ -18,9 +18,9 @@ #if 0 static char buf0[] = "pBAV"; -int vh_addr[10] = -{ (int) buf0, (int) buf0, (int) buf0, (int) buf0, (int) buf0, - (int) buf0 }; +long vh_addr[10] = +{ (long) buf0, (long) buf0, (long) buf0, (long) buf0, (long) buf0, + (long) buf0 }; #endif int vb_addr[10] =