diff --git a/Makefile b/Makefile index 1f9d4ee..d3d3f3c 100644 --- a/Makefile +++ b/Makefile @@ -55,10 +55,10 @@ ifeq "$(TARGET_CG)" "" TARGET_CG := $(TARGET).g3a endif -ELF_FX := build-fx/$(shell basename -s .g1a $(TARGET_FX)).elf +ELF_FX := build-fx/$(shell basename "$(TARGET_FX)" .g1a).elf BIN_FX := $(ELF_FX:.elf=.bin) -ELF_CG := build-cg/$(shell basename -s .g3a $(TARGET_CG)).elf +ELF_CG := build-cg/$(shell basename "$(TARGET_CG)" .g3a).elf BIN_CG := $(ELF_CG:.elf=.bin) # Source files @@ -66,10 +66,12 @@ src := $(wildcard src/*.[csS] \ src/*/*.[csS] \ src/*/*/*.[csS] \ src/*/*/*/*.[csS]) -assets-fx := $(wildcard assets-fx/*/*.png \ - assets-fx/*/*/*.png) -assets-cg := $(wildcard assets-cg/*/*.png \ - assets-cg/*/*/*.png) +assets-fx := $(wildcard assets-fx/fonts/*.png \ + assets-fx/img/*/*.png \ + assets-fx/limg/*/*.png) +assets-cg := $(wildcard assets-cg/fonts/*.png \ + assets-cg/img/*/*.png \ + assets-cg/limg/*/*.png) # Object files obj-fx := $(src:%=build-fx/%.o) \ @@ -138,10 +140,18 @@ build-cg/%.S.o: %.S # Images build-fx/assets/img/%.o: assets-fx/img/% @ mkdir -p $(dir $@) - fxconv --bopti-image $< -o $@ $(FXCONVFX) name:img_$(basename $*) $(IMG.$*) + fxconv --image $< -o $@ $(FXCONVFX) name:img_$(notdir $(basename $*)) $(IMG.$*) build-cg/assets/img/%.o: assets-cg/img/% @ mkdir -p $(dir $@) - fxconv --bopti-image $< -o $@ $(FXCONVCG) name:img_$(notdir $(basename $*)) $(IMG.$*) profile:p4 + fxconv --image $< -o $@ $(FXCONVCG) name:img_$(notdir $(basename $*)) $(IMG.$*) profile:p4 + +# Images +build-fx/assets/limg/%.o: assets-fx/limg/% + @ mkdir -p $(dir $@) + fxconv --libimg-image $< -o $@ $(FXCONVFX) name:limg_$(notdir $(basename $*)) $(IMG.$*) +build-cg/assets/limg/%.o: assets-cg/limg/% + @ mkdir -p $(dir $@) + fxconv --libimg-image $< -o $@ $(FXCONVCG) name:limg_$(notdir $(basename $*)) $(IMG.$*) profile:p4 # Fonts build-fx/assets/fonts/%.o: assets-fx/fonts/% @@ -189,11 +199,17 @@ install-fx: $(TARGET_FX) install-cg: $(TARGET_CG) cp $< /run/media/${USER}/disk/ umount /run/media/${USER}/disk/ - # @ while [[ ! -h /dev/Prizm1 ]]; do sleep 0.25; done - # @ while ! mount /dev/Prizm1; do sleep 0.25; done - # @ rm -f /mnt/prizm/$< - # @ cp $< /mnt/prizm - # @ umount /dev/Prizm1 - # @- eject /dev/Prizm1 + eject /dev/sdd + # DEVICE=/dev/sdd + # MOUNT_POINT=/run/media/${USER}/disk + # @ while [[ ! -h ${DEVICE} ]]; do sleep 0.25; done + # @ while ! mount ${DEVICE}; do sleep 0.25; done + # @ rm -f ${MOUNT_POINT}/$< + # @ cp $< ${MOUNT_POINT}/ + # @ umount {$DEVICE} + # @- eject {$DEVICE} + +test: assets-cg/img/big_witches/witch1.limg.png + @ echo "$(basename $^)" .PHONY: all all-fx all-cg clean distclean install-fx install-cg diff --git a/assets-cg/img/battlefields/battlefield1.png b/assets-cg/img/battlefields/battlefield1.png index ffaca13..6eaddb5 100644 Binary files a/assets-cg/img/battlefields/battlefield1.png and b/assets-cg/img/battlefields/battlefield1.png differ diff --git a/assets-cg/img/enemies/enemy1_1.png b/assets-cg/img/enemies/enemy1_1.png new file mode 100644 index 0000000..03610af Binary files /dev/null and b/assets-cg/img/enemies/enemy1_1.png differ diff --git a/assets-cg/img/enemies/enemy1_2.png b/assets-cg/img/enemies/enemy1_2.png new file mode 100644 index 0000000..c566dae Binary files /dev/null and b/assets-cg/img/enemies/enemy1_2.png differ diff --git a/assets-cg/img/enemies/enemy1_3.png b/assets-cg/img/enemies/enemy1_3.png new file mode 100644 index 0000000..502a4c6 Binary files /dev/null and b/assets-cg/img/enemies/enemy1_3.png differ diff --git a/assets-cg/img/enemies/enemy1_4.png b/assets-cg/img/enemies/enemy1_4.png new file mode 100644 index 0000000..f8f7d49 Binary files /dev/null and b/assets-cg/img/enemies/enemy1_4.png differ diff --git a/assets-cg/img/enemies/enemy2_1.png b/assets-cg/img/enemies/enemy2_1.png new file mode 100644 index 0000000..163df62 Binary files /dev/null and b/assets-cg/img/enemies/enemy2_1.png differ diff --git a/assets-cg/img/enemies/enemy2_2.png b/assets-cg/img/enemies/enemy2_2.png new file mode 100644 index 0000000..fbf9799 Binary files /dev/null and b/assets-cg/img/enemies/enemy2_2.png differ diff --git a/assets-cg/img/enemies/enemy2_3.png b/assets-cg/img/enemies/enemy2_3.png new file mode 100644 index 0000000..392b85d Binary files /dev/null and b/assets-cg/img/enemies/enemy2_3.png differ diff --git a/assets-cg/img/enemies/enemy2_4.png b/assets-cg/img/enemies/enemy2_4.png new file mode 100644 index 0000000..77fd0d0 Binary files /dev/null and b/assets-cg/img/enemies/enemy2_4.png differ diff --git a/assets-cg/img/witches/witch7_back.png b/assets-cg/img/witches/witch7_back.png index 6676b98..36b51f0 100644 Binary files a/assets-cg/img/witches/witch7_back.png and b/assets-cg/img/witches/witch7_back.png differ diff --git a/assets-cg/img/witches/witch7_front.png b/assets-cg/img/witches/witch7_front.png index 0728bd8..7792800 100644 Binary files a/assets-cg/img/witches/witch7_front.png and b/assets-cg/img/witches/witch7_front.png differ diff --git a/assets-cg/limg/big_witches/witch1.png b/assets-cg/limg/big_witches/witch1.png new file mode 100644 index 0000000..a38c8fc Binary files /dev/null and b/assets-cg/limg/big_witches/witch1.png differ diff --git a/assets-cg/limg/big_witches/witch2.png b/assets-cg/limg/big_witches/witch2.png new file mode 100644 index 0000000..2d23810 Binary files /dev/null and b/assets-cg/limg/big_witches/witch2.png differ diff --git a/assets-cg/limg/big_witches/witch3.png b/assets-cg/limg/big_witches/witch3.png new file mode 100644 index 0000000..5e8b84c Binary files /dev/null and b/assets-cg/limg/big_witches/witch3.png differ diff --git a/assets-cg/limg/big_witches/witch4.png b/assets-cg/limg/big_witches/witch4.png new file mode 100644 index 0000000..a3224ea Binary files /dev/null and b/assets-cg/limg/big_witches/witch4.png differ diff --git a/assets-cg/limg/big_witches/witch5.png b/assets-cg/limg/big_witches/witch5.png new file mode 100644 index 0000000..1e77537 Binary files /dev/null and b/assets-cg/limg/big_witches/witch5.png differ diff --git a/assets-cg/limg/big_witches/witch6.png b/assets-cg/limg/big_witches/witch6.png new file mode 100644 index 0000000..bb01b47 Binary files /dev/null and b/assets-cg/limg/big_witches/witch6.png differ diff --git a/assets-cg/limg/big_witches/witch7.png b/assets-cg/limg/big_witches/witch7.png new file mode 100644 index 0000000..7e9f2cd Binary files /dev/null and b/assets-cg/limg/big_witches/witch7.png differ diff --git a/assets-cg/limg/big_witches/witch8.png b/assets-cg/limg/big_witches/witch8.png new file mode 100644 index 0000000..a0e5703 Binary files /dev/null and b/assets-cg/limg/big_witches/witch8.png differ diff --git a/project.cfg b/project.cfg index e883742..74589d8 100644 --- a/project.cfg +++ b/project.cfg @@ -60,8 +60,8 @@ INCLUDE := -I include # Libraries. Add one -l option for each library you are using, and also # suitable -L options if you have library files in custom folders. To use # fxlib, add libfx.a to the project directory and use "-L . -lfx". -LIBS_FX := -lprof -LIBS_CG := -lprof +LIBS_FX := -lprof -limg-fx +LIBS_CG := -lprof -limg-cg # Base linker flags for the fxSDK, you usually want to keep these. LDFLAGS_FX := -T fx9860g.ld -lgint-fx $(LIBS_FX) -lgint-fx -lgcc