mirror of
https://github.com/digarok/gsplus.git
synced 2024-06-14 03:29:32 +00:00
Merge branch 'master' into ks-master
This commit is contained in:
commit
1c4ed18142
|
@ -8,8 +8,6 @@
|
||||||
#include "defcomm.h"
|
#include "defcomm.h"
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
#include <stdint.h>
|
|
||||||
|
|
||||||
// OG redirect printf to console
|
// OG redirect printf to console
|
||||||
#ifdef ACTIVEGS
|
#ifdef ACTIVEGS
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
@ -233,6 +231,7 @@ STRUCT(Emustate_word32list) {
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#define ALTZP (g_c068_statereg & 0x80)
|
#define ALTZP (g_c068_statereg & 0x80)
|
||||||
/* #define PAGE2 (g_c068_statereg & 0x40) */
|
/* #define PAGE2 (g_c068_statereg & 0x40) */
|
||||||
#define RAMRD (g_c068_statereg & 0x20)
|
#define RAMRD (g_c068_statereg & 0x20)
|
||||||
|
|
|
@ -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);
|
||||||
|
|
||||||
|
hook = SetWindowsHookEx(WH_KEYBOARD_LL, win_ll_keyboard, NULL, 0);
|
||||||
|
|
||||||
gsportinit(hwnd);
|
gsportinit(hwnd);
|
||||||
int ret = gsplusmain(argc, argv);
|
int ret = gsplusmain(argc, argv);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user