From: Twinaphex <libretro@gmail.com>
Date: Tue, 6 Dec 2016 18:46:07 +0000 (+0100)
Subject: Merge pull request #41 from orbea/debug
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2410633936aa216e7a82fa41fea5ee5ce1fb6ea;hp=fbd5ab26736358198d7b4c68abd04583f982da4e;p=picodrive.git

Merge pull request #41 from orbea/debug

Check if DEBUG is set rather than not set.
---

diff --git a/Makefile b/Makefile
index a62d9b1..ca8ccf6 100644
--- a/Makefile
+++ b/Makefile
@@ -2,18 +2,21 @@ TARGET ?= PicoDrive
 DEBUG = 0
 CFLAGS += -Wall 
 CFLAGS += -I. -DINLINE=inline
-ifeq ($(DEBUG),0)
-ifeq ($(platform), vita)
-CFLAGS += -O3 -DNDEBUG
-else
-CFLAGS += -O2 -DNDEBUG -ffunction-sections
-endif
+
+ifeq ($(DEBUG),1)
+	CFLAGS += -g -O0
 else
-CFLAGS += -g -O2
+	ifeq ($(platform), vita)
+		CFLAGS += -O3 -DNDEBUG
+	else
+		CFLAGS += -O2 -DNDEBUG -ffunction-sections
+	endif
 endif
+
 ifneq ($(APPLE),1)
-LDFLAGS += -Wl,--gc-sections
+	LDFLAGS += -Wl,--gc-sections
 endif
+
 #CFLAGS += -DEVT_LOG
 #CFLAGS += -DDRC_CMP
 #cpu_cmp = 1
@@ -24,7 +27,6 @@ ifeq ($(WANT_GDB),1)
 CFLAGS += ggdb -falign-functions=2
 endif
 
-
 all: config.mak target_
 
 ifndef NO_CONFIG_MAK
diff --git a/pico/sound/ym2612.c b/pico/sound/ym2612.c
index 0fc6fa2..b06007b 100644
--- a/pico/sound/ym2612.c
+++ b/pico/sound/ym2612.c
@@ -535,7 +535,7 @@ static int g_lfo_ampm = 0;
 
 
 /* OPN Mode Register Write */
-INLINE void set_timers( int v )
+static INLINE void set_timers( int v )
 {
 	/* b7 = CSM MODE */
 	/* b6 = 3 slot mode */
@@ -590,13 +590,13 @@ INLINE void set_det_mul(FM_CH *CH, FM_SLOT *SLOT, int v)
 }
 
 /* set total level */
-INLINE void set_tl(FM_SLOT *SLOT, int v)
+static INLINE void set_tl(FM_SLOT *SLOT, int v)
 {
 	SLOT->tl = (v&0x7f)<<(ENV_BITS-7); /* 7bit TL */
 }
 
 /* set attack rate & key scale  */
-INLINE void set_ar_ksr(FM_CH *CH, FM_SLOT *SLOT, int v)
+static INLINE void set_ar_ksr(FM_CH *CH, FM_SLOT *SLOT, int v)
 {
 	UINT8 old_KSR = SLOT->KSR;
 
@@ -628,7 +628,7 @@ INLINE void set_ar_ksr(FM_CH *CH, FM_SLOT *SLOT, int v)
 }
 
 /* set decay rate */
-INLINE void set_dr(FM_SLOT *SLOT, int v)
+static INLINE void set_dr(FM_SLOT *SLOT, int v)
 {
 	int eg_sh_d1r, eg_sel_d1r;
 
@@ -641,7 +641,7 @@ INLINE void set_dr(FM_SLOT *SLOT, int v)
 }
 
 /* set sustain rate */
-INLINE void set_sr(FM_SLOT *SLOT, int v)
+static INLINE void set_sr(FM_SLOT *SLOT, int v)
 {
 	int eg_sh_d2r, eg_sel_d2r;
 
@@ -654,7 +654,7 @@ INLINE void set_sr(FM_SLOT *SLOT, int v)
 }
 
 /* set release rate */
-INLINE void set_sl_rr(FM_SLOT *SLOT, int v)
+static INLINE void set_sl_rr(FM_SLOT *SLOT, int v)
 {
 	int eg_sh_rr, eg_sel_rr;
 
@@ -668,8 +668,6 @@ INLINE void set_sl_rr(FM_SLOT *SLOT, int v)
 	SLOT->eg_pack_rr = eg_inc_pack[eg_sel_rr] | (eg_sh_rr<<24);
 }
 
-
-
 INLINE signed int op_calc(UINT32 phase, unsigned int env, signed int pm)
 {
 	int ret, sin = (phase>>16) + (pm>>1);