Emulation/not64
1
0
Fork 0
mirror of https://github.com/extremscorner/not64.git synced 2024-06-11 00:27:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Updated Makefiles so that we no longer need to swap cube/wii libs!

Browse source 
Remove your old libogc files from:
$(DEVKITPPC)/powerpc-gekko/...
And install libogc files to:
$(DEVKITPRO)/libogc/include/
$(DEVKITPRO)/libogc/lib/cube/
$(DEVKITPRO)/libogc/lib/wii/
 - note: untested for wii build, but it should be fine.
This commit is contained in:
sepp256 2008-04-23 16:50:27 +00:00
parent d45992393d
commit ff478883b2
7 changed files with 27 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Makefile.GLN64_dev
View file

@ -11,10 +11,9 @@ AS =powerpc-gekko-as
#CFLAGS =-DX86 -Wall -pipe -g -DEMU64_DEBUG -DCOMPARE_CORE
#CFLAGS =-DX86 -Wall -pipe -g
#CFLAGS = -g -O2 -Wall $(MACHDEP) $(INCLUDE) -fomit-frame-pointer
CFLAGS = -g -O2 -Wall $(MACHDEP) \
CFLAGS = -g -O2 -Wall $(MACHDEP) $(INCLUDE) \
-DCPU_SHUTDOWN -DSPC700_SHUTDOWN -DVAR_CYCLES -DSOUND \
-DNOASM -DNGC -DNOASM -DPIXEL_FORMAT=RGB565 \
-DM_PI=3.14159265359 \
-fno-exceptions -Wno-unused-parameter -pipe \
-DUSE_GUI -DSHOW_DEBUG -DTHREADED_AUDIO
# -DDEBUGON -DGLN64_SDLOG -DUSE_EXPANSION
@ -22,6 +21,8 @@ CFLAGS = -g -O2 -Wall $(MACHDEP) \
MACHDEP = -DGEKKO -mcpu=750 -meabi -mhard-float
LDFLAGS = $(MACHDEP) -mogc -Wl,-Map,$(notdir $@).map -Wl,--cref
INCLUDE = -I$(DEVKITPRO)/libogc/include
LIBPATHS = -L$(DEVKITPRO)/libogc/lib/cube
CXXFLAGS =$(CFLAGS)
@ -367,7 +368,7 @@ r4300/ppc/Wrappers.o: r4300/ppc/Wrappers.s
mupen64_gc.elf: $(OBJ) $(OBJ_PPC) $(OBJ_INPUT) $(OBJ_GLN64_GX) $(OBJ_AUDIO) $(OBJ_RSPHLE) main/main_gc-menu.o
$(LD) $^ $(LDFLAGS) $(LDFLAGS) $(LIB) -Wl -o $@
$(LD) $^ $(LDFLAGS) $(LIBPATHS) $(LIB) -Wl -o $@
#strip --strip-all $@
powerpc-gekko-objcopy -O binary $@ mupen64.dol
dollz3 mupen64.dol mupen6z.dol

7
Makefile.GLN64_dev_wii
View file

@ -11,10 +11,9 @@ AS =powerpc-gekko-as
#CFLAGS =-DX86 -Wall -pipe -g -DEMU64_DEBUG -DCOMPARE_CORE
#CFLAGS =-DX86 -Wall -pipe -g
#CFLAGS = -g -O2 -Wall $(MACHDEP) $(INCLUDE) -fomit-frame-pointer
CFLAGS = -g -O2 -Wall $(MACHDEP) \
CFLAGS = -g -O2 -Wall $(MACHDEP) $(INCLUDE) \
-DCPU_SHUTDOWN -DSPC700_SHUTDOWN -DVAR_CYCLES -DSOUND \
-DNOASM -DNGC -DNOASM -DPIXEL_FORMAT=RGB565 \
-DM_PI=3.14159265359 \
-fno-exceptions -Wno-unused-parameter -pipe \
-DUSE_GUI -DSHOW_DEBUG -DWII -DTHREADED_AUDIO \
# -DPROGRESSIVE_DISPLAY
@ -23,6 +22,8 @@ CFLAGS = -g -O2 -Wall $(MACHDEP) \
MACHDEP = -DGEKKO -mcpu=750 -meabi -mhard-float
LDFLAGS = $(MACHDEP) -mrvl -Wl,-Map,$(notdir $@).map -Wl,--cref
INCLUDE = -I$(DEVKITPRO)/libogc/include
LIBPATHS = -L$(DEVKITPRO)/libogc/lib/wii
CXXFLAGS =$(CFLAGS)
@ -371,7 +372,7 @@ r4300/ppc/Wrappers.o: r4300/ppc/Wrappers.s
mupen64_wii.elf: $(OBJ) $(OBJ_PPC) $(OBJ_INPUT) $(OBJ_GLN64_GX) $(OBJ_AUDIO) $(OBJ_RSPHLE) main/main_gc-menu.o
$(LD) $^ $(LDFLAGS) $(LDFLAGS) $(LIB) -Wl -o $@
$(LD) $^ $(LDFLAGS) $(LIBPATHS) $(LIB) -Wl -o $@
#strip --strip-all $@
powerpc-gekko-objcopy -O binary $@ mupen64.dol
dollz3 mupen64.dol mupen6z.dol

