Almost builds now (some undefined refes still)

This commit is contained in:
simon.kagstrom 2009-05-08 20:00:12 +00:00
parent ab390dd41b
commit 6abc038d08
4 changed files with 11 additions and 8 deletions

View File

@ -26,8 +26,8 @@ SRCS := $(wildcard $(SRC_DIR)/*.c $(SRC_DIR)/gfxdep/*.c $(SRC_DIR)/joydep/*.c $(
SRCS := $(filter-out src/compemu_raw_x86.c src/compemu_fpp.c src/compemu_support.c src/svgancui.c src/build68k.c src/catweasel.c \ SRCS := $(filter-out src/compemu_raw_x86.c src/compemu_fpp.c src/compemu_support.c src/svgancui.c src/build68k.c src/catweasel.c \
src/cdrom.c src/blkdev-libscg.c src/blkdev.c src/blitops.c src/akiko.c src/filesys_bootrom.c \ src/cdrom.c src/blkdev-libscg.c src/blkdev.c src/blitops.c src/akiko.c src/filesys_bootrom.c \
src/genblitter.c src/gencomp.c src/gencpu.c src/genlinetoscr.c src/fsusage.c src/compemu.c src/compstbl.c \ src/genblitter.c src/gencomp.c src/gencpu.c src/genlinetoscr.c src/compemu.c src/compstbl.c \
src/readdisk.c src/gengenblitter.c src/tui.c src/scsiemul.c src/linetoscr.c, $(SRCS)) src/readdisk.c src/gengenblitter.c src/scsiemul.c src/tui.c src/linetoscr.c, $(SRCS))
# Library object files. # Library object files.
OBJS := $(subst $(SRC_DIR),$(OBJ_DIR),$(SRCS:.c=.o)) OBJS := $(subst $(SRC_DIR),$(OBJ_DIR),$(SRCS:.c=.o))
@ -74,7 +74,9 @@ $(BIN_DIR)/%.dol: %.elf
# Compilation flags. # Compilation flags.
COMMON_FLAGS := -g -O2 -mrvl -Wall $(MACHDEP) COMMON_FLAGS := -g -O2 -mrvl -Wall $(MACHDEP)
INCLUDES := -Isrc/md-generic/ -Isrc/include -Isrc -I$(DEVKITPRO)/libogc/include -I$(DEVKITPRO)/libogc/include/SDL INCLUDES := -Isrc/md-generic/ -Isrc/include -Isrc -I$(DEVKITPRO)/libogc/include -I$(DEVKITPRO)/libogc/include/SDL
DEFINES := -DGEKKO -DDEBUG_ERROR -DDEBUG_TIMERS -DDEBUG_THREADS -DDEBUG_BUILD -DDEBUG_CONVERT -DFPUEMU DEFINES := -DGEKKO -DFPUEMU -DCPUEMU_0 -DCPUEMU_5 -DCPUEMU_6 -DAGA \
-DAUTOCONFIG -DFILESYS -DSUPPORT_THREADS -DUSE_SDL -DFDI2RAW -DDEBUGGER -DSAVESTATE \
-DENFORCER -DACTION_REPLAY
CFLAGS := $(COMMON_FLAGS) $(INCLUDES) $(DEFINES) CFLAGS := $(COMMON_FLAGS) $(INCLUDES) $(DEFINES)
# Test link flags. # Test link flags.

View File

@ -364,7 +364,7 @@ get_fs_usage (path, disk, fsp)
#endif /* STAT_STATVFS */ #endif /* STAT_STATVFS */
#if !defined(STAT_STATFS2_FS_DATA) && !defined(STAT_READ_FILSYS) #if !defined(STAT_STATFS2_FS_DATA) && !defined(STAT_READ_FILSYS) && !defined(GEKKO)
/* !Ultrix && !SVR2 */ /* !Ultrix && !SVR2 */
fsp->fsu_blocks = CONVERT_BLOCKS (fsd.f_blocks); fsp->fsu_blocks = CONVERT_BLOCKS (fsd.f_blocks);

View File

@ -15,6 +15,7 @@
#include "sounddep/sound.h" #include "sounddep/sound.h"
#include "threaddep/thread.h" #include "threaddep/thread.h"
#include <SDL_audio.h> #include <SDL_audio.h>
#include <SDL.h>
static int have_sound = 0; static int have_sound = 0;

View File

@ -106,7 +106,7 @@
#define HAVE_READDIR_R 1 #define HAVE_READDIR_R 1
/* Define to 1 if you have the `rmdir' function. */ /* Define to 1 if you have the `rmdir' function. */
#define HAVE_RMDIR 1 #undef HAVE_RMDIR
/* Define to 1 if you have the `select' function. */ /* Define to 1 if you have the `select' function. */
#define HAVE_SELECT 1 #define HAVE_SELECT 1
@ -115,7 +115,7 @@
#define HAVE_SETITIMER 1 #define HAVE_SETITIMER 1
/* Define to 1 if you have the `sigaction' function. */ /* Define to 1 if you have the `sigaction' function. */
#define HAVE_SIGACTION 1 #undef HAVE_SIGACTION
/* Define to 1 if you have the `sleep' function. */ /* Define to 1 if you have the `sleep' function. */
#define HAVE_SLEEP 1 #define HAVE_SLEEP 1
@ -246,7 +246,7 @@
#define HAVE_TCGETATTR 1 #define HAVE_TCGETATTR 1
/* Define to 1 if you have the `timegm' function. */ /* Define to 1 if you have the `timegm' function. */
#define HAVE_TIMEGM 1 #undef HAVE_TIMEGM
/* Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>. */ /* Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>. */
#define HAVE_UINTMAX_T 1 #define HAVE_UINTMAX_T 1