From cb757dfaf9a4c200a572a8a55afa55c4058bdeb5 Mon Sep 17 00:00:00 2001 From: Stefan Date: Mon, 21 Apr 2025 22:22:40 +0200 Subject: [PATCH 1/3] Changed make target https://www.gnu.org/software/make/manual/html_node/Standard-Targets.html --- make/makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/makefile b/make/makefile index e3c66ce..b1384be 100644 --- a/make/makefile +++ b/make/makefile @@ -85,7 +85,7 @@ samples: compiler @$(MAKE) -C $(project_dir)/samples all -tests: compiler +check: compiler @$(MAKE) -C $(project_dir)/autotest all install: compiler From 74350d613376770b4e64cf8dd2302ffb45be0f03 Mon Sep 17 00:00:00 2001 From: polluks Date: Wed, 23 Apr 2025 10:40:28 +0200 Subject: [PATCH 2/3] oops --- make/makefile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/make/makefile b/make/makefile index b1384be..83afcf4 100644 --- a/make/makefile +++ b/make/makefile @@ -93,16 +93,16 @@ install: compiler @$(MKDIR_PARENT) $(DESTDIR)$(bindir) $(INSTALL_PROGRAM) $(project_dir)/bin/oscar64 $(DESTDIR)$(bindir) @$(MKDIR_PARENT) $(DESTDIR)$(includedir)/oscar64/{audio,c64,c128,cx16,gfx,nes,opp,plus4,vic20} - $(INSTALL_DATA) $(project_dir)/include/*.{h,c} $(DESTDIR)$(includedir)/oscar64 - $(INSTALL_DATA) $(project_dir)/include/audio/*.{h,c} $(DESTDIR)$(includedir)/oscar64/audio - $(INSTALL_DATA) $(project_dir)/include/c64/*.{h,c} $(DESTDIR)$(includedir)/oscar64/c64 - $(INSTALL_DATA) $(project_dir)/include/c128/*.{h,c} $(DESTDIR)$(includedir)/oscar64/c128 - $(INSTALL_DATA) $(project_dir)/include/cx16/*.{h,c} $(DESTDIR)$(includedir)/oscar64/cx16 - $(INSTALL_DATA) $(project_dir)/include/gfx/*.{h,c} $(DESTDIR)$(includedir)/oscar64/gfx - $(INSTALL_DATA) $(project_dir)/include/nes/*.{h,c} $(DESTDIR)$(includedir)/oscar64/nes - $(INSTALL_DATA) $(project_dir)/include/opp/*.{h,cpp} $(DESTDIR)$(includedir)/oscar64/opp - $(INSTALL_DATA) $(project_dir)/include/plus4/*.{h,c} $(DESTDIR)$(includedir)/oscar64/plus4 - $(INSTALL_DATA) $(project_dir)/include/vic20/*.{h,c} $(DESTDIR)$(includedir)/oscar64/vic20 + $(INSTALL_DATA) $(wildcard $(project_dir)/include/*.h $(project_dir)/include/*.c) $(DESTDIR)$(includedir)/oscar64 + $(INSTALL_DATA) $(wildcard $(project_dir)/include/audio/*.h $(project_dir)/include/audio/*.c) $(DESTDIR)$(includedir)/oscar64/audio + $(INSTALL_DATA) $(wildcard $(project_dir)/include/c64/*.h $(project_dir)/include/c64/*.c) $(DESTDIR)$(includedir)/oscar64/c64 + $(INSTALL_DATA) $(wildcard $(project_dir)/include/c128/*.h $(project_dir)/include/c128/*.c) $(DESTDIR)$(includedir)/oscar64/c128 + $(INSTALL_DATA) $(wildcard $(project_dir)/include/cx16/*.h $(project_dir)/include/cx16/*.c) $(DESTDIR)$(includedir)/oscar64/cx16 + $(INSTALL_DATA) $(wildcard $(project_dir)/include/gfx/*.h $(project_dir)/include/gfx/*.c) $(DESTDIR)$(includedir)/oscar64/gfx + $(INSTALL_DATA) $(wildcard $(project_dir)/include/nes/*.h $(project_dir)/include/nes/*.c) $(DESTDIR)$(includedir)/oscar64/nes + $(INSTALL_DATA) $(wildcard $(project_dir)/include/opp/*.h $(project_dir)/include/opp/*.cpp) $(DESTDIR)$(includedir)/oscar64/opp + $(INSTALL_DATA) $(wildcard $(project_dir)/include/plus4/*.h $(project_dir)/include/plus4/*.c) $(DESTDIR)$(includedir)/oscar64/plus4 + $(INSTALL_DATA) $(wildcard $(project_dir)/include/vic20/*.h $(project_dir)/include/vic20/*.c) $(DESTDIR)$(includedir)/oscar64/vic20 uninstall: From 1bd98bdeb2e3d9d33acb60ab0ed815571e14e4dc Mon Sep 17 00:00:00 2001 From: Stefan Date: Wed, 23 Apr 2025 15:32:26 +0200 Subject: [PATCH 3/3] Changed make target everywhere oops --- make/makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/makefile b/make/makefile index 83afcf4..21a3497 100644 --- a/make/makefile +++ b/make/makefile @@ -38,7 +38,7 @@ else endif -all: --prep-build-dir compiler samples tests +all: --prep-build-dir compiler samples check $(srcdir)/%.o: $(project_dir)/oscar64/%.cpp