From 30229f6724522f1bc2f35bbaa837294888b4def1 Mon Sep 17 00:00:00 2001 From: Stefanos Kornilios Mitsis Poiitidis Date: Wed, 29 Jul 2015 03:23:08 +0200 Subject: [PATCH 1/4] cl: Fix const warning --- core/cfg/cl.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/cfg/cl.cpp b/core/cfg/cl.cpp index 205fb1ea1..056b4e387 100644 --- a/core/cfg/cl.cpp +++ b/core/cfg/cl.cpp @@ -78,8 +78,9 @@ int setconfig(wchar** arg,int cl) return rv; } - if (value==0) - value=""; + const wchar* constval = value; + if (constval==0) + constval=""; printf("Virtual cfg %s:%s=%s\n",sect,key,value); cfgSetVitual(sect,key,value); From 6ebaa74ffe07644f00592043f0eb7ab93f5412f3 Mon Sep 17 00:00:00 2001 From: Stefanos Kornilios Mitsis Poiitidis Date: Wed, 29 Jul 2015 03:24:51 +0200 Subject: [PATCH 2/4] core.mk: Only android needs deps/libzip/ right now --- core/core.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/core.mk b/core/core.mk index 7f7b391ad..494b68e8f 100755 --- a/core/core.mk +++ b/core/core.mk @@ -8,8 +8,8 @@ RZDCY_SRC_DIR ?= $(call my-dir) RZDCY_MODULES := cfg/ hw/arm7/ hw/aica/ hw/holly/ hw/ hw/gdrom/ hw/maple/ \ hw/mem/ hw/pvr/ hw/sh4/ hw/sh4/interpr/ hw/sh4/modules/ plugins/ profiler/ oslib/ \ - hw/extdev/ hw/arm/ imgread/ linux/ ./ deps/coreio/ deps/zlib/ deps/chdr/ deps/crypto/ deps/libelf/ deps/chdpsr/ arm_emitter/ \ - deps/libzip/ deps/libpng/ rend/ reios/ + hw/extdev/ hw/arm/ imgread/ linux/ ./ deps/coreio/ deps/zlib/ deps/chdr/ deps/crypto/ \ + deps/libelf/ deps/chdpsr/ arm_emitter/ rend/ reios/ deps/libpng/ ifdef WEBUI @@ -48,7 +48,7 @@ else endif ifdef FOR_ANDROID - RZDCY_MODULES += android/ deps/libandroid/ + RZDCY_MODULES += android/ deps/libandroid/ deps/libzip/ endif ifdef FOR_LINUX From a28209cae2b583f7a95d8a80b4442701cbf5ba7c Mon Sep 17 00:00:00 2001 From: Stefanos Kornilios Mitsis Poiitidis Date: Wed, 29 Jul 2015 03:26:08 +0200 Subject: [PATCH 3/4] deps/sha256: memset is in string.h, not memory.h --- core/deps/crypto/sha256.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/deps/crypto/sha256.cpp b/core/deps/crypto/sha256.cpp index a313b7ec1..235cbe1c2 100644 --- a/core/deps/crypto/sha256.cpp +++ b/core/deps/crypto/sha256.cpp @@ -14,7 +14,7 @@ /*************************** HEADER FILES ***************************/ #include -#include +#include #include "sha256.h" #define WORD uint32_t From 2347b95bf2175f85e017df9f9f03459ad48a770f Mon Sep 17 00:00:00 2001 From: Stefanos Kornilios Mitsis Poiitidis Date: Wed, 29 Jul 2015 03:26:58 +0200 Subject: [PATCH 4/4] aica/sgc: fix update_rate warning --- core/hw/aica/sgc_if.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/hw/aica/sgc_if.cpp b/core/hw/aica/sgc_if.cpp index 2709e6cd4..2abcfa806 100755 --- a/core/hw/aica/sgc_if.cpp +++ b/core/hw/aica/sgc_if.cpp @@ -563,7 +563,7 @@ struct ChannelEx { u32 oct=ccd->OCT; - update_rate = 1024 | ccd->FNS; + u32 update_rate = 1024 | ccd->FNS; if (oct& 8) update_rate>>=(16-oct); else