9
Makefile.GX_gfx
View file

@ -11,17 +11,18 @@ AS =powerpc-gekko-as
#CFLAGS =-DX86 -Wall -pipe -g -DEMU64_DEBUG -DCOMPARE_CORE
#CFLAGS =-DX86 -Wall -pipe -g
#CFLAGS = -g -O2 -Wall $(MACHDEP) $(INCLUDE) -fomit-frame-pointer
CFLAGS = -g -O2 -Wall $(MACHDEP) \
CFLAGS = -g -O2 -Wall $(MACHDEP) $(INCLUDE) \
-DCPU_SHUTDOWN -DSPC700_SHUTDOWN -DVAR_CYCLES -DSOUND \
-DNOASM -DNGC -DNOASM -DPIXEL_FORMAT=RGB565 \
-DM_PI=3.14159265359 \
-fno-exceptions -Wno-unused-parameter -pipe \
-DUSE_GUI -DSHOW_DEBUG -DTHREADED_AUDIO
#-DEMBEDDED_FONTS -DPRINTGECKO
# -DEMBEDDED_FONTS -DPRINTGECKO
MACHDEP = -DGEKKO -mcpu=750 -meabi -mhard-float
LDFLAGS = $(MACHDEP) -mogc -Wl,-Map,$(notdir $@).map -Wl,--cref
INCLUDE = -I$(DEVKITPRO)/libogc/include
LIBPATHS = -L$(DEVKITPRO)/libogc/lib/cube
CXXFLAGS =$(CFLAGS)
@ -241,7 +242,7 @@ r4300/ppc/Wrappers.o: r4300/ppc/Wrappers.s
mupen64_gc.elf: $(OBJ) $(OBJ_PPC) $(OBJ_INPUT) $(OBJ_GX_GFX) $(OBJ_AUDIO) $(OBJ_RSPHLE) main/main_gc-menu.o
$(LD) $^ $(LDFLAGS) $(LDFLAGS) $(LIB) -Wl -o $@
$(LD) $^ $(LDFLAGS) $(LIBPATHS) $(LIB) -Wl -o $@
#strip --strip-all $@
powerpc-gekko-objcopy -O binary $@ mupen64.dol
dollz3 mupen64.dol mupen6z.dol

7
Makefile.GX_gfx_wii
View file

