mirror of
https://github.com/Relintai/sfw.git
synced 2025-01-30 22:59:17 +01:00
More work on the merger templates.
This commit is contained in:
parent
994ce2b842
commit
eb61466024
@ -2,8 +2,6 @@
|
||||
|
||||
//Add the implementation unroll macros here before including sfw.h
|
||||
|
||||
//#include "sfw.h"
|
||||
|
||||
#include <cstdio>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
@ -16,6 +14,14 @@
|
||||
#include <cstdint>
|
||||
#include <memory.h>
|
||||
|
||||
#ifndef SFW_H
|
||||
#include "sfw.h"
|
||||
#endif
|
||||
|
||||
#ifndef SFW_3RD_H
|
||||
#define SFW_3RD_H
|
||||
#include "sfw"
|
||||
#endif
|
||||
|
||||
{{FILE:sfw/core/ucaps.h}}
|
||||
|
||||
@ -178,6 +184,10 @@
|
||||
//--STRIP
|
||||
{{FILE:sfw/core/vector4.cpp}}
|
||||
|
||||
//--STRIP
|
||||
//=================== OBJECT SECTION ===================
|
||||
//--STRIP
|
||||
|
||||
//--STRIP
|
||||
//#include "resource.h"
|
||||
//--STRIP
|
||||
@ -242,6 +252,10 @@
|
||||
//--STRIP
|
||||
{{FILE:sfw/object/variant_op.cpp}}
|
||||
|
||||
//--STRIP
|
||||
//=================== RENDER CORE SECTION ===================
|
||||
//--STRIP
|
||||
|
||||
{{FILE:sfw/render_core/font_data_bm_mini.inc.h}}
|
||||
{{FILE:sfw/render_core/font_data_tables.inc.h}}
|
||||
|
||||
@ -362,6 +376,10 @@
|
||||
//--STRIP
|
||||
{{FILE:sfw/render_core/input.cpp}}
|
||||
|
||||
//--STRIP
|
||||
//=================== RENDER IMMEDIATE SECTION ===================
|
||||
//--STRIP
|
||||
|
||||
//--STRIP
|
||||
//#include "renderer.h"
|
||||
//#include "render_core/color_material_2d.h"
|
||||
@ -376,6 +394,10 @@
|
||||
//--STRIP
|
||||
{{FILE:sfw/render_immediate/renderer.cpp}}
|
||||
|
||||
//--STRIP
|
||||
//=================== RENDER OBJCTS SECTION ===================
|
||||
//--STRIP
|
||||
|
||||
//--STRIP
|
||||
//#include "render_objects/camera_3d.h"
|
||||
//#include "core/math_funcs.h"
|
||||
|
@ -25,38 +25,33 @@ SOFTWARE.
|
||||
|
||||
// TODO gather all licenses to here
|
||||
|
||||
|
||||
|
||||
#ifdef SFW_3RD_H
|
||||
#define GLAD_GL_IMPLEMENTATION // glad
|
||||
#endif
|
||||
|
||||
//Add implementation defines
|
||||
|
||||
|
||||
#define GLAD_GL_IMPLEMENTATION // glad
|
||||
{{FILE:sfw/render_core/3rd_glad.h}}
|
||||
|
||||
#ifdef SFW_3RD_H
|
||||
#define STB_TRUETYPE_IMPLEMENTATION
|
||||
#endif
|
||||
|
||||
{{FILE:sfw/render_core/3rd_stb_truetype.h}}
|
||||
|
||||
|
||||
|
||||
#ifdef SFW_3RD_H
|
||||
#define STB_IMAGE_IMPLEMENTATION // stbi
|
||||
#define STB_IMAGE_WRITE_IMPLEMENTATION // stbi_write
|
||||
#define STB_SPRINTF_IMPLEMENTATION // stb_sprintf
|
||||
#define STB_SPRINTF_NOUNALIGNED // stb_sprintf
|
||||
#endif
|
||||
|
||||
{{FILE:sfw/render_core/3rd_stb_image.h}}
|
||||
|
||||
//{//{//FILE:sfw/render_core/stb_image_write.h}}
|
||||
//---
|
||||
#undef freelist
|
||||
//#define STBTT_malloc(x, u) ((void)(u), MALLOC(x))
|
||||
//#define STBTT_free(x, u) ((void)(u), FREE(x))
|
||||
//#define NK_ASSERT ASSERT
|
||||
//#define NK_DTOA(s, n) strcpy(s, va("%f", n)) // override cos built-in nk_dtoa() will freeze while parsing UINT_MAX otherwise
|
||||
|
||||
|
||||
#ifdef SFW_3RD_H
|
||||
#define _GLFW_IMPLEMENTATION // glfw337
|
||||
#define GLFW_INCLUDE_NONE // glfw337
|
||||
#ifdef __APPLE__
|
||||
@ -66,6 +61,7 @@ SOFTWARE.
|
||||
#else
|
||||
#define _GLFW_X11 // glfw linux, also _GLFW_OSMESA or _GLFW_WAYLAND
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#undef _GNU_SOURCE
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user