Updated assets

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

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