@ -4,10 +4,9 @@ CC =powerpc-gekko-gcc
CXX =powerpc-gekko-g++
AS =powerpc-gekko-as
CFLAGS = -g -O2 -Wall $(MACHDEP) -fmodulo-sched \
CFLAGS = -g -O2 -Wall $(MACHDEP) $(INCLUDE) -fmodulo-sched \
-DCPU_SHUTDOWN -DSPC700_SHUTDOWN -DVAR_CYCLES -DSOUND \
-DNOASM -DNGC -DNOASM -DPIXEL_FORMAT=RGB565 \
-DM_PI=3.14159265359 \
-fno-exceptions -Wno-unused-parameter -pipe \
-DUSE_GUI -DSHOW_DEBUG -DPROFILE -DWII \
-DTHREADED_AUDIO
@ -17,6 +16,8 @@ CFLAGS = -g -O2 -Wall $(MACHDEP) -fmodulo-sched \
MACHDEP = -DGEKKO -mcpu=750 -meabi -mhard-float
LDFLAGS = $(MACHDEP) -mrvl -Wl,-Map,$(notdir $@).map -Wl,--cref
INCLUDE = -I$(DEVKITPRO)/libogc/include
LIBPATHS = -L$(DEVKITPRO)/libogc/lib/wii
CXXFLAGS =$(CFLAGS)
@ -226,7 +227,7 @@ r4300/ppc/Wrappers.o: r4300/ppc/Wrappers.s
mupen64_gc.elf: $(OBJ) $(OBJ_PPC) $(OBJ_INPUT) $(OBJ_GX_GFX) \
$(OBJ_AUDIO) $(OBJ_RSPHLE) main/main_gc-menu.o
$(LD) $^ $(LDFLAGS) $(LDFLAGS) $(LIB) -Wl -o $@
$(LD) $^ $(LDFLAGS) $(LIBPATHS) $(LIB) -Wl -o $@
#strip --strip-all $@
powerpc-gekko-objcopy -O binary $@ mupen64.dol
#dollz3 mupen64.dol mupen6z.dol

11
Makefile.sft_gfx
View file

@ -11,17 +11,18 @@ AS =powerpc-gekko-as
#CFLAGS =-DX86 -Wall -pipe -g -DEMU64_DEBUG -DCOMPARE_CORE
#CFLAGS =-DX86 -Wall -pipe -g
#CFLAGS = -g -O2 -Wall $(MACHDEP) $(INCLUDE) -fomit-frame-pointer
CFLAGS = -g -O2 -Wall $(MACHDEP) \
CFLAGS = -g -O2 -Wall $(MACHDEP) $(INCLUDE) \
-DCPU_SHUTDOWN -DSPC700_SHUTDOWN -DVAR_CYCLES -DSOUND \
-DNOASM -DNGC -DNOASM -DPIXEL_FORMAT=RGB565 \
-DM_PI=3.14159265359 \
-fno-exceptions -Wno-unused-parameter -pipe \
-DUSE_GUI -DSHOW_DEBUG -DTHREADED_AUDIO
#-DEMBEDDED_FONTS -DPRINTGECKO
-DUSE_GUI -DSHOW_DEBUG -DTHREADED_AUDIO
# -DEMBEDDED_FONTS -DPRINTGECKO
MACHDEP = -DGEKKO -mcpu=750 -meabi -mhard-float
LDFLAGS = $(MACHDEP) -mogc -Wl,-Map,$(notdir $@).map -Wl,--cref
INCLUDE = -I$(DEVKITPRO)/libogc/include
LIBPATHS = -L$(DEVKITPRO)/libogc/lib/cube
CXXFLAGS =$(CFLAGS)
@ -238,7 +239,7 @@ r4300/ppc/Wrappers.o: r4300/ppc/Wrappers.s
mupen64_gc.elf: $(OBJ) $(OBJ_PPC) $(OBJ_INPUT) $(OBJ_SOFT_GFX) $(OBJ_AUDIO) $(OBJ_RSPHLE) main/main_gc-menu.o
$(LD) $^ $(LDFLAGS) $(LDFLAGS) $(LIB) -Wl -o $@
$(LD) $^ $(LDFLAGS) $(LIBPATHS) $(LIB) -Wl -o $@
#strip --strip-all $@
powerpc-gekko-objcopy -O binary $@ mupen64-sft.dol
# ~/GCos/dollz3 mupen64.dol mupen64-lz.dol

3
main/ROM-Cache.h
View file

@ -6,8 +6,9 @@
#define ROM_CACHE_H
#include "../fileBrowser/fileBrowser.h"
#include <gctypes.h>
typedef unsigned int u32;
//typedef unsigned int u32;
// Note: All length/size/offsets are in bytes
void ROMCache_init(u32 romSize);

3
main/winlnxdefs.h
View file

@ -30,7 +30,8 @@
#ifndef WINLNXDEFS_H
#define WINLNXDEFS_H
typedef unsigned int BOOL;
#include <gctypes.h>
//typedef unsigned int BOOL;
typedef unsigned long DWORD;
typedef unsigned short WORD;
typedef unsigned char BYTE;