Apple-2-Tools
/
gsplus
mirror of https://github.com/digarok/gsplus.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into ks-master

This commit is contained in:
Dagen Brock 2019-05-11 10:15:23 -05:00 committed by GitHub
parent 5d70ec1a6c c20361a66d
commit 1c4ed18142
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/defc.h
View File

@ -8,8 +8,6 @@
#include "defcomm.h"
#include <stdint.h>
#include <stdint.h>
// OG redirect printf to console
#ifdef ACTIVEGS
#include <stdio.h>
@ -233,6 +231,7 @@ STRUCT(Emustate_word32list) {
};
#define ALTZP (g_c068_statereg & 0x80)
/* #define PAGE2 (g_c068_statereg & 0x40) */
#define RAMRD (g_c068_statereg & 0x20)

2
src/win_console.c
View File

@ -349,6 +349,8 @@ int main(int argc, char **argv) {
hook = SetWindowsHookEx(WH_KEYBOARD_LL, win_ll_keyboard, NULL, 0);
hook = SetWindowsHookEx(WH_KEYBOARD_LL, win_ll_keyboard, NULL, 0);
gsportinit(hwnd);
int ret = gsplusmain(argc, argv);