Skip to content

Commit 74c727b

Browse files
ExtremsExtrems
committed
1 parent 1a42cd3 commit 74c727b

3 files changed

Lines changed: 37 additions & 82 deletions

File tree

‎Makefile.menu2_gc‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,13 @@ CC =powerpc-eabi-gcc
44
CXX =powerpc-eabi-g++
55
AS =powerpc-eabi-as
66

7-
CFLAGS = -g -Ofast -mogc -Wall $(INCLUDE) \
8-
-fno-exceptions -flto=jobserver -Wno-unused-parameter -pipe \
7+
CFLAGS = -pipe -g -Ofast -Wall -mogc -flto=jobserver \
98
-DUSE_GUI -DNGC -DGLN64_GX -DUSE_TLB_CACHE -DARAM_BLOCKCACHE -DARAM_TLBCACHE \
109
-DUSE_RECOMP_CACHE -DPPC_DYNAREC -DFASTMEM -DRELEASE -DMENU_V2
1110

1211
LDFLAGS =$(CFLAGS) -Wl,-Map,$(notdir $@).map -Wl,--cref
1312

14-
INCLUDE = -I$(DEVKITPRO)/libogc/include
15-
LIBPATHS = -L$(DEVKITPRO)/libogc/lib/cube
16-
17-
CXXFLAGS =$(CFLAGS)
18-
19-
#GL_PATH =-I/usr/X11R6/include
13+
CXXFLAGS=$(CFLAGS)
2014

2115
OBJ =main/rom_gc.o \
2216
main/main_gc-menu2.o \
@@ -158,7 +152,7 @@ HEADER =main/rom.h \
158152
r4300/recomp.h \
159153
gc_memory/pif.h
160154

161-
LIB = -laesnd -lbba -ltinysmb -lfat -logc -lz -static
155+
LIB = -laesnd -lbba -ltinysmb -lfat -lz -static
162156

163157
ifeq ($(strip mupen64_GX_gfx/main.cpp),)
164158
export LD := $(CC)
@@ -277,8 +271,8 @@ glN64_GX/F3DCBFD.o: glN64_GX/F3DCBFD.cpp
277271
$(CXX) $(CFLAGS) -D__LINUX__ -D__GX__ -c -o $@ $<
278272

279273
cube64-glN64.elf: $(OBJ) $(OBJ_INPUT) $(OBJ_GLN64_GX) $(OBJ_AUDIO) $(OBJ_RSPHLE) $(OBJ_PPC)
280-
$(LD) $^ $(LDFLAGS) $(LIBPATHS) $(LIB) -o $@
281-
$(DEVKITPRO)/devkitPPC/bin/elf2dol $@ cube64-glN64.dol
274+
$(LD) $^ $(LDFLAGS) $(LIB) -o $@
275+
elf2dol cube64-glN64.elf cube64-glN64.dol
282276

283277
install:
284278
cp mupen64 "$(PREFIX)bin"

‎Makefile.menu2_wii‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,13 @@ CC =powerpc-eabi-gcc
44
CXX =powerpc-eabi-g++
55
AS =powerpc-eabi-as
66

7-
CFLAGS = -g -Ofast -mrvl -Wall $(INCLUDE) \
8-
-fno-exceptions -flto=jobserver -Wno-unused-parameter -pipe \
7+
CFLAGS = -pipe -g -Ofast -Wall -mrvl -flto=jobserver \
98
-DUSE_GUI -DWII -DGLN64_GX -DUSE_EXPANSION \
109
-DUSE_RECOMP_CACHE -DPPC_DYNAREC -DFASTMEM -DRELEASE -DMENU_V2
1110

1211
LDFLAGS =$(CFLAGS) -Wl,-Map,$(notdir $@).map -Wl,--cref
1312

14-
INCLUDE = -I$(DEVKITPRO)/libogc/include
15-
LIBPATHS = -L$(DEVKITPRO)/libogc/lib/wii
16-
17-
CXXFLAGS =$(CFLAGS)
18-
19-
#GL_PATH =-I/usr/X11R6/include
13+
CXXFLAGS=$(CFLAGS)
2014

