Relintai/sfw
1
0
Fork 0
mirror of https://github.com/Relintai/sfw.git synced 2025-01-03 05:09:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix amalgamated build on osx.

Browse Source
This commit is contained in:
Relintai 2024-09-14 21:38:18 +02:00
parent c94d218250
commit 5bb3d5bccf
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sfw/render_gui/imgui_impl_opengl3.cpp
View File

@ -177,7 +177,11 @@
// Vertex arrays are not supported on ES2/WebGL1 unless Emscripten which uses an extension // Vertex arrays are not supported on ES2/WebGL1 unless Emscripten which uses an extension
#ifndef IMGUI_IMPL_OPENGL_ES2 #ifndef IMGUI_IMPL_OPENGL_ES2
#idndef __APPLE__
#define IMGUI_IMPL_OPENGL_USE_VERTEX_ARRAY #define IMGUI_IMPL_OPENGL_USE_VERTEX_ARRAY
#endif
#elif defined(__EMSCRIPTEN__) #elif defined(__EMSCRIPTEN__)
#define IMGUI_IMPL_OPENGL_USE_VERTEX_ARRAY #define IMGUI_IMPL_OPENGL_USE_VERTEX_ARRAY
#define glBindVertexArray glBindVertexArrayOES #define glBindVertexArray glBindVertexArrayOES

4
tools/merger/sfw_3rd.x.inl
View File

@ -30,8 +30,12 @@
#ifdef SFW_3RD_IMPL #ifdef SFW_3RD_IMPL
#define STB_TRUETYPE_IMPLEMENTATION #define STB_TRUETYPE_IMPLEMENTATION
#define STB_RECT_PACK_IMPLEMENTATION
#define IMGUI_DISABLE_STB_RECT_PACK_IMPLEMENTATION
#endif //SFW_3RD_IMPL #endif //SFW_3RD_IMPL
{{FILE:sfw/render_gui/imstb_rectpack.h}}
{{FILE:sfw/render_core/3rd_stb_truetype.h}} {{FILE:sfw/render_core/3rd_stb_truetype.h}}
#ifdef SFW_3RD_IMPL #ifdef SFW_3RD_IMPL

6
tools/merger/sfw_full.cpp.inl
View File

@ -1007,6 +1007,12 @@ static void stb_textedit_replace(ImGuiInputTextState* str, STB_TexteditState* st
//--STRIP //--STRIP
{{FILE:sfw/render_gui/imgui_tables.cpp}} {{FILE:sfw/render_gui/imgui_tables.cpp}}
//#define STBRP_STATIC
//#define STBRP_ASSERT(x) do { IM_ASSERT(x); } while (0)
//#define STBRP_SORT ImQsort
//#define STB_RECT_PACK_IMPLEMENTATION
//{{F I L E:sfw/render_gui/imstb_rectpack.h}}
//--STRIP //--STRIP
//#include "imgui.h" //#include "imgui.h"
//#include "imgui_internal.h" //#include "imgui_internal.h"