Actions bugfix (#4)

* update makefiles to clean src and handle dist better * nuke dist folder on clean * add distfiles to dist folder on make all * add working PLATFORM var export Co-authored-by: Tom Marks <[email protected]>
phy1um · Aug 29, 2021 · f691159 · f691159
1 parent e4aa70e
commit f691159
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -13,11 +13,14 @@ dist: $(BIN) assets
 
 .PHONY: assets
 assets:
+	if ! [ -d dist ]; then mkdir dist; fi
 	$(MAKE) -C asset
 	cp asset/*.bin dist/
+	cp distfiles/* dist/
 
 $(BIN):
-	$(MAKE) -C src test.elf
+	if ! [ -d dist ]; then mkdir dist; fi
+	$(MAKE) PLATFORM=ps2 -C src test.elf
 	cp src/test.elf dist/test.elf
 
 # TODO(phy1um): update ISO building to include everything in dist/
@@ -33,7 +36,7 @@ docker-elf:
 clean:
 	$(MAKE) -C src clean
 	$(MAKE) -C asset clean
-	rm -rf dist/*
+	rm -rf dist/
 
 .PHONY: run
 run:

diff --git a/cube.bin b/cube.bin
diff --git a/dist/README.md → distfiles/README.md b/dist/README.md → distfiles/README.md
diff --git a/dist/SYSTEM.CNF → distfiles/SYSTEM.CNF b/dist/SYSTEM.CNF → distfiles/SYSTEM.CNF
diff --git a/src/Makefile b/src/Makefile
@@ -6,8 +6,10 @@ EE_LIBS=-ldma -lgraph -ldraw -lkernel -ldebug -lmath3d -lm -lpad
 EE_CFLAGS += -Wall --std=c99
 EE_LDFLAGS = -L$(PSDSDK)/ee/common/lib -L$(PS2SDK)/ee/lib
 
+ifeq ($(PLATFORM), ps2)
 include $(PS2SDK)/samples/Makefile.eeglobal
 include $(PS2SDK)/samples/Makefile.pref
+endif
 
 .PHONY: clean
 clean: