X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=linux%2FMakefile;h=965b52beebfe1026a4e004413ed5f4af9312cdcd;hb=199bec61013575bcc73c75fd8338bd44d82bf65f;hp=03585215546f055d3c5bfacd47baca72e970674f;hpb=9a3145d6220136d8fb38cdddcfa5ccda34c792c2;p=libpicofe.git

diff --git a/linux/Makefile b/linux/Makefile
index 0358521..965b52b 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -12,7 +12,7 @@ CFLAGS += -O3 -Wall
 CFLAGS += -ftracer -fstrength-reduce -funroll-loops -fomit-frame-pointer -fstrict-aliasing -ffast-math
 CFLAGS += -fprofile-generate
 else
-CFLAGS = -ggdb -Wall -falign-functions=2
+CFLAGS += -ggdb -Wall -falign-functions=2
 endif
 DEFINES = _UNZIP_SUPPORT IO_STATS IN_EVDEV
 CFLAGS += -I../.. -I.
@@ -40,7 +40,7 @@ OBJS += pico/cd/pico.o pico/cd/memory.o pico/cd/sek.o pico/cd/LC89510.o \
 	pico/cd/cd_sys.o pico/cd/cd_file.o pico/cd/cue.o pico/cd/gfx_cd.o \
 	pico/cd/area.o pico/cd/misc.o pico/cd/pcm.o pico/cd/buffering.o
 # Pico - 32X
-OBJS += pico/32x/32x.o pico/32x/memory.o pico/32x/draw.o
+OBJS += pico/32x/32x.o pico/32x/memory.o pico/32x/draw.o pico/32x/pwm.o
 # Pico - Pico
 OBJS += pico/pico/pico.o pico/pico/memory.o pico/pico/xpcm.o
 # Pico - sound
@@ -94,9 +94,8 @@ tidy:
 	$(RM) $(OBJS)
 	rm -rf $(DIRS)
 	@make -C ../../cpu/mz80/ clean
-	@make -C ../common/helix/ X86=1 clean
 
-PicoDrive : $(OBJS) ../common/helix/helix_mp3_x86.a
+PicoDrive : $(OBJS)
 	@echo ">>>" $@
 	$(CC) $(CFLAGS) $^ $(LDFLAGS) -lm -lpng -Wl,-Map=PicoDrive.map -o $@
 
@@ -119,9 +118,6 @@ cpu/mz80/mz80.o : ../../cpu/mz80/mz80.asm
 ../../cpu/mz80/mz80.asm :
 	@make -C ../../cpu/mz80/
 
-../common/helix/helix_mp3_x86.a:
-	@make -C ../common/helix/ X86=1 clean all
-
 .c.o:
 	@echo ">>>" $<
 	$(CC) $(CFLAGS) -c $< -o $@