mirror of
https://github.com/ClassiCube/ClassiCube.git
synced 2025-01-22 09:01:57 -05:00
Move autogenerated header files out of src directory
This commit is contained in:
parent
ce20154942
commit
0e993ff6d4
8 changed files with 15 additions and 10 deletions
|
@ -3,7 +3,7 @@
|
|||
#include "_GraphicsBase.h"
|
||||
#include "Errors.h"
|
||||
#include "Window.h"
|
||||
#include "_D3D11Shaders.h"
|
||||
#include "../misc/windows/D3D11Shaders.h"
|
||||
|
||||
/* Avoid pointless includes */
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
|
|
11
src/Menus.c
11
src/Menus.c
|
@ -1943,14 +1943,19 @@ static struct KeyBindsScreen {
|
|||
|
||||
static struct Widget* key_widgets[KEYBINDS_MAX_BTNS + 5];
|
||||
|
||||
static BindMapping KeyBindsScreen_GetBinding(struct KeyBindsScreen* s, int i) {
|
||||
const BindMapping* curBinds;
|
||||
|
||||
curBinds = binds_gamepad ? PadBind_Mappings : KeyBind_Mappings;
|
||||
return curBinds[s->binds[i]];
|
||||
}
|
||||
|
||||
static void KeyBindsScreen_Update(struct KeyBindsScreen* s, int i) {
|
||||
cc_string text; char textBuffer[STRING_SIZE];
|
||||
const BindMapping* curBinds;
|
||||
BindMapping curBind;
|
||||
|
||||
String_InitArray(text, textBuffer);
|
||||
curBinds = binds_gamepad ? PadBind_Mappings : KeyBind_Mappings;
|
||||
curBind = curBinds[s->binds[i]];
|
||||
curBind = KeyBindsScreen_GetBinding(s, i);
|
||||
|
||||
String_Format4(&text, s->curI == i ? "> %c: %c%c%c <" : "%c: %c%c%c",
|
||||
s->descs[i],
|
||||
|
|
|
@ -206,9 +206,9 @@ static void VirtualKeyboard_ProcessDown(void* obj, int key, cc_bool was) {
|
|||
} else if (key == CCPAD_X) {
|
||||
VirtualKeyboard_Backspace();
|
||||
} else if (key == CCPAD_Y) {
|
||||
VirtualKeyboard_AppendChar(' ');
|
||||
} else if (key == CCPAD_L) {
|
||||
VirtualKeyboard_AppendChar('@');
|
||||
} else if (key == CCPAD_L) {
|
||||
VirtualKeyboard_AppendChar(' ');
|
||||
} else if (key == CCPAD_R) {
|
||||
VirtualKeyboard_AppendChar('/');
|
||||
}
|
||||
|
|
|
@ -309,8 +309,8 @@ void Window_Init(void) {
|
|||
void Window_Free(void) { }
|
||||
|
||||
#ifdef CC_BUILD_ICON
|
||||
/* See misc/linux_icon_gen.cs for how to generate this file */
|
||||
#include "_CCIcon_X11.h"
|
||||
/* See misc/linux/linux_icon_gen.cs for how to generate this file */
|
||||
#include "../misc/linux/CCIcon_X11.h"
|
||||
|
||||
static void ApplyIcon(void) {
|
||||
Atom net_wm_icon = XInternAtom(win_display, "_NET_WM_ICON", false);
|
||||
|
|
|
@ -322,8 +322,8 @@ static void MakeContentView(void) {
|
|||
}
|
||||
|
||||
#ifdef CC_BUILD_ICON
|
||||
// See misc/mac_icon_gen.cs for how to generate this file
|
||||
#include "_CCIcon_mac.h"
|
||||
// See misc/macOS/mac_icon_gen.cs for how to generate this file
|
||||
#include "../misc/macOS/CCIcon_mac.h"
|
||||
|
||||
static void ApplyIcon(void) {
|
||||
NSImage* img;
|
||||
|
|
Loading…
Reference in a new issue