2115
OBJ =main/rom_gc.o \
2216
main/main_gc-menu2.o \
@@ -159,7 +153,7 @@ HEADER =main/rom.h \
159153
r4300/recomp.h \
160154
gc_memory/pif.h
161155

162-
LIB = -laesnd -lwiiuse -lbte -ltinysmb -lfat -logc -lz -static
156+
LIB = -laesnd -lwiiuse -lbte -ltinysmb -lfat -lz -static
163157

164158
ifeq ($(strip mupen64_GX_gfx/main.cpp),)
165159
export LD := $(CC)
@@ -278,7 +272,7 @@ glN64_GX/F3DCBFD.o: glN64_GX/F3DCBFD.cpp
278272
$(CXX) $(CFLAGS) -D__LINUX__ -D__GX__ -c -o $@ $<
279273

280274
wii64-glN64.elf: $(OBJ) $(OBJ_INPUT) $(OBJ_GLN64_GX) $(OBJ_AUDIO) $(OBJ_RSPHLE) $(OBJ_PPC)
281-
$(LD) $^ $(LDFLAGS) $(LIBPATHS) $(LIB) -o $@
275+
$(LD) $^ $(LDFLAGS) $(LIB) -o $@
282276
elf2dol wii64-glN64.elf wii64-glN64.dol
283277

284278
install:

‎gc_input/controller-GC.c‎

Lines changed: 28 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -28,47 +28,36 @@
2828
#include "controller.h"
2929

3030
enum {
31-
ANALOG_AS_ANALOG = 1, C_STICK_AS_ANALOG = 2,
32-
};
33-
34-
enum {
35-
ANALOG_L = 0x01 << 16,
36-
ANALOG_R = 0x02 << 16,
37-
ANALOG_U = 0x04 << 16,
38-
ANALOG_D = 0x08 << 16,
39-
C_STICK_L = 0x10 << 16,
40-
C_STICK_R = 0x20 << 16,
41-
C_STICK_U = 0x40 << 16,
42-
C_STICK_D = 0x80 << 16,
31+
STICK_AS_ANALOG = 1, SUBSTICK_AS_ANALOG = 2,
4332
};
4433

4534
static button_t buttons[] = {
46-
{ 0, ~0, "None" },
47-
{ 1, PAD_BUTTON_UP, "D-Up" },
48-
{ 2, PAD_BUTTON_LEFT, "D-Left" },
49-
{ 3, PAD_BUTTON_RIGHT, "D-Right" },
50-
{ 4, PAD_BUTTON_DOWN, "D-Down" },
51-
{ 5, PAD_TRIGGER_Z, "Z" },
52-
{ 6, PAD_TRIGGER_L, "L" },
53-
{ 7, PAD_TRIGGER_R, "R" },
54-
{ 8, PAD_BUTTON_A, "A" },
55-
{ 9, PAD_BUTTON_B, "B" },
56-
{ 10, PAD_BUTTON_X, "X" },
57-
{ 11, PAD_BUTTON_Y, "Y" },
58-
{ 12, PAD_BUTTON_START, "Start" },
59-
{ 13, C_STICK_U, "C-Up" },
60-
{ 14, C_STICK_L, "C-Left" },
61-
{ 15, C_STICK_R, "C-Right" },
62-
{ 16, C_STICK_D, "C-Down" },
63-
{ 17, ANALOG_U, "A-Up" },
64-
{ 18, ANALOG_L, "A-Left" },
65-
{ 19, ANALOG_R, "A-Right" },
66-
{ 20, ANALOG_D, "A-Down" },
35+
{ 0, ~0, "None" },
36+
{ 1, PAD_BUTTON_UP, "D-Up" },
37+
{ 2, PAD_BUTTON_LEFT, "D-Left" },
38+
{ 3, PAD_BUTTON_RIGHT, "D-Right" },
39+
{ 4, PAD_BUTTON_DOWN, "D-Down" },
40+
{ 5, PAD_TRIGGER_Z, "Z" },
41+
{ 6, PAD_TRIGGER_L, "L" },
42+
{ 7, PAD_TRIGGER_R, "R" },
43+
{ 8, PAD_BUTTON_A, "A" },
44+
{ 9, PAD_BUTTON_B, "B" },
45+
{ 10, PAD_BUTTON_X, "X" },
46+
{ 11, PAD_BUTTON_Y, "Y" },
47+
{ 12, PAD_BUTTON_START, "Start" },
48+
{ 13, PAD_SUBSTICK_UP, "C-Up" },
49+
{ 14, PAD_SUBSTICK_LEFT, "C-Left" },
50+
{ 15, PAD_SUBSTICK_RIGHT, "C-Right" },
51+
{ 16, PAD_SUBSTICK_DOWN, "C-Down" },
52+
{ 17, PAD_STICK_UP, "A-Up" },
53+
{ 18, PAD_STICK_LEFT, "A-Left" },
54+
{ 19, PAD_STICK_RIGHT, "A-Right" },
55+
{ 20, PAD_STICK_DOWN, "A-Down" },
6756
};
6857

