aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTwinaphex2015-09-15 02:39:11 +0200
committerTwinaphex2015-09-15 02:39:11 +0200
commit1a27bceee033388f782ad24a9f23a5ddc06f1d86 (patch)
treeb6029bef1125ae4d2ee43aa1db018884381d575a
parentadee2d889bb4edbec367117ab39246a9e2161336 (diff)
parent499d645dd005fecd0ebd5acc7622e5210cfd7d59 (diff)
downloadsnes9x2005-1a27bceee033388f782ad24a9f23a5ddc06f1d86.tar.gz
snes9x2005-1a27bceee033388f782ad24a9f23a5ddc06f1d86.tar.bz2
snes9x2005-1a27bceee033388f782ad24a9f23a5ddc06f1d86.zip
Merge pull request #9 from netux79/master
(Wii) Buildfix and Wii target entry.
-rw-r--r--Makefile8
-rw-r--r--source/srtc.c33
2 files changed, 24 insertions, 17 deletions
diff --git a/Makefile b/Makefile
index 06a9498..573b8fa 100644
--- a/Makefile
+++ b/Makefile
@@ -166,6 +166,14 @@ else ifeq ($(platform), ctr)
PLATFORM_DEFINES := -D_3DS
STATIC_LINKING = 1
+# Nintendo Wii
+else ifeq ($(platform), wii)
+ TARGET := $(TARGET_NAME)_libretro_wii.a
+ CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
+ AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)
+ CFLAGS += -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float -D__ppc__ -DMSB_FIRST
+ STATIC_LINKING = 1
+
else
TARGET := $(TARGET_NAME)_libretro.dll
CC = gcc
diff --git a/source/srtc.c b/source/srtc.c
index 2d63e96..2a5782d 100644
--- a/source/srtc.c
+++ b/source/srtc.c
@@ -519,14 +519,14 @@ void S9xSRTCPreSaveState()
Memory.SRAM [s + 4 + MAX_RTC_INDEX] = rtc.mode;
#ifdef MSB_FIRST
- SRAM [s + 5 + MAX_RTC_INDEX] = (uint8_t)(rtc.system_timestamp >> 0);
- SRAM [s + 6 + MAX_RTC_INDEX] = (uint8_t)(rtc.system_timestamp >> 8);
- SRAM [s + 7 + MAX_RTC_INDEX] = (uint8_t)(rtc.system_timestamp >> 16);
- SRAM [s + 8 + MAX_RTC_INDEX] = (uint8_t)(rtc.system_timestamp >> 24);
- SRAM [s + 9 + MAX_RTC_INDEX] = (uint8_t)(rtc.system_timestamp >> 32);
- SRAM [s + 10 + MAX_RTC_INDEX] = (uint8_t)(rtc.system_timestamp >> 40);
- SRAM [s + 11 + MAX_RTC_INDEX] = (uint8_t)(rtc.system_timestamp >> 48);
- SRAM [s + 12 + MAX_RTC_INDEX] = (uint8_t)(rtc.system_timestamp >> 56);
+ Memory.SRAM [s + 5 + MAX_RTC_INDEX] = (uint8_t)(rtc.system_timestamp >> 0);
+ Memory.SRAM [s + 6 + MAX_RTC_INDEX] = (uint8_t)(rtc.system_timestamp >> 8);
+ Memory.SRAM [s + 7 + MAX_RTC_INDEX] = (uint8_t)(rtc.system_timestamp >> 16);
+ Memory.SRAM [s + 8 + MAX_RTC_INDEX] = (uint8_t)(rtc.system_timestamp >> 24);
+ Memory.SRAM [s + 9 + MAX_RTC_INDEX] = (uint8_t)(rtc.system_timestamp >> 32);
+ Memory.SRAM [s + 10 + MAX_RTC_INDEX] = (uint8_t)(rtc.system_timestamp >> 40);
+ Memory.SRAM [s + 11 + MAX_RTC_INDEX] = (uint8_t)(rtc.system_timestamp >> 48);
+ Memory.SRAM [s + 12 + MAX_RTC_INDEX] = (uint8_t)(rtc.system_timestamp >> 56);
#else
// memmove converted: Different mallocs [Neb]
memcpy(&Memory.SRAM [s + 5 + MAX_RTC_INDEX], &rtc.system_timestamp, 8);
@@ -551,14 +551,14 @@ void S9xSRTCPostLoadState()
rtc.mode = Memory.SRAM [s + 4 + MAX_RTC_INDEX];
#ifdef MSB_FIRST
- rtc.system_timestamp |= (SRAM [s + 5 + MAX_RTC_INDEX] << 0);
- rtc.system_timestamp |= (SRAM [s + 6 + MAX_RTC_INDEX] << 8);
- rtc.system_timestamp |= (SRAM [s + 7 + MAX_RTC_INDEX] << 16);
- rtc.system_timestamp |= (SRAM [s + 8 + MAX_RTC_INDEX] << 24);
- rtc.system_timestamp |= (SRAM [s + 9 + MAX_RTC_INDEX] << 32);
- rtc.system_timestamp |= (SRAM [s + 10 + MAX_RTC_INDEX] << 40);
- rtc.system_timestamp |= (SRAM [s + 11 + MAX_RTC_INDEX] << 48);
- rtc.system_timestamp |= (SRAM [s + 12 + MAX_RTC_INDEX] << 56);
+ rtc.system_timestamp |= (Memory.SRAM [s + 5 + MAX_RTC_INDEX] << 0);
+ rtc.system_timestamp |= (Memory.SRAM [s + 6 + MAX_RTC_INDEX] << 8);
+ rtc.system_timestamp |= (Memory.SRAM [s + 7 + MAX_RTC_INDEX] << 16);
+ rtc.system_timestamp |= (Memory.SRAM [s + 8 + MAX_RTC_INDEX] << 24);
+ rtc.system_timestamp |= (Memory.SRAM [s + 9 + MAX_RTC_INDEX] << 32);
+ rtc.system_timestamp |= (Memory.SRAM [s + 10 + MAX_RTC_INDEX] << 40);
+ rtc.system_timestamp |= (Memory.SRAM [s + 11 + MAX_RTC_INDEX] << 48);
+ rtc.system_timestamp |= (Memory.SRAM [s + 12 + MAX_RTC_INDEX] << 56);
#else
// memmove converted: Different mallocs [Neb]
memcpy(&rtc.system_timestamp, &Memory.SRAM [s + 5 + MAX_RTC_INDEX], 8);
@@ -566,4 +566,3 @@ void S9xSRTCPostLoadState()
S9xUpdateSrtcTime();
}
}
-