mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 12:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

organize nuklear files in their own subfolder

Browse Source
This commit is contained in:
radius 2016-05-25 18:45:35 -05:00
parent abbd269f02
commit ddeb2b5ac0
7 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.common
View File

@ -421,8 +421,8 @@ ifeq ($(HAVE_MATERIALUI), 1)
DEFINES += -DHAVE_MATERIALUI
endif
ifeq ($(HAVE_NUKLEAR), 1)
OBJ += menu/drivers/nk_common.o
OBJ += menu/drivers/nk_menu.o
OBJ += menu/drivers/nuklear/nk_common.o
OBJ += menu/drivers/nuklear/nk_menu.o
OBJ += menu/drivers/nuklear.o
DEFINES += -DHAVE_NUKLEAR
endif

4
griffin/griffin.c
View File

@ -915,8 +915,8 @@ MENU
#endif
#ifdef HAVE_NUKLEAR
#include "../menu/drivers/nk_common.c"
#include "../menu/drivers/nk_menu.c"
#include "../menu/drivers/nuklear/nk_common.c"
#include "../menu/drivers/nuklear/nk_menu.c"
#include "../menu/drivers/nuklear.c"
#endif

2
menu/drivers/nuklear.c
View File

@ -32,7 +32,7 @@
#include <lists/string_list.h>
#include "menu_generic.h"
#include "nk_menu.h"
#include "nuklear/nk_menu.h"
#include "../menu_driver.h"
#include "../menu_animation.h"

10
menu/drivers/nk_common.c → menu/drivers/nuklear/nk_common.c
View File

@ -27,11 +27,11 @@
#include "nk_common.h"
#include "../menu_display.h"
#include "../../gfx/video_shader_driver.h"
#include "../../menu_display.h"
#include "../../../gfx/video_shader_driver.h"
#include "../../gfx/drivers/gl_shaders/pipeline_nuklear.glsl.vert.h"
#include "../../gfx/drivers/gl_shaders/pipeline_nuklear.glsl.frag.h"
#include "../../../gfx/drivers/gl_shaders/pipeline_nuklear.glsl.vert.h"
#include "../../../gfx/drivers/gl_shaders/pipeline_nuklear.glsl.frag.h"
struct nk_font *font;
struct nk_font_atlas atlas;
@ -69,7 +69,7 @@ char* nk_common_file_load(const char* path, size_t* size)
return (char*)buf;
}
NK_API void nk_common_device_init(struct nk_device *dev)
void nk_common_device_init(struct nk_device *dev)
{
#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES)
GLint status;

6
menu/drivers/nk_common.h → menu/drivers/nuklear/nk_common.h
View File

@ -23,11 +23,11 @@
#define NK_INCLUDE_DEFAULT_FONT
#include <string.h>
#include "../../deps/nuklear/nuklear.h"
#include "../../deps/stb/stb_image.h"
#include "../../../deps/nuklear/nuklear.h"
#include "../../../deps/stb/stb_image.h"
#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES)
#include "../../gfx/common/gl_common.h"
#include "../../../gfx/common/gl_common.h"
#endif
#define MAX_VERTEX_MEMORY (512 * 1024)

22
menu/drivers/nk_menu.c → menu/drivers/nuklear/nk_menu.c
View File

@ -28,26 +28,26 @@
#include <string/stdstring.h>
#include <lists/string_list.h>
#include "../menu_driver.h"
#include "../menu_hash.h"
#include "../../menu_driver.h"
#include "../../menu_hash.h"
#include "../../gfx/common/gl_common.h"
#include "../../core_info.h"
#include "../../configuration.h"
#include "../../retroarch.h"
#include "../../../gfx/common/gl_common.h"
#include "../../../core_info.h"
#include "../../../configuration.h"
#include "../../../retroarch.h"
#define LEN(a) (sizeof(a)/sizeof(a)[0])
void nk_menu_set_state(nk_menu_handle_t *zr, const int id,
void nk_menu_wnd_set_state(nk_menu_handle_t *zr, const int id,
struct nk_vec2 pos, struct nk_vec2 size)
{
zr->window[id].position = pos;
zr->window[id].size = size;
}
void nk_menu_get_state(nk_menu_handle_t *zr, const int id,
void nk_menu_wnd_get_state(nk_menu_handle_t *zr, const int id,
struct nk_vec2 *pos, struct nk_vec2 *size)
{
*pos = zr->window[id].position;
@ -97,7 +97,7 @@ void nk_menu_wnd_shader_parameters(nk_menu_handle_t *zr)
}
}
/* save position and size to restore after context reset */
nk_menu_set_state(zr, id, nk_window_get_position(ctx), nk_window_get_size(ctx));
nk_menu_wnd_set_state(zr, id, nk_window_get_position(ctx), nk_window_get_size(ctx));
nk_end(ctx);
}
@ -138,7 +138,7 @@ void nk_menu_wnd_test(nk_menu_handle_t *zr)
size = menu_entries_get_size();
}
/* save position and size to restore after context reset */
nk_menu_set_state(zr, id, nk_window_get_position(ctx), nk_window_get_size(ctx));
nk_menu_wnd_set_state(zr, id, nk_window_get_position(ctx), nk_window_get_size(ctx));
nk_end(ctx);
}
@ -168,7 +168,7 @@ void nk_menu_wnd_main(nk_menu_handle_t *zr)
/* save position and size to restore after context reset */
nk_menu_set_state(zr, id, nk_window_get_position(ctx), nk_window_get_size(ctx));
nk_menu_wnd_set_state(zr, id, nk_window_get_position(ctx), nk_window_get_size(ctx));
if (zr->size_changed)
nk_window_set_size(ctx, nk_vec2(nk_window_get_size(ctx).x, zr->size.y));

4
menu/drivers/nk_menu.h → menu/drivers/nuklear/nk_menu.h
View File

@ -16,8 +16,8 @@
*/
#include "nk_common.h"
#include "../menu_display.h"
#include "../menu_input.h"
#include "../../menu_display.h"
#include "../../menu_input.h"
enum
{