6958
static button_t analog_sources[] = {
70-
{ 0, ANALOG_AS_ANALOG, "Analog Stick" },
71-
{ 1, C_STICK_AS_ANALOG, "C-Stick" },
59+
{ 0, STICK_AS_ANALOG, "Analog Stick" },
60+
{ 1, SUBSTICK_AS_ANALOG, "C-Stick" },
7261
};
7362

7463
static button_t menu_combos[] = {
@@ -78,30 +67,8 @@ static button_t menu_combos[] = {
7867

7968
u32 gc_connected;
8069

81-
static unsigned int getButtons(int Control)
82-
{
83-
unsigned int b = PAD_ButtonsHeld(Control);
84-
s8 stickX = PAD_StickX(Control);
85-
s8 stickY = PAD_StickY(Control);
86-
s8 substickX = PAD_SubStickX(Control);
87-
s8 substickY = PAD_SubStickY(Control);
88-
u8 triggerL = PAD_TriggerL(Control);
89-
u8 triggerR = PAD_TriggerR(Control);
90-
91-
if(stickX < -48) b |= ANALOG_L;
92-
if(stickX > 48) b |= ANALOG_R;
93-
if(stickY > 48) b |= ANALOG_U;
94-
if(stickY < -48) b |= ANALOG_D;
95-
96-
if(substickX < -48) b |= C_STICK_L;
97-
if(substickX > 48) b |= C_STICK_R;
98-
if(substickY > 48) b |= C_STICK_U;
99-
if(substickY < -48) b |= C_STICK_D;
100-
101-
if(triggerL & 0x80) b |= PAD_TRIGGER_L;
102-
if(triggerR & 0x80) b |= PAD_TRIGGER_R;
103-
104-
return b;
70+
static unsigned int getButtons(int Control){
71+
return PAD_ButtonsHeld(Control);
10572
}
10673

10774
static int _GetKeys(int Control, BUTTONS * Keys, controller_config_t* config)
@@ -136,10 +103,10 @@ static int _GetKeys(int Control, BUTTONS * Keys, controller_config_t* config)
136103
c->D_CBUTTON = isHeld(config->CD);
137104
c->U_CBUTTON = isHeld(config->CU);
138105

139-
if(config->analog->mask == ANALOG_AS_ANALOG){
106+
if(config->analog->mask == STICK_AS_ANALOG){
140107
c->X_AXIS = PAD_StickX(Control);
141108
c->Y_AXIS = PAD_StickY(Control);
142-
} else if(config->analog->mask == C_STICK_AS_ANALOG){
109+
} else if(config->analog->mask == SUBSTICK_AS_ANALOG){
143110
c->X_AXIS = PAD_SubStickX(Control);
144111
c->Y_AXIS = PAD_SubStickY(Control);
145112
}

0 commit comments

Comments
 (0)