Skip to content

Commit 67881ef

Browse files
committed
Merge branch 'master' into libretro
2 parents c784693 + a7a6db3 commit 67881ef

File tree

4 files changed

+13
-8
lines changed

4 files changed

+13
-8
lines changed

.github/workflows/ci-linux-arm64.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: CI (Linux arm64)
22
on: [push, pull_request]
33
jobs:
44
build-linux:
5-
runs-on: ubuntu-latest
5+
runs-on: ubuntu-22.04
66
steps:
77
- uses: actions/checkout@v2
88
with:

.github/workflows/ci-linux-armhf.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: CI (Linux armhf)
22
on: [push, pull_request]
33
jobs:
44
build-linux:
5-
runs-on: ubuntu-latest
5+
runs-on: ubuntu-22.04
66
steps:
77
- uses: actions/checkout@v2
88
with:

Makefile

+2-6
Original file line numberDiff line numberDiff line change
@@ -475,12 +475,8 @@ target_: $(TARGET)
475475

476476
$(TARGET): $(OBJS)
477477
ifeq ($(PARTIAL_LINKING), 1)
478-
$(LD) -o $(basename $(TARGET))1.o -r --gc-sections \
479-
$(addprefix -u ,$(shell cat frontend/libretro-extern)) \
480-
$(addprefix -u ,$(EXTRA_EXTERN_SYMS)) $^
481-
$(OBJCOPY) --keep-global-symbols=frontend/libretro-extern \
482-
$(addprefix -G ,$(EXTRA_EXTERN_SYMS)) \
483-
$(basename $(TARGET))1.o $(basename $(TARGET)).o
478+
$(LD) -o $(basename $(TARGET))1.o -r --gc-sections $(addprefix -u ,$(shell cat frontend/libretro-extern)) $(addprefix -u ,$(EXTRA_EXTERN_SYMS)) $^
479+
$(OBJCOPY) --keep-global-symbols=frontend/libretro-extern $(addprefix -G ,$(EXTRA_EXTERN_SYMS)) $(basename $(TARGET))1.o $(basename $(TARGET)).o
484480
$(AR) rcs $@ $(basename $(TARGET)).o
485481
else ifeq ($(STATIC_LINKING), 1)
486482
$(AR) rcs $@ $^

libpcsxcore/database.c

+9
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,12 @@ cycle_multiplier_overrides[] =
157157
{ 200, { "SLUS01519", "SCPS45260", "SLPS01463" } },
158158
};
159159

160+
static const char * const lightrec_hack_db[] =
161+
{
162+
/* Tomb Raider (Rev 2) - boot menu clears over itself */
163+
"SLUS00152",
164+
};
165+
160166
/* Function for automatic patching according to GameID. */
161167
void Apply_Hacks_Cdrom(void)
162168
{
@@ -221,6 +227,9 @@ void Apply_Hacks_Cdrom(void)
221227
lightrec_hacks = 0;
222228
if (Config.hacks.f1)
223229
lightrec_hacks |= LIGHTREC_HACK_INV_DMA_ONLY;
230+
for (i = 0; i < ARRAY_SIZE(lightrec_hack_db); i++)
231+
if (strcmp(lightrec_hack_db[i], CdromId) == 0)
232+
lightrec_hacks |= LIGHTREC_HACK_INV_DMA_ONLY;
224233
if (lightrec_hacks)
225234
SysPrintf("using lightrec_hacks: 0x%x\n", lightrec_hacks);
226235
}

0 commit comments

Comments
 (0)