Skip to content

Commit

Permalink
vice: add xpet, properly fix makefile
Browse files Browse the repository at this point in the history
  • Loading branch information
ToKe79 committed Apr 12, 2024
1 parent e65b0e4 commit 48beb90
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 20 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
* Add new libretro core: `jaxe`
* Add new libretro core: `numero`
* Add new libretro core: `thepowdertoy`
* Add new libretro core: `vice_xpet`
* Add new libretro core: `vircon32`
* Add new libretro core: `vitaquake2`
* Update Mesa to [24.0.4](https://docs.mesa3d.org/relnotes/24.0.4.html)
Expand Down
3 changes: 1 addition & 2 deletions packages/lakka/libretro_cores/vice/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@ PKG_URL="${PKG_SITE}.git"
PKG_DEPENDS_TARGET="toolchain"
PKG_LONGDESC="Versatile Commodore 8-bit Emulator version"
PKG_TOOLCHAIN="make"
PKG_BUILD_FLAGS="+pic -gold"

make_target() {
for LRCORE in x64 x128 xplus4 xvic ; do
for LRCORE in x64 x128 xpet xplus4 xvic ; do
make EMUTYPE=${LRCORE}
make objectclean
done
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
diff --git a/Makefile b/Makefile
index fc2830e..c29d524 100644
--- a/Makefile
+++ b/Makefile
@@ -438,10 +438,11 @@ ifeq ($(platform), theos_ios)
include $(THEOS_MAKE_PATH)/library.mk
else

-default:
+default: info all
+
+info:
$(info CFLAGS: $(PLATFLAGS) $(COMMONFLAGS))
$(info -------)
- $(MAKE) $(TARGET)

all: $(TARGET)

@@ -461,21 +462,21 @@ endif

$(OBJDIR)/%.o: %.c
@mkdir -p $(dir $@)
- @if [[ $(SILENT) -ne 1 ]]; then\
+ @if [ $(SILENT) -ne 1 ]; then\
$(if $@, $(shell echo echo CC $<),);\
fi
$(CC) $(CFLAGS) -c -o $@ $<

$(OBJDIR)/%.o: %.cpp
@mkdir -p $(dir $@)
- @if [[ $(SILENT) -ne 1 ]]; then\
+ @if [ $(SILENT) -ne 1 ]; then\
$(if $@, $(shell echo echo CXX $<),);\
fi
$(CXX) $(CXXFLAGS) -c -o $@ $<

$(OBJDIR)/%.o: %.cc
@mkdir -p $(dir $@)
- @if [[ $(SILENT) -ne 1 ]]; then\
+ @if [ $(SILENT) -ne 1 ]; then\
$(if $@, $(shell echo echo CXX $<),);\
fi
$(CXX) $(CXXFLAGS) -c -o $@ $<

0 comments on commit 48beb90

Please sign in to comment.