core, structural cleanup, fixes and improvements for type issues #2

platform/gp2x/code940/940.c

@@ -2,7 +2,7 @@
 // (c) Copyright 2006-2007, Grazvydas "notaz" Ignotas
 
 #include "940shared.h"
-#include "../../common/helix/pub/mp3dec.h"
+#include <platform/common/helix/pub/mp3dec.h>
 
 static _940_data_t *shared_data = (_940_data_t *)   0x00100000;
 static _940_ctl_t  *shared_ctl  = (_940_ctl_t *)    0x00200000;

platform/gp2x/code940/940shared.h

@@ -1,4 +1,4 @@
-#include "../../../pico/sound/ym2612.h"
+#include <pico/sound/ym2612.h>
 
 // max 16 jobs, lower num means higher prio
 enum _940_job_t {

platform/gp2x/code940/Makefile

@@ -14,7 +14,7 @@ CROSS ?= arm-linux-gnueabi-
 # settings
 #up = 1
 
-CFLAGS += -O2 -Wall -mno-thumb-interwork -fstrict-aliasing -ffast-math
+CFLAGS += -O3 -Wall -mno-thumb-interwork -fstrict-aliasing -fno-stack-protector -fno-common -ffast-math
 CFLAGS += -I../../common/helix/pub -I../../.. -I. -D__GP2X__ -DARM
 CFLAGS += -mcpu=arm940t -mtune=arm940t -mabi=apcs-gnu -mfloat-abi=soft -mfpu=fpa
 LDFLAGS = -static -e code940 -Ttext 0x0 -L$(lgcc_path) -lgcc
@@ -66,9 +66,6 @@ code940.elf : $(OBJS940) $(LIBHELIX)
 	@echo ">>>" $@
 	$(GCC) $(CFLAGS) -Os -DEXTERNAL_YM2612 -c $< -o $@
 
-mix.o : ../../../pico/sound/mix.s
-	@echo ">>>" $@
-	$(GCC) $(CFLAGS) -DEXTERNAL_YM2612 -c $< -o $@
 misc_arm.o : ../../../pico/misc_arm.s
 	@echo ">>>" $@
 	$(GCC) $(CFLAGS) -DEXTERNAL_YM2612 -c $< -o $@

platform/gp2x/code940/mp3test.c

@@ -13,7 +13,7 @@
 //#include "emu.h"
 //#include "menu.h"
 #include "../asmutils.h"
-#include "../../helix/pub/mp3dec.h"
+#include <platform/common/helix/pub/mp3dec.h>
 
 /* we will need some gp2x internals here */
 extern volatile unsigned short *gp2x_memregs; /* from minimal library rlyeh */