mirror of
https://github.com/Oibaf66/uae-wii.git
synced 2024-11-13 06:15:14 +01:00
Define OS_WITHOUT_MEMORY_MANAGEMENT - otherwise wont build for Wii...
This commit is contained in:
parent
a46f7ca5bf
commit
9d49629bb9
@ -80,7 +80,8 @@ $(BIN_DIR)/%.dol: %.elf
|
||||
COMMON_FLAGS := -g -Wall $(MACHDEP)
|
||||
INCLUDES := -Isrc/md-generic/ -Isrc/include -Isrc -I/usr/include/SDL
|
||||
DEFINES := -DFPUEMU -DCPUEMU_0 -DCPUEMU_5 -DCPUEMU_6 -DAGA \
|
||||
-DSUPPORT_THREADS -DUSE_SDL -DFDI2RAW -DSAVESTATE
|
||||
-DSUPPORT_THREADS -DUSE_SDL -DFDI2RAW -DSAVESTATE \
|
||||
-DOS_WITHOUT_MEMORY_MANAGEMENT
|
||||
CFLAGS := $(COMMON_FLAGS) $(INCLUDES) $(DEFINES)
|
||||
|
||||
# Test link flags.
|
||||
|
@ -85,7 +85,8 @@ $(BIN_DIR)/%.dol: %.elf
|
||||
COMMON_FLAGS := -g -O2 -mrvl -Wall $(MACHDEP)
|
||||
INCLUDES := -Isrc/md-generic/ -Isrc/include -Isrc -I$(DEVKITPRO)/libogc/include -I$(DEVKITPRO)/libogc/include/SDL
|
||||
DEFINES := -DFPUEMU -DCPUEMU_0 -DCPUEMU_5 -DCPUEMU_6 -DAGA \
|
||||
-DSUPPORT_THREADS -DUSE_SDL -DFDI2RAW -DSAVESTATE
|
||||
-DSUPPORT_THREADS -DUSE_SDL -DFDI2RAW -DSAVESTATE \
|
||||
-DOS_WITHOUT_MEMORY_MANAGEMENT
|
||||
CFLAGS := $(COMMON_FLAGS) $(INCLUDES) $(DEFINES)
|
||||
|
||||
# Test link flags.
|
||||
|
@ -939,7 +939,7 @@ void real_main (int argc, char **argv)
|
||||
#ifdef USE_SDL
|
||||
int init_sdl (void)
|
||||
{
|
||||
int result = (SDL_Init (SDL_INIT_TIMER /*| SDL_INIT_AUDIO*/) == 0);
|
||||
int result = (SDL_Init (SDL_INIT_VIDEO | SDL_INIT_TIMER /*| SDL_INIT_AUDIO*/) == 0);
|
||||
if (result)
|
||||
atexit (SDL_Quit);
|
||||
|
||||
@ -952,11 +952,14 @@ int init_sdl (void)
|
||||
#ifndef NO_MAIN_IN_MAIN_C
|
||||
int main (int argc, char **argv)
|
||||
{
|
||||
fprintf(stderr, "main started\n");
|
||||
#if defined(GEKKO)
|
||||
fatInitDefault();
|
||||
#endif
|
||||
init_sdl ();
|
||||
fprintf(stderr, "sdl inited\n");
|
||||
gui_init (argc, argv);
|
||||
fprintf(stderr, "Starting real main\n");
|
||||
real_main (argc, argv);
|
||||
return 0;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user