Added stringifying escape & F keys; add sound, sys FFI; unconflict time.h and timer.h
This commit is contained in:
parent
44d503ae22
commit
3010ce17e5
|
@ -104,11 +104,6 @@ void win_key_callback(GLFWwindow *w, int key, int scancode, int action, int mods
|
||||||
case GLFW_KEY_DOWN:
|
case GLFW_KEY_DOWN:
|
||||||
kkey = "down";
|
kkey = "down";
|
||||||
break;
|
break;
|
||||||
<<<<<<< HEAD
|
|
||||||
}
|
|
||||||
|
|
||||||
strcat(keystr, kkey);
|
|
||||||
=======
|
|
||||||
|
|
||||||
case GLFW_KEY_LEFT_SHIFT:
|
case GLFW_KEY_LEFT_SHIFT:
|
||||||
kkey = "lshift";
|
kkey = "lshift";
|
||||||
|
|
Loading…
Reference in a new issue