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

More order in makefile, removed compilation of fdi2raw.c and bsdsocket-posix-new.c, upadated sysconfig.h.wii

Browse Source
This commit is contained in:
fabio.olimpieri 2014-01-20 08:19:06 +00:00
parent 459d47071f
commit a20bd73360
4 changed files with 99 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
Makefile.wii
View File

@ -24,17 +24,48 @@ SYMLINKS=src/machdep src/osdep src/gfxdep src/joydep src/guidep src/sounddep src
# Source files. # Source files.
SRCS := $(wildcard $(SRC_DIR)/*.c $(SRC_DIR)/caps/*.c $(SRC_DIR)/dms/*.c $(SRC_DIR)/keymap/*.c) \ SRCS := $(wildcard $(SRC_DIR)/*.c $(SRC_DIR)/caps/*.c $(SRC_DIR)/dms/*.c $(SRC_DIR)/keymap/*.c) \
$(SRC_DIR)/machdep/support.c $(SRC_DIR)/gfxdep/rawkeys.c $(SRC_DIR)/guidep/gui-sdl.c $(SRC_DIR)/sounddep/sound.c \ $(SRC_DIR)/gfxdep/rawkeys.c \
$(SRC_DIR)/gfxdep/sdlgfx.c $(SRC_DIR)/guidep/menu.c $(SRC_DIR)/osdep/main.c $(SRC_DIR)/threaddep/thread.c \ $(SRC_DIR)/gfxdep/sdlgfx.c \
$(SRC_DIR)/gfxdep/sdlkeys.c $(SRC_DIR)/joydep/joystick.c $(SRC_DIR)/osdep/memory.c $(SRC_DIR)/gfxdep/sdlkeys.c \
$(SRC_DIR)/guidep/gui-sdl.c \
$(SRC_DIR)/guidep/menu.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_DIR)/joydep/joystick.c \
src/cdrom.c src/blkdev-libscg.c src/blkdev.c src/blitops.c src/akiko.c src/filesys_bootrom.c \ $(SRC_DIR)/machdep/support.c \
src/genblitter.c src/gencomp.c src/gencpu.c \ $(SRC_DIR)/osdep/main.c \
src/genlinetoscr.c src/compemu.c src/compstbl.c \ $(SRC_DIR)/osdep/memory.c\
src/enforcer.c src/ar.c src/debug.c \ $(SRC_DIR)/sounddep/sound.c \
src/readdisk.c src/gengenblitter.c src/scsiemul.c src/tui.c src/linetoscr.c, $(SRCS)) $(SRC_DIR)/threaddep/thread.c
SRCS := $(filter-out \
src/akiko.c \
src/ar.c \
src/blitops.c \
src/blkdev-libscg.c \
src/blkdev.c \
src/bsdsocket-posix-new.c \
src/build68k.c \
src/catweasel.c \
src/cdrom.c \
src/compemu.c \
src/compemu_fpp.c \
src/compemu_raw_x86.c \
src/compemu_support.c \
src/compstbl.c \
src/debug.c \
src/enforcer.c \
src/fdi2raw.c \
src/filesys_bootrom.c \
src/genblitter.c \
src/gencomp.c \
src/gencpu.c \
src/gengenblitter.c \
src/genlinetoscr.c \
src/linetoscr.c \
src/readdisk.c \
src/scsiemul.c \
src/svgancui.c \
src/tui.c \
, $(SRCS))
genlinetoscr_args="-b" genlinetoscr_args="-b"
@ -134,7 +165,7 @@ uae.dol: uae.elf
@echo ---- @echo ----
# Compilation flags. # Compilation flags.
COMMON_FLAGS := -g -O3 $(MACHDEP) -Wall -Wno-unused -Wno-format COMMON_FLAGS := -g -O2 -ftree-vectorize -ffast-math -pipe -fomit-frame-pointer -fdiagnostics-show-option $(MACHDEP) -Wall -Wno-unused -Wno-format
INCLUDES := -Isrc/md-generic/ -Isrc/include -Isrc -I$(DEVKITPRO)/libogc/include -I$(DEVKITPRO)/libogc/include/SDL -I$(PORTLIBS)/include INCLUDES := -Isrc/md-generic/ -Isrc/include -Isrc -I$(DEVKITPRO)/libogc/include -I$(DEVKITPRO)/libogc/include/SDL -I$(PORTLIBS)/include
DEFINES := -DOS_WITHOUT_MEMORY_MANAGEMENT -DSAVESTATE -DUSE_SDL -DSUPPORT_THREADS -DCPUEMU_0 -DCPUEMU_5 -DCPUEMU_6 \ DEFINES := -DOS_WITHOUT_MEMORY_MANAGEMENT -DSAVESTATE -DUSE_SDL -DSUPPORT_THREADS -DCPUEMU_0 -DCPUEMU_5 -DCPUEMU_6 \
-DFPUEMU -DAGA -DAUTOCONFIG -DFILESYS \ -DFPUEMU -DAGA -DAUTOCONFIG -DFILESYS \

2
src/serial.c
View File

@ -21,7 +21,7 @@
#ifdef SERIAL_PORT #ifdef SERIAL_PORT
# ifndef WIN32 # ifndef WIN32
# include "osdep/serial.h" # include "serial.h"
# else # else
# include "od-win32/parser.h" # include "od-win32/parser.h"
# endif # endif

8
src/sysconfig.h.wii
View File

@ -149,8 +149,8 @@
/* #undef HAVE_STRICMP */ /* #undef HAVE_STRICMP */
/* Define to 1 if you have the <strings.h> header file. */ /* Define to 1 if you have the <strings.h> header file. */
/*#define HAVE_STRINGS_H 1*/ #define HAVE_STRINGS_H 1
#undef HAVE_STRINGS_H /*#undef HAVE_STRINGS_H */
/* Define to 1 if you have the <string.h> header file. */ /* Define to 1 if you have the <string.h> header file. */
@ -223,8 +223,8 @@
#undef HAVE_SYS_STATFS_H #undef HAVE_SYS_STATFS_H
/* Define to 1 if you have the <sys/statvfs.h> header file. */ /* Define to 1 if you have the <sys/statvfs.h> header file. */
/*#define HAVE_SYS_STATVFS_H 1*/ #define HAVE_SYS_STATVFS_H 1
#undef HAVE_SYS_STATVFS_H /* #undef HAVE_SYS_STATVFS_H1 */
/* Define to 1 if you have the <sys/stat.h> header file. */ /* Define to 1 if you have the <sys/stat.h> header file. */
#define HAVE_SYS_STAT_H 1 #define HAVE_SYS_STAT_H 1

102
src/tools/Makefile.wii
View File

@ -1,51 +1,51 @@
# #
# Makefile.in for UAE tools # Makefile.in for UAE tools
# #
export PATH := $(DEVKITPPC)/../MinGW/bin:$(PATH):. export PATH := $(DEVKITPRO)/MinGW/bin:$(PATH):.
CC = gcc CC = gcc
LDFLAGS = LDFLAGS =
CFLAGS = -I../include CFLAGS = -I../include
LIBRARIES = LIBRARIES =
all: gencpu.exe gencomp.exe build68k.exe genblitter.exe genlinetoscr.exe all: gencpu.exe gencomp.exe build68k.exe genblitter.exe genlinetoscr.exe
install: install:
clean: clean:
-rm -f *.o -rm -f *.o
-rm cpudefs.c -rm cpudefs.c
-rm -f gencpu.exe gencomp.exe build68k.exe genblitter.exe genlinetoscr.exe -rm -f gencpu.exe gencomp.exe build68k.exe genblitter.exe genlinetoscr.exe
distclean: clean distclean: clean
-rm -f config.cache config.log config.status -rm -f config.cache config.log config.status
-rm -f Makefile sysconfig.h -rm -f Makefile sysconfig.h
-rm -f *.c -rm -f *.c
genblitter.exe: genblitter.o blitops.o writelog.o genblitter.exe: genblitter.o blitops.o writelog.o
$(CC) $(LDFLAGS) -o genblitter.exe genblitter.o blitops.o writelog.o $(CC) $(LDFLAGS) -o genblitter.exe genblitter.o blitops.o writelog.o
build68k.exe: build68k.o writelog.o build68k.exe: build68k.o writelog.o
$(CC) $(LDFLAGS) -o build68k.exe build68k.o writelog.o $(CC) $(LDFLAGS) -o build68k.exe build68k.o writelog.o
gencpu.exe: gencpu.o readcpu.o cpudefs.o missing.o writelog.o gencpu.exe: gencpu.o readcpu.o cpudefs.o missing.o writelog.o
$(CC) $(LDFLAGS) -o gencpu.exe gencpu.o readcpu.o cpudefs.o missing.o writelog.o $(CC) $(LDFLAGS) -o gencpu.exe gencpu.o readcpu.o cpudefs.o missing.o writelog.o
gencomp.exe: gencomp.o readcpu.o cpudefs.o missing.o gencomp.exe: gencomp.o readcpu.o cpudefs.o missing.o
$(CC) $(LDFLAGS) -o gencomp.exe gencomp.o readcpu.o missing.o cpudefs.o writelog.o $(CC) $(LDFLAGS) -o gencomp.exe gencomp.o readcpu.o missing.o cpudefs.o writelog.o
genlinetoscr.exe: genlinetoscr.o genlinetoscr.exe: genlinetoscr.o
$(CC) $(LDFLAGS) -o genlinetoscr.exe genlinetoscr.o $(CC) $(LDFLAGS) -o genlinetoscr.exe genlinetoscr.o
custom.o: blit.h custom.o: blit.h
drawing.o: linetoscr.c drawing.o: linetoscr.c
cpudefs.c: build68k.exe ../table68k cpudefs.c: build68k.exe ../table68k
build68k.exe < ../table68k >cpudefs.c build68k.exe < ../table68k >cpudefs.c
.c.o: .c.o:
$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $(CFLAGS_$@) $< -o $@ $(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $(CFLAGS_$@) $< -o $@
.c.s: .c.s:
$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $< -o $@ $(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $< -o $@
.c.i: .c.i:
$(CC) $(INCLUDES) -E $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $< > $@ $(CC) $(INCLUDES) -E $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $< > $@