all repos — mgba @ d2ff393aa00e928d343e81b07e26cc54910896e8

mGBA Game Boy Advance Emulator

Merge branch 'master' into medusa
Vicki Pfau vi@endrift.com
Sat, 18 Jul 2020 00:33:21 -0700
commit

d2ff393aa00e928d343e81b07e26cc54910896e8

parent

c18a35b447ee4b0b3d7261c4e36172d5c8ff807a

2 files changed, 2 insertions(+), 2 deletions(-)

jump to
M include/mgba/internal/gb/input.h → include/mgba/internal/gb/input.h 
@@ -12,7 +12,7 @@ CXX_GUARD_START
 
 #include <mgba/core/input.h>
 
-extern const struct mInputPlatformInfo GBInputInfo;
+extern MGBA_EXPORT const struct mInputPlatformInfo GBInputInfo;
 
 enum GBKey {
 	GB_KEY_A = 0,
M src/platform/test/cinema-main.c → src/platform/test/cinema-main.c 
@@ -830,7 +830,7 @@ CIlog(1, "skip\n");
 				break;
 			case CI_ERROR:
 				status = 1;
-				CIlog(1, "error");
+				CIlog(1, "error\n");
 				break;
 			}
 			if (test->failedFrames) {