Skip to content

Commit 48beb90

Browse files
committed
vice: add xpet, properly fix makefile
1 parent e65b0e4 commit 48beb90

4 files changed

Lines changed: 45 additions & 20 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
* Add new libretro core: `jaxe`
88
* Add new libretro core: `numero`
99
* Add new libretro core: `thepowdertoy`
10+
* Add new libretro core: `vice_xpet`
1011
* Add new libretro core: `vircon32`
1112
* Add new libretro core: `vitaquake2`
1213
* Update Mesa to [24.0.4](https://docs.mesa3d.org/relnotes/24.0.4.html)

packages/lakka/libretro_cores/vice/package.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@ PKG_URL="${PKG_SITE}.git"
66
PKG_DEPENDS_TARGET="toolchain"
77
PKG_LONGDESC="Versatile Commodore 8-bit Emulator version"
88
PKG_TOOLCHAIN="make"
9-
PKG_BUILD_FLAGS="+pic -gold"
109

1110
make_target() {
12-
for LRCORE in x64 x128 xplus4 xvic ; do
11+
for LRCORE in x64 x128 xpet xplus4 xvic ; do
1312
make EMUTYPE=${LRCORE}
1413
make objectclean
1514
done

packages/lakka/libretro_cores/vice/patches/Avoid-multiple-LDFLAGS.patch

Lines changed: 0 additions & 18 deletions
This file was deleted.
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
diff --git a/Makefile b/Makefile
2+
index fc2830e..c29d524 100644
3+
--- a/Makefile
4+
+++ b/Makefile
5+
@@ -438,10 +438,11 @@ ifeq ($(platform), theos_ios)
6+
include $(THEOS_MAKE_PATH)/library.mk
7+
else
8+
9+
-default:
10+
+default: info all
11+
+
12+
+info:
13+
$(info CFLAGS: $(PLATFLAGS) $(COMMONFLAGS))
14+
$(info -------)
15+
- $(MAKE) $(TARGET)
16+
17+
all: $(TARGET)
18+
19+
@@ -461,21 +462,21 @@ endif
20+
21+
$(OBJDIR)/%.o: %.c
22+
@mkdir -p $(dir $@)
23+
- @if [[ $(SILENT) -ne 1 ]]; then\
24+
+ @if [ $(SILENT) -ne 1 ]; then\
25+
$(if $@, $(shell echo echo CC $<),);\
26+
fi
27+
$(CC) $(CFLAGS) -c -o $@ $<
28+
29+
$(OBJDIR)/%.o: %.cpp
30+
@mkdir -p $(dir $@)
31+
- @if [[ $(SILENT) -ne 1 ]]; then\
32+
+ @if [ $(SILENT) -ne 1 ]; then\
33+
$(if $@, $(shell echo echo CXX $<),);\
34+
fi
35+
$(CXX) $(CXXFLAGS) -c -o $@ $<
36+
37+
$(OBJDIR)/%.o: %.cc
38+
@mkdir -p $(dir $@)
39+
- @if [[ $(SILENT) -ne 1 ]]; then\
40+
+ @if [ $(SILENT) -ne 1 ]; then\
41+
$(if $@, $(shell echo echo CXX $<),);\
42+
fi
43+
$(CXX) $(CXXFLAGS) -c -o $@ $<

0 commit comments

Comments
 (0)