From 9b400da1a7d44efda870462121b3e36ab42e134b Mon Sep 17 00:00:00 2001
From: orbea
Date: Tue, 6 Sep 2016 17:47:31 -0700
Subject: Use DEBUG=1 properly for debug builds

---
 Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 89788e6..627ccf4 100644
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,10 @@
 
 # default stuff goes here, so that config can override
 TARGET ?= pcsx
-CFLAGS += -Wall -ggdb -Iinclude -ffast-math
-ifndef DEBUG
+CFLAGS += -Wall -Iinclude -ffast-math
+ifeq ($(DEBUG), 1)
+CFLAGS += -O0 -ggdb -DOPENGL_DEBUG
+else
 CFLAGS += -O2 -DNDEBUG
 endif
 CXXFLAGS += $(CFLAGS)
-- 
cgit v1.2.3


From 0f97d2d8b4a9ce8aba382a922f13d3f6e32dadcb Mon Sep 17 00:00:00 2001
From: orbea
Date: Thu, 8 Sep 2016 09:39:34 -0700
Subject: OPENGL_DEBUG is not needed

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 627ccf4..dc4e07d 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 TARGET ?= pcsx
 CFLAGS += -Wall -Iinclude -ffast-math
 ifeq ($(DEBUG), 1)
-CFLAGS += -O0 -ggdb -DOPENGL_DEBUG
+CFLAGS += -O0 -ggdb
 else
 CFLAGS += -O2 -DNDEBUG
 endif
-- 
cgit v1.2.3


From 581335b095ed820978d4c88f026abf462128eeb0 Mon Sep 17 00:00:00 2001
From: notaz
Date: Sun, 18 Sep 2016 23:58:17 +0300
Subject: drc: enable and fix warnings

these were kept for compat with Ari64's code, which is removed, see
previous commit messages
---
 Makefile | 1 -
 1 file changed, 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index b23d33e..0a3b1fe 100644
--- a/Makefile
+++ b/Makefile
@@ -65,7 +65,6 @@ endif
 OBJS += libpcsxcore/new_dynarec/emu_if.o
 libpcsxcore/new_dynarec/new_dynarec.o: libpcsxcore/new_dynarec/assem_arm.c \
 	libpcsxcore/new_dynarec/pcsxmem_inline.c
-libpcsxcore/new_dynarec/new_dynarec.o: CFLAGS += -Wno-all -Wno-pointer-sign
 ifdef DRC_DBG
 libpcsxcore/new_dynarec/emu_if.o: CFLAGS += -D_FILE_OFFSET_BITS=64
 CFLAGS += -DDRC_DBG
-- 
cgit v1.2.3


From 73081f238a4d80891cf9df5aebeebe3d13c84144 Mon Sep 17 00:00:00 2001
From: Francisco José García García
Date: Mon, 26 Sep 2016 01:03:14 +0200
Subject: (VITA) Dynarec working

---
 Makefile | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 29f02fd..7360770 100644
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,12 @@ CFLAGS += -Wall -Iinclude -ffast-math
 ifeq ($(DEBUG), 1)
 CFLAGS += -O0 -ggdb
 else
+ifeq ($(platform), vita)
+CFLAGS += -O1 -DNDEBUG
+else
 CFLAGS += -O2 -DNDEBUG
 endif
+endif
 CXXFLAGS += $(CFLAGS)
 #DRC_DBG = 1
 #PCNT = 1
-- 
cgit v1.2.3


From 3037393600cc5e63aafe487186025650a6a4d119 Mon Sep 17 00:00:00 2001
From: Francisco José García García
Date: Tue, 27 Sep 2016 00:59:08 +0200
Subject: (VITA) Enable O3 optimizations

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 7360770..600a1d3 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ ifeq ($(DEBUG), 1)
 CFLAGS += -O0 -ggdb
 else
 ifeq ($(platform), vita)
-CFLAGS += -O1 -DNDEBUG
+CFLAGS += -O3 -DNDEBUG
 else
 CFLAGS += -O2 -DNDEBUG
 endif
-- 
cgit v1.2.3


From 6f173b35c963ed131293a898b156c6b51c2c0fe6 Mon Sep 17 00:00:00 2001
From: twinaphex
Date: Tue, 27 Sep 2016 02:56:42 +0200
Subject: Rearrange files for new_dynarec

---
 Makefile | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 600a1d3..46539c5 100644
--- a/Makefile
+++ b/Makefile
@@ -65,18 +65,20 @@ ifeq "$(USE_DYNAREC)" "1"
 OBJS += libpcsxcore/new_dynarec/new_dynarec.o libpcsxcore/new_dynarec/linkage_arm.o
 OBJS += libpcsxcore/new_dynarec/pcsxmem.o
 else
-libpcsxcore/new_dynarec/emu_if.o: CFLAGS += -DDRC_DISABLE
+libpcsxcore/new_dynarec/backends/psx/emu_if.o: CFLAGS += -DDRC_DISABLE
 frontend/libretro.o: CFLAGS += -DDRC_DISABLE
 endif
-OBJS += libpcsxcore/new_dynarec/emu_if.o
-libpcsxcore/new_dynarec/new_dynarec.o: libpcsxcore/new_dynarec/assem_arm.c \
-	libpcsxcore/new_dynarec/pcsxmem_inline.c
+OBJS += libpcsxcore/new_dynarec/backends/psx/emu_if.o
+libpcsxcore/new_dynarec/new_dynarec.o: libpcsxcore/new_dynarec/arm/assem_arm.c \
+	libpcsxcore/new_dynarec/backends/psx/pcsxmem_inline.c
 ifdef DRC_DBG
-libpcsxcore/new_dynarec/emu_if.o: CFLAGS += -D_FILE_OFFSET_BITS=64
+libpcsxcore/new_dynarec/backends/psx/emu_if.o: CFLAGS += -D_FILE_OFFSET_BITS=64
 CFLAGS += -DDRC_DBG
 endif
 ifeq "$(DRC_CACHE_BASE)" "1"
 libpcsxcore/new_dynarec/%.o: CFLAGS += -DBASE_ADDR_FIXED=1
+libpcsxcore/new_dynarec/backends/psx/%.o: CFLAGS += -DBASE_ADDR_FIXED=1
+libpcsxcore/new_dynarec/arm/%.o: CFLAGS += -DBASE_ADDR_FIXED=1
 endif
 
 # spu
-- 
cgit v1.2.3


From 6f7b3633b990b77d940b14a7405affcf1d187b20 Mon Sep 17 00:00:00 2001
From: twinaphex
Date: Tue, 27 Sep 2016 05:20:36 +0200
Subject: Update makefile

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 46539c5..2a6be72 100644
--- a/Makefile
+++ b/Makefile
@@ -62,8 +62,8 @@ libpcsxcore/psxbios.o: CFLAGS += -Wno-nonnull
 
 # dynarec
 ifeq "$(USE_DYNAREC)" "1"
-OBJS += libpcsxcore/new_dynarec/new_dynarec.o libpcsxcore/new_dynarec/linkage_arm.o
-OBJS += libpcsxcore/new_dynarec/pcsxmem.o
+OBJS += libpcsxcore/new_dynarec/new_dynarec.o libpcsxcore/new_dynarec/arm/linkage_arm.o
+OBJS += libpcsxcore/new_dynarec/backends/psx/pcsxmem.o
 else
 libpcsxcore/new_dynarec/backends/psx/emu_if.o: CFLAGS += -DDRC_DISABLE
 frontend/libretro.o: CFLAGS += -DDRC_DISABLE
-- 
cgit v1.2.3