The-Homebrew-Cloud/uae-wii
2
0
Fork 0
mirror of https://github.com/Oibaf66/uae-wii.git synced 2024-11-29 05:54:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Define OS_WITHOUT_MEMORY_MANAGEMENT - otherwise wont build for Wii...

Browse Source
This commit is contained in:
simon.kagstrom 2009-05-10 13:56:37 +00:00
parent a46f7ca5bf
commit 9d49629bb9
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.host
View File

@ -80,7 +80,8 @@ $(BIN_DIR)/%.dol: %.elf
COMMON_FLAGS := -g -Wall $(MACHDEP) COMMON_FLAGS := -g -Wall $(MACHDEP)
INCLUDES := -Isrc/md-generic/ -Isrc/include -Isrc -I/usr/include/SDL INCLUDES := -Isrc/md-generic/ -Isrc/include -Isrc -I/usr/include/SDL
DEFINES := -DFPUEMU -DCPUEMU_0 -DCPUEMU_5 -DCPUEMU_6 -DAGA \ 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) CFLAGS := $(COMMON_FLAGS) $(INCLUDES) $(DEFINES)
# Test link flags. # Test link flags.

3
Makefile.wii
View File

@ -85,7 +85,8 @@ $(BIN_DIR)/%.dol: %.elf
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 := -DFPUEMU -DCPUEMU_0 -DCPUEMU_5 -DCPUEMU_6 -DAGA \ 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) CFLAGS := $(COMMON_FLAGS) $(INCLUDES) $(DEFINES)
# Test link flags. # Test link flags.

5
src/main.c
View File

@ -939,7 +939,7 @@ void real_main (int argc, char **argv)
#ifdef USE_SDL #ifdef USE_SDL
int init_sdl (void) 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) if (result)
atexit (SDL_Quit); atexit (SDL_Quit);
@ -952,11 +952,14 @@ int init_sdl (void)
#ifndef NO_MAIN_IN_MAIN_C #ifndef NO_MAIN_IN_MAIN_C
int main (int argc, char **argv) int main (int argc, char **argv)
{ {
fprintf(stderr, "main started\n");
#if defined(GEKKO) #if defined(GEKKO)
fatInitDefault(); fatInitDefault();
#endif #endif
init_sdl (); init_sdl ();
fprintf(stderr, "sdl inited\n");
gui_init (argc, argv); gui_init (argc, argv);
fprintf(stderr, "Starting real main\n");
real_main (argc, argv); real_main (argc, argv);
return 0; return 0;
} }