b/minifb-zig-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into ios_tmp

Browse Source 
* master:
  fix issue on macos x
This commit is contained in:
Carlos Aragones
2020-04-26 17:44:52 +02:00
parent fdd7d8bedb d0dd063b8f
commit 5981107bdd
5 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/MiniFB_common.c
View File

@ -565,6 +565,9 @@ mfb_get_key_name(mfb_key key) {
case KB_KEY_MENU:
return "Menu";
case KB_KEY_UNKNOWN:
return "Unknown";
}
return "Unknown";
}

2
src/MiniFB_internal.h
View File

@ -18,7 +18,7 @@ extern "C" {
#endif
extern short int g_keycodes[512];
void init_keycodes();
void init_keycodes(void);
void keyboard_default(struct mfb_window *window, mfb_key key, mfb_key_mod mod, bool isPressed);
#if defined(__cplusplus)

5
src/MiniFB_linux.c
View File

@ -1,3 +1,5 @@
#if defined(__linux__)
#include <time.h>
#include <MiniFB.h>
@ -30,3 +32,6 @@ mfb_timer_init() {
}
g_timer_resolution = 1.0 / g_timer_frequency;
}
#endif

4
src/MiniFB_timer.c
View File

@ -8,8 +8,8 @@ double g_timer_resolution;
double g_time_for_frame = 1.0 / 60.0;
//-------------------------------------
extern uint64_t mfb_timer_tick();
extern void mfb_timer_init();
extern uint64_t mfb_timer_tick(void);
extern void mfb_timer_init(void);
//-------------------------------------
void