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

Rework the merged library to more easily work on osx.

Browse Source
This commit is contained in:
Relintai 2024-01-18 22:26:48 +01:00
parent 8976ed252c
commit e1961b6547
4 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/merger/join.sh
View File

@ -12,7 +12,7 @@ python tools/merger/join.py --template tools/merger/sfw_core.cpp.inl --path . --
python tools/merger/join.py --template tools/merger/sfw_full.h.inl --path . --output tools/merger/out/full/sfw.h python tools/merger/join.py --template tools/merger/sfw_full.h.inl --path . --output tools/merger/out/full/sfw.h
python tools/merger/join.py --template tools/merger/sfw_full.cpp.inl --path . --output tools/merger/out/full/sfw.cpp python tools/merger/join.py --template tools/merger/sfw_full.cpp.inl --path . --output tools/merger/out/full/sfw.cpp
python tools/merger/join.py --template tools/merger/sfw_3rd_full.x.inl --path . --output tools/merger/out/full/sfw_3rd.h python tools/merger/join.py --template tools/merger/sfw_3rd_full.x.inl --path . --output tools/merger/out/full/sfw_3rd.m
echo "Running clang format!" echo "Running clang format!"

10
tools/merger/sfw_3rd_full.x.inl
View File

@ -4,6 +4,16 @@
{{FILEINLINE:tools/merger/sfw_linceses_core.inl.h}} {{FILEINLINE:tools/merger/sfw_linceses_core.inl.h}}
{{FILEINLINE:tools/merger/sfw_linceses_render_core.inl.h}} {{FILEINLINE:tools/merger/sfw_linceses_render_core.inl.h}}
// On OSX you need to compile this file separately with an objective c compiler
#ifdef __APPLE__
#ifndef SFW_3RD_IMPL
#define SFW_3RD_IMPL
#endif
#endif //__APPLE__
#ifdef SFW_3RD_IMPL #ifdef SFW_3RD_IMPL
#define GLAD_GL_IMPLEMENTATION // glad #define GLAD_GL_IMPLEMENTATION // glad
#endif #endif

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

@ -20,6 +20,9 @@
#include "sfw.h" #include "sfw.h"
#endif #endif
// On OSX sfw_3rd.m has to be compiled manually on Objective C Mode.
#ifndef __APPLE__
#ifndef SFW_3RD_IMPL #ifndef SFW_3RD_IMPL
#define SFW_3RD_IMPL #define SFW_3RD_IMPL
@ -28,7 +31,7 @@
#define Font The_Font_I_dont_care #define Font The_Font_I_dont_care
#endif #endif
#include "sfw_3rd.h" #include "sfw_3rd.m"
#undef CursorShape #undef CursorShape
@ -192,6 +195,8 @@
#endif #endif
#endif // #ifndef __APPLE__
//=================== CORE SECTION =================== //=================== CORE SECTION ===================
{{FILE:sfw/core/ucaps.h}} {{FILE:sfw/core/ucaps.h}}

2
tools/merger/sfw_full.h.inl
View File

@ -818,7 +818,7 @@
#endif #endif
#ifndef GLAD_GL_H_ #ifndef GLAD_GL_H_
#include "sfw_3rd.h" #include "sfw_3rd.m"
#endif #endif
#endif #endif