diff --git a/Makefile b/Makefile index 90022d3..341ccf0 100644 --- 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 deleted file mode 100644 index 97f17cc..0000000 Binary files a/cube.bin and /dev/null differ diff --git a/dist/README.md b/distfiles/README.md similarity index 100% rename from dist/README.md rename to distfiles/README.md diff --git a/dist/SYSTEM.CNF b/distfiles/SYSTEM.CNF similarity index 100% rename from dist/SYSTEM.CNF rename to distfiles/SYSTEM.CNF diff --git a/src/Makefile b/src/Makefile index c4c0a79..0aab0d6 100644 --- 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: