X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pandora%2FMakefile;h=016a76ff4ee38728cdd87a6bd9ff82a621fe8f8e;hb=492d353af951b6a34a1f62d07ec64456b6e34600;hp=ffa1d7230c398a40c83c5cb73acf7415d370c537;hpb=fe01739339fe177363948c6fd518352243d5cf37;p=libpicofe.git diff --git a/pandora/Makefile b/pandora/Makefile index ffa1d72..016a76f 100644 --- a/pandora/Makefile +++ b/pandora/Makefile @@ -49,7 +49,7 @@ LD = $(CROSS)ld OBJCOPY = $(CROSS)objcopy # frontend -OBJS += pandora.o main.o platform/gp2x/menu.o platform/gp2x/usbjoy.o platform/gp2x/emu.o +OBJS += pandora.o main.o emu.o platform/gp2x/menu.o platform/gp2x/usbjoy.o # common OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o platform/common/config.o \ @@ -141,7 +141,7 @@ DIRS = platform platform/gp2x platform/common Pico Pico/cd Pico/Pico Pico/sound all: mkdirs PicoDrive -PicoDrive : $(OBJS) ../common/helix/helix_mp3.a +PicoDrive : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a @echo ">>>" $@ $(GCC) -o $@ $(COPT) $^ -lm -Wl,-Map=PicoDrive.map # -lpng ifeq ($(DEBUG),) @@ -218,8 +218,8 @@ Pico/Pico.o Pico/cd/Pico.o: ../../Pico/PicoFrameHints.c ../../Pico/PicoInt.h Pico/Memory.o Pico/cd/Memory.o : ../../Pico/MemoryCmn.c ../../Pico/PicoInt.h # build helix libs -../common/helix/helix_mp3.a: - make -C ../common/helix +../common/helix/$(CROSS)helix-mp3.a: + make -C ../common/helix clean all readme.txt: ../../tools/textfilter ../base_readme.txt ../../tools/textfilter ../base_readme.txt $@ GP2X