mirror of
https://github.com/Relintai/sfw.git
synced 2025-01-09 21:19:36 +01:00
Fix amalgamated build.
This commit is contained in:
parent
843dc6baf3
commit
796b22f0b0
@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
//--STRIP
|
//--STRIP
|
||||||
#include "psignal.h"
|
#include "psignal.h"
|
||||||
//--STRIP
|
//--STRIP
|
||||||
|
@ -1502,14 +1502,14 @@ void Image::create(const char **p_xpm) {
|
|||||||
mipmaps = false;
|
mipmaps = false;
|
||||||
bool has_alpha = false;
|
bool has_alpha = false;
|
||||||
|
|
||||||
enum Status {
|
enum ImageXPMStatus {
|
||||||
READING_HEADER,
|
READING_HEADER,
|
||||||
READING_COLORS,
|
READING_COLORS,
|
||||||
READING_PIXELS,
|
READING_PIXELS,
|
||||||
DONE
|
DONE
|
||||||
};
|
};
|
||||||
|
|
||||||
Status status = READING_HEADER;
|
ImageXPMStatus status = READING_HEADER;
|
||||||
int line = 0;
|
int line = 0;
|
||||||
|
|
||||||
HashMap<String, Color> colormap;
|
HashMap<String, Color> colormap;
|
||||||
|
@ -19,119 +19,119 @@
|
|||||||
modifiers. This way everything (char/keycode) can fit nicely in one 32 bits unsigned integer.
|
modifiers. This way everything (char/keycode) can fit nicely in one 32 bits unsigned integer.
|
||||||
*/
|
*/
|
||||||
enum {
|
enum {
|
||||||
SPKEY = (1 << 24)
|
KEYBOARD_SPKEY = (1 << 24)
|
||||||
};
|
};
|
||||||
|
|
||||||
enum KeyList {
|
enum KeyList {
|
||||||
/* CURSOR/FUNCTION/BROWSER/MULTIMEDIA/MISC KEYS */
|
/* CURSOR/FUNCTION/BROWSER/MULTIMEDIA/MISC KEYS */
|
||||||
KEY_ESCAPE = SPKEY | 0x01,
|
KEY_ESCAPE = KEYBOARD_SPKEY | 0x01,
|
||||||
KEY_TAB = SPKEY | 0x02,
|
KEY_TAB = KEYBOARD_SPKEY | 0x02,
|
||||||
KEY_BACKTAB = SPKEY | 0x03,
|
KEY_BACKTAB = KEYBOARD_SPKEY | 0x03,
|
||||||
KEY_BACKSPACE = SPKEY | 0x04,
|
KEY_BACKSPACE = KEYBOARD_SPKEY | 0x04,
|
||||||
KEY_ENTER = SPKEY | 0x05,
|
KEY_ENTER = KEYBOARD_SPKEY | 0x05,
|
||||||
KEY_KP_ENTER = SPKEY | 0x06,
|
KEY_KP_ENTER = KEYBOARD_SPKEY | 0x06,
|
||||||
KEY_INSERT = SPKEY | 0x07,
|
KEY_INSERT = KEYBOARD_SPKEY | 0x07,
|
||||||
KEY_DELETE = SPKEY | 0x08,
|
KEY_DELETE = KEYBOARD_SPKEY | 0x08,
|
||||||
KEY_PAUSE = SPKEY | 0x09,
|
KEY_PAUSE = KEYBOARD_SPKEY | 0x09,
|
||||||
KEY_PRINT = SPKEY | 0x0A,
|
KEY_PRINT = KEYBOARD_SPKEY | 0x0A,
|
||||||
KEY_SYSREQ = SPKEY | 0x0B,
|
KEY_SYSREQ = KEYBOARD_SPKEY | 0x0B,
|
||||||
KEY_CLEAR = SPKEY | 0x0C,
|
KEY_CLEAR = KEYBOARD_SPKEY | 0x0C,
|
||||||
KEY_HOME = SPKEY | 0x0D,
|
KEY_HOME = KEYBOARD_SPKEY | 0x0D,
|
||||||
KEY_END = SPKEY | 0x0E,
|
KEY_END = KEYBOARD_SPKEY | 0x0E,
|
||||||
KEY_LEFT = SPKEY | 0x0F,
|
KEY_LEFT = KEYBOARD_SPKEY | 0x0F,
|
||||||
KEY_UP = SPKEY | 0x10,
|
KEY_UP = KEYBOARD_SPKEY | 0x10,
|
||||||
KEY_RIGHT = SPKEY | 0x11,
|
KEY_RIGHT = KEYBOARD_SPKEY | 0x11,
|
||||||
KEY_DOWN = SPKEY | 0x12,
|
KEY_DOWN = KEYBOARD_SPKEY | 0x12,
|
||||||
KEY_PAGEUP = SPKEY | 0x13,
|
KEY_PAGEUP = KEYBOARD_SPKEY | 0x13,
|
||||||
KEY_PAGEDOWN = SPKEY | 0x14,
|
KEY_PAGEDOWN = KEYBOARD_SPKEY | 0x14,
|
||||||
KEY_SHIFT = SPKEY | 0x15,
|
KEY_SHIFT = KEYBOARD_SPKEY | 0x15,
|
||||||
KEY_CONTROL = SPKEY | 0x16,
|
KEY_CONTROL = KEYBOARD_SPKEY | 0x16,
|
||||||
KEY_META = SPKEY | 0x17,
|
KEY_META = KEYBOARD_SPKEY | 0x17,
|
||||||
KEY_ALT = SPKEY | 0x18,
|
KEY_ALT = KEYBOARD_SPKEY | 0x18,
|
||||||
KEY_CAPSLOCK = SPKEY | 0x19,
|
KEY_CAPSLOCK = KEYBOARD_SPKEY | 0x19,
|
||||||
KEY_NUMLOCK = SPKEY | 0x1A,
|
KEY_NUMLOCK = KEYBOARD_SPKEY | 0x1A,
|
||||||
KEY_SCROLLLOCK = SPKEY | 0x1B,
|
KEY_SCROLLLOCK = KEYBOARD_SPKEY | 0x1B,
|
||||||
KEY_F1 = SPKEY | 0x1C,
|
KEY_F1 = KEYBOARD_SPKEY | 0x1C,
|
||||||
KEY_F2 = SPKEY | 0x1D,
|
KEY_F2 = KEYBOARD_SPKEY | 0x1D,
|
||||||
KEY_F3 = SPKEY | 0x1E,
|
KEY_F3 = KEYBOARD_SPKEY | 0x1E,
|
||||||
KEY_F4 = SPKEY | 0x1F,
|
KEY_F4 = KEYBOARD_SPKEY | 0x1F,
|
||||||
KEY_F5 = SPKEY | 0x20,
|
KEY_F5 = KEYBOARD_SPKEY | 0x20,
|
||||||
KEY_F6 = SPKEY | 0x21,
|
KEY_F6 = KEYBOARD_SPKEY | 0x21,
|
||||||
KEY_F7 = SPKEY | 0x22,
|
KEY_F7 = KEYBOARD_SPKEY | 0x22,
|
||||||
KEY_F8 = SPKEY | 0x23,
|
KEY_F8 = KEYBOARD_SPKEY | 0x23,
|
||||||
KEY_F9 = SPKEY | 0x24,
|
KEY_F9 = KEYBOARD_SPKEY | 0x24,
|
||||||
KEY_F10 = SPKEY | 0x25,
|
KEY_F10 = KEYBOARD_SPKEY | 0x25,
|
||||||
KEY_F11 = SPKEY | 0x26,
|
KEY_F11 = KEYBOARD_SPKEY | 0x26,
|
||||||
KEY_F12 = SPKEY | 0x27,
|
KEY_F12 = KEYBOARD_SPKEY | 0x27,
|
||||||
KEY_F13 = SPKEY | 0x28,
|
KEY_F13 = KEYBOARD_SPKEY | 0x28,
|
||||||
KEY_F14 = SPKEY | 0x29,
|
KEY_F14 = KEYBOARD_SPKEY | 0x29,
|
||||||
KEY_F15 = SPKEY | 0x2A,
|
KEY_F15 = KEYBOARD_SPKEY | 0x2A,
|
||||||
KEY_F16 = SPKEY | 0x2B,
|
KEY_F16 = KEYBOARD_SPKEY | 0x2B,
|
||||||
KEY_KP_MULTIPLY = SPKEY | 0x81,
|
KEY_KP_MULTIPLY = KEYBOARD_SPKEY | 0x81,
|
||||||
KEY_KP_DIVIDE = SPKEY | 0x82,
|
KEY_KP_DIVIDE = KEYBOARD_SPKEY | 0x82,
|
||||||
KEY_KP_SUBTRACT = SPKEY | 0x83,
|
KEY_KP_SUBTRACT = KEYBOARD_SPKEY | 0x83,
|
||||||
KEY_KP_PERIOD = SPKEY | 0x84,
|
KEY_KP_PERIOD = KEYBOARD_SPKEY | 0x84,
|
||||||
KEY_KP_ADD = SPKEY | 0x85,
|
KEY_KP_ADD = KEYBOARD_SPKEY | 0x85,
|
||||||
KEY_KP_0 = SPKEY | 0x86,
|
KEY_KP_0 = KEYBOARD_SPKEY | 0x86,
|
||||||
KEY_KP_1 = SPKEY | 0x87,
|
KEY_KP_1 = KEYBOARD_SPKEY | 0x87,
|
||||||
KEY_KP_2 = SPKEY | 0x88,
|
KEY_KP_2 = KEYBOARD_SPKEY | 0x88,
|
||||||
KEY_KP_3 = SPKEY | 0x89,
|
KEY_KP_3 = KEYBOARD_SPKEY | 0x89,
|
||||||
KEY_KP_4 = SPKEY | 0x8A,
|
KEY_KP_4 = KEYBOARD_SPKEY | 0x8A,
|
||||||
KEY_KP_5 = SPKEY | 0x8B,
|
KEY_KP_5 = KEYBOARD_SPKEY | 0x8B,
|
||||||
KEY_KP_6 = SPKEY | 0x8C,
|
KEY_KP_6 = KEYBOARD_SPKEY | 0x8C,
|
||||||
KEY_KP_7 = SPKEY | 0x8D,
|
KEY_KP_7 = KEYBOARD_SPKEY | 0x8D,
|
||||||
KEY_KP_8 = SPKEY | 0x8E,
|
KEY_KP_8 = KEYBOARD_SPKEY | 0x8E,
|
||||||
KEY_KP_9 = SPKEY | 0x8F,
|
KEY_KP_9 = KEYBOARD_SPKEY | 0x8F,
|
||||||
KEY_SUPER_L = SPKEY | 0x2C,
|
KEY_SUPER_L = KEYBOARD_SPKEY | 0x2C,
|
||||||
KEY_SUPER_R = SPKEY | 0x2D,
|
KEY_SUPER_R = KEYBOARD_SPKEY | 0x2D,
|
||||||
KEY_MENU = SPKEY | 0x2E,
|
KEY_MENU = KEYBOARD_SPKEY | 0x2E,
|
||||||
KEY_HYPER_L = SPKEY | 0x2F,
|
KEY_HYPER_L = KEYBOARD_SPKEY | 0x2F,
|
||||||
KEY_HYPER_R = SPKEY | 0x30,
|
KEY_HYPER_R = KEYBOARD_SPKEY | 0x30,
|
||||||
KEY_HELP = SPKEY | 0x31,
|
KEY_HELP = KEYBOARD_SPKEY | 0x31,
|
||||||
KEY_DIRECTION_L = SPKEY | 0x32,
|
KEY_DIRECTION_L = KEYBOARD_SPKEY | 0x32,
|
||||||
KEY_DIRECTION_R = SPKEY | 0x33,
|
KEY_DIRECTION_R = KEYBOARD_SPKEY | 0x33,
|
||||||
KEY_BACK = SPKEY | 0x40,
|
KEY_BACK = KEYBOARD_SPKEY | 0x40,
|
||||||
KEY_FORWARD = SPKEY | 0x41,
|
KEY_FORWARD = KEYBOARD_SPKEY | 0x41,
|
||||||
KEY_STOP = SPKEY | 0x42,
|
KEY_STOP = KEYBOARD_SPKEY | 0x42,
|
||||||
KEY_REFRESH = SPKEY | 0x43,
|
KEY_REFRESH = KEYBOARD_SPKEY | 0x43,
|
||||||
KEY_VOLUMEDOWN = SPKEY | 0x44,
|
KEY_VOLUMEDOWN = KEYBOARD_SPKEY | 0x44,
|
||||||
KEY_VOLUMEMUTE = SPKEY | 0x45,
|
KEY_VOLUMEMUTE = KEYBOARD_SPKEY | 0x45,
|
||||||
KEY_VOLUMEUP = SPKEY | 0x46,
|
KEY_VOLUMEUP = KEYBOARD_SPKEY | 0x46,
|
||||||
KEY_BASSBOOST = SPKEY | 0x47,
|
KEY_BASSBOOST = KEYBOARD_SPKEY | 0x47,
|
||||||
KEY_BASSUP = SPKEY | 0x48,
|
KEY_BASSUP = KEYBOARD_SPKEY | 0x48,
|
||||||
KEY_BASSDOWN = SPKEY | 0x49,
|
KEY_BASSDOWN = KEYBOARD_SPKEY | 0x49,
|
||||||
KEY_TREBLEUP = SPKEY | 0x4A,
|
KEY_TREBLEUP = KEYBOARD_SPKEY | 0x4A,
|
||||||
KEY_TREBLEDOWN = SPKEY | 0x4B,
|
KEY_TREBLEDOWN = KEYBOARD_SPKEY | 0x4B,
|
||||||
KEY_MEDIAPLAY = SPKEY | 0x4C,
|
KEY_MEDIAPLAY = KEYBOARD_SPKEY | 0x4C,
|
||||||
KEY_MEDIASTOP = SPKEY | 0x4D,
|
KEY_MEDIASTOP = KEYBOARD_SPKEY | 0x4D,
|
||||||
KEY_MEDIAPREVIOUS = SPKEY | 0x4E,
|
KEY_MEDIAPREVIOUS = KEYBOARD_SPKEY | 0x4E,
|
||||||
KEY_MEDIANEXT = SPKEY | 0x4F,
|
KEY_MEDIANEXT = KEYBOARD_SPKEY | 0x4F,
|
||||||
KEY_MEDIARECORD = SPKEY | 0x50,
|
KEY_MEDIARECORD = KEYBOARD_SPKEY | 0x50,
|
||||||
KEY_HOMEPAGE = SPKEY | 0x51,
|
KEY_HOMEPAGE = KEYBOARD_SPKEY | 0x51,
|
||||||
KEY_FAVORITES = SPKEY | 0x52,
|
KEY_FAVORITES = KEYBOARD_SPKEY | 0x52,
|
||||||
KEY_SEARCH = SPKEY | 0x53,
|
KEY_SEARCH = KEYBOARD_SPKEY | 0x53,
|
||||||
KEY_STANDBY = SPKEY | 0x54,
|
KEY_STANDBY = KEYBOARD_SPKEY | 0x54,
|
||||||
KEY_OPENURL = SPKEY | 0x55,
|
KEY_OPENURL = KEYBOARD_SPKEY | 0x55,
|
||||||
KEY_LAUNCHMAIL = SPKEY | 0x56,
|
KEY_LAUNCHMAIL = KEYBOARD_SPKEY | 0x56,
|
||||||
KEY_LAUNCHMEDIA = SPKEY | 0x57,
|
KEY_LAUNCHMEDIA = KEYBOARD_SPKEY | 0x57,
|
||||||
KEY_LAUNCH0 = SPKEY | 0x58,
|
KEY_LAUNCH0 = KEYBOARD_SPKEY | 0x58,
|
||||||
KEY_LAUNCH1 = SPKEY | 0x59,
|
KEY_LAUNCH1 = KEYBOARD_SPKEY | 0x59,
|
||||||
KEY_LAUNCH2 = SPKEY | 0x5A,
|
KEY_LAUNCH2 = KEYBOARD_SPKEY | 0x5A,
|
||||||
KEY_LAUNCH3 = SPKEY | 0x5B,
|
KEY_LAUNCH3 = KEYBOARD_SPKEY | 0x5B,
|
||||||
KEY_LAUNCH4 = SPKEY | 0x5C,
|
KEY_LAUNCH4 = KEYBOARD_SPKEY | 0x5C,
|
||||||
KEY_LAUNCH5 = SPKEY | 0x5D,
|
KEY_LAUNCH5 = KEYBOARD_SPKEY | 0x5D,
|
||||||
KEY_LAUNCH6 = SPKEY | 0x5E,
|
KEY_LAUNCH6 = KEYBOARD_SPKEY | 0x5E,
|
||||||
KEY_LAUNCH7 = SPKEY | 0x5F,
|
KEY_LAUNCH7 = KEYBOARD_SPKEY | 0x5F,
|
||||||
KEY_LAUNCH8 = SPKEY | 0x60,
|
KEY_LAUNCH8 = KEYBOARD_SPKEY | 0x60,
|
||||||
KEY_LAUNCH9 = SPKEY | 0x61,
|
KEY_LAUNCH9 = KEYBOARD_SPKEY | 0x61,
|
||||||
KEY_LAUNCHA = SPKEY | 0x62,
|
KEY_LAUNCHA = KEYBOARD_SPKEY | 0x62,
|
||||||
KEY_LAUNCHB = SPKEY | 0x63,
|
KEY_LAUNCHB = KEYBOARD_SPKEY | 0x63,
|
||||||
KEY_LAUNCHC = SPKEY | 0x64,
|
KEY_LAUNCHC = KEYBOARD_SPKEY | 0x64,
|
||||||
KEY_LAUNCHD = SPKEY | 0x65,
|
KEY_LAUNCHD = KEYBOARD_SPKEY | 0x65,
|
||||||
KEY_LAUNCHE = SPKEY | 0x66,
|
KEY_LAUNCHE = KEYBOARD_SPKEY | 0x66,
|
||||||
KEY_LAUNCHF = SPKEY | 0x67,
|
KEY_LAUNCHF = KEYBOARD_SPKEY | 0x67,
|
||||||
|
|
||||||
KEY_UNKNOWN = SPKEY | 0xFFFFFF,
|
KEY_UNKNOWN = KEYBOARD_SPKEY | 0xFFFFFF,
|
||||||
|
|
||||||
/* PRINTABLE LATIN 1 CODES */
|
/* PRINTABLE LATIN 1 CODES */
|
||||||
|
|
||||||
|
@ -18,9 +18,16 @@
|
|||||||
#include "sfw.h"
|
#include "sfw.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef SFW_3RD_H
|
|
||||||
#define SFW_3RD_H
|
|
||||||
#include "sfw"
|
#ifndef SFW_3RD_IMPL
|
||||||
|
#define SFW_3RD_IMPL
|
||||||
|
|
||||||
|
//typedef XID Font;
|
||||||
|
#define Font The_Font_I_dont_care
|
||||||
|
#include "sfw_3rd.h"
|
||||||
|
#undef Font
|
||||||
|
#undef CursorShape
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
{{FILE:sfw/core/ucaps.h}}
|
{{FILE:sfw/core/ucaps.h}}
|
||||||
@ -62,6 +69,13 @@
|
|||||||
//--STRIP
|
//--STRIP
|
||||||
{{FILE:sfw/core/pool_allocator.cpp}}
|
{{FILE:sfw/core/pool_allocator.cpp}}
|
||||||
|
|
||||||
|
//--STRIP
|
||||||
|
//#include "core/random_pcg.h"
|
||||||
|
//#include "core/stime.h"
|
||||||
|
//#include "core/error_macros.h"
|
||||||
|
//--STRIP
|
||||||
|
{{FILE:sfw/core/random_pcg.cpp}}
|
||||||
|
|
||||||
//--STRIP
|
//--STRIP
|
||||||
//#include "core/math_funcs.h"
|
//#include "core/math_funcs.h"
|
||||||
//#include "core/error_macros.h"
|
//#include "core/error_macros.h"
|
||||||
@ -173,12 +187,6 @@
|
|||||||
//--STRIP
|
//--STRIP
|
||||||
{{FILE:sfw/core/rect2i.cpp}}
|
{{FILE:sfw/core/rect2i.cpp}}
|
||||||
//--STRIP
|
//--STRIP
|
||||||
//#include "core/random_pcg.h"
|
|
||||||
//#include "core/stime.h"
|
|
||||||
//#include "core/error_macros.h"
|
|
||||||
//--STRIP
|
|
||||||
{{FILE:sfw/core/random_pcg.cpp}}
|
|
||||||
//--STRIP
|
|
||||||
//#include "core/vector4.h"
|
//#include "core/vector4.h"
|
||||||
//#include "core/basis.h"
|
//#include "core/basis.h"
|
||||||
//--STRIP
|
//--STRIP
|
||||||
|
@ -97,6 +97,16 @@ SOFTWARE.
|
|||||||
//--STRIP
|
//--STRIP
|
||||||
{{FILE:sfw/core/thread_safe.h}}
|
{{FILE:sfw/core/thread_safe.h}}
|
||||||
|
|
||||||
|
//--STRIP
|
||||||
|
//#include "core/typedefs.h"
|
||||||
|
//--STRIP
|
||||||
|
{{FILE:sfw/core/pcg.h}}
|
||||||
|
//--STRIP
|
||||||
|
//#include "core/math_defs.h"
|
||||||
|
//#include "core/pcg.h"
|
||||||
|
//--STRIP
|
||||||
|
{{FILE:sfw/core/random_pcg.h}}
|
||||||
|
|
||||||
//--STRIP
|
//--STRIP
|
||||||
//#include "core/error_macros.h"
|
//#include "core/error_macros.h"
|
||||||
//#include "core/math_defs.h"
|
//#include "core/math_defs.h"
|
||||||
@ -290,13 +300,6 @@ SOFTWARE.
|
|||||||
//--STRIP
|
//--STRIP
|
||||||
{{FILE:sfw/core/aabb.h}}
|
{{FILE:sfw/core/aabb.h}}
|
||||||
//--STRIP
|
//--STRIP
|
||||||
//#include "core/aabb.h"
|
|
||||||
//#include "core/plane.h"
|
|
||||||
//#include "core/transform.h"
|
|
||||||
//#include "core/vector3.h"
|
|
||||||
//--STRIP
|
|
||||||
{{FILE:sfw/core/face3.h}}
|
|
||||||
//--STRIP
|
|
||||||
//#include "core/math_defs.h"
|
//#include "core/math_defs.h"
|
||||||
//#include "core/math_funcs.h"
|
//#include "core/math_funcs.h"
|
||||||
//#include "core/vector3.h"
|
//#include "core/vector3.h"
|
||||||
@ -328,6 +331,13 @@ SOFTWARE.
|
|||||||
{{FILE:sfw/core/transform_2d.h}}
|
{{FILE:sfw/core/transform_2d.h}}
|
||||||
//--STRIP
|
//--STRIP
|
||||||
//#include "core/aabb.h"
|
//#include "core/aabb.h"
|
||||||
|
//#include "core/plane.h"
|
||||||
|
//#include "core/transform.h"
|
||||||
|
//#include "core/vector3.h"
|
||||||
|
//--STRIP
|
||||||
|
{{FILE:sfw/core/face3.h}}
|
||||||
|
//--STRIP
|
||||||
|
//#include "core/aabb.h"
|
||||||
//#include "core/basis.h"
|
//#include "core/basis.h"
|
||||||
//#include "core/plane.h"
|
//#include "core/plane.h"
|
||||||
//#include "core/vector3i.h"
|
//#include "core/vector3i.h"
|
||||||
@ -335,16 +345,6 @@ SOFTWARE.
|
|||||||
//--STRIP
|
//--STRIP
|
||||||
{{FILE:sfw/core/transform.h}}
|
{{FILE:sfw/core/transform.h}}
|
||||||
|
|
||||||
//--STRIP
|
|
||||||
//#include "core/typedefs.h"
|
|
||||||
//--STRIP
|
|
||||||
{{FILE:sfw/core/pcg.h}}
|
|
||||||
//--STRIP
|
|
||||||
//#include "core/math_defs.h"
|
|
||||||
//#include "core/pcg.h"
|
|
||||||
//--STRIP
|
|
||||||
{{FILE:sfw/core/random_pcg.h}}
|
|
||||||
|
|
||||||
//--STRIP
|
//--STRIP
|
||||||
//hashfuncs.h Needs most math classes
|
//hashfuncs.h Needs most math classes
|
||||||
//--STRIP
|
//--STRIP
|
||||||
@ -424,11 +424,7 @@ SOFTWARE.
|
|||||||
//#include "core/int_types.h"
|
//#include "core/int_types.h"
|
||||||
//--STRIP
|
//--STRIP
|
||||||
{{FILE:sfw/object/object_id.h}}
|
{{FILE:sfw/object/object_id.h}}
|
||||||
//--STRIP
|
|
||||||
//#include "core/memory.h"
|
|
||||||
//#include "core/typedefs.h"
|
|
||||||
//--STRIP
|
|
||||||
{{FILE:sfw/object/object_rc.h}}
|
|
||||||
//--STRIP
|
//--STRIP
|
||||||
//#include "core/string_name.h"
|
//#include "core/string_name.h"
|
||||||
//--STRIP
|
//--STRIP
|
||||||
@ -497,6 +493,13 @@ SOFTWARE.
|
|||||||
//--STRIP
|
//--STRIP
|
||||||
{{FILE:sfw/object/object.h}}
|
{{FILE:sfw/object/object.h}}
|
||||||
|
|
||||||
|
|
||||||
|
//--STRIP
|
||||||
|
//#include "core/memory.h"
|
||||||
|
//#include "core/typedefs.h"
|
||||||
|
//--STRIP
|
||||||
|
{{FILE:sfw/object/object_rc.h}}
|
||||||
|
|
||||||
//--STRIP
|
//--STRIP
|
||||||
//#include "core/memory.h"
|
//#include "core/memory.h"
|
||||||
//#include "core/safe_refcount.h"
|
//#include "core/safe_refcount.h"
|
||||||
@ -767,7 +770,6 @@ SOFTWARE.
|
|||||||
//--STRIP
|
//--STRIP
|
||||||
{{FILE:sfw/render_objects/mesh_instance_3d.h}}
|
{{FILE:sfw/render_objects/mesh_instance_3d.h}}
|
||||||
|
|
||||||
|
|
||||||
// expose glfw/glad apis
|
// expose glfw/glad apis
|
||||||
#if __EMSCRIPTEN__
|
#if __EMSCRIPTEN__
|
||||||
#include <GL/glew.h>
|
#include <GL/glew.h>
|
||||||
@ -776,14 +778,15 @@ SOFTWARE.
|
|||||||
#include <emscripten/html5.h>
|
#include <emscripten/html5.h>
|
||||||
#define gladLoadGL(func) (glewExperimental = true, glewInit() == GLEW_OK) ///-
|
#define gladLoadGL(func) (glewExperimental = true, glewInit() == GLEW_OK) ///-
|
||||||
#else
|
#else
|
||||||
#if is(win32) /*&& is(tcc)*/ // && ENABLE_DLL
|
#if defined(_WIN64) || defined(_WIN32) /*&& is(tcc)*/ // && ENABLE_DLL
|
||||||
#ifdef GLAD_API_CALL
|
#ifdef GLAD_API_CALL
|
||||||
#undef GLAD_API_CALL
|
#undef GLAD_API_CALL
|
||||||
#endif
|
#endif
|
||||||
#define GLAD_API_CALL extern API ///-
|
#define GLAD_API_CALL extern API ///-
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef GLAD_GL_H_
|
#ifndef GLAD_GL_H_
|
||||||
#include "sfw"
|
#include "sfw_3rd.h"
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -25,24 +25,21 @@ SOFTWARE.
|
|||||||
|
|
||||||
// TODO gather all licenses to here
|
// TODO gather all licenses to here
|
||||||
|
|
||||||
#ifdef SFW_3RD_H
|
#ifdef SFW_3RD_IMPL
|
||||||
#define GLAD_GL_IMPLEMENTATION // glad
|
#define GLAD_GL_IMPLEMENTATION // glad
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
{{FILE:sfw/render_core/3rd_glad.h}}
|
{{FILE:sfw/render_core/3rd_glad.h}}
|
||||||
|
|
||||||
#ifdef SFW_3RD_H
|
#ifdef SFW_3RD_IMPL
|
||||||
#define STB_TRUETYPE_IMPLEMENTATION
|
#define STB_TRUETYPE_IMPLEMENTATION
|
||||||
#endif
|
|
||||||
|
|
||||||
{{FILE:sfw/render_core/3rd_stb_truetype.h}}
|
{{FILE:sfw/render_core/3rd_stb_truetype.h}}
|
||||||
|
|
||||||
#ifdef SFW_3RD_H
|
|
||||||
#define STB_IMAGE_IMPLEMENTATION // stbi
|
#define STB_IMAGE_IMPLEMENTATION // stbi
|
||||||
#define STB_IMAGE_WRITE_IMPLEMENTATION // stbi_write
|
#define STB_IMAGE_WRITE_IMPLEMENTATION // stbi_write
|
||||||
#define STB_SPRINTF_IMPLEMENTATION // stb_sprintf
|
#define STB_SPRINTF_IMPLEMENTATION // stb_sprintf
|
||||||
#define STB_SPRINTF_NOUNALIGNED // stb_sprintf
|
#define STB_SPRINTF_NOUNALIGNED // stb_sprintf
|
||||||
#endif
|
|
||||||
|
|
||||||
{{FILE:sfw/render_core/3rd_stb_image.h}}
|
{{FILE:sfw/render_core/3rd_stb_image.h}}
|
||||||
|
|
||||||
@ -50,8 +47,6 @@ SOFTWARE.
|
|||||||
//---
|
//---
|
||||||
#undef freelist
|
#undef freelist
|
||||||
|
|
||||||
|
|
||||||
#ifdef SFW_3RD_H
|
|
||||||
#define _GLFW_IMPLEMENTATION // glfw337
|
#define _GLFW_IMPLEMENTATION // glfw337
|
||||||
#define GLFW_INCLUDE_NONE // glfw337
|
#define GLFW_INCLUDE_NONE // glfw337
|
||||||
#ifdef __APPLE__
|
#ifdef __APPLE__
|
||||||
@ -61,7 +56,6 @@ SOFTWARE.
|
|||||||
#else
|
#else
|
||||||
#define _GLFW_X11 // glfw linux, also _GLFW_OSMESA or _GLFW_WAYLAND
|
#define _GLFW_X11 // glfw linux, also _GLFW_OSMESA or _GLFW_WAYLAND
|
||||||
#endif
|
#endif
|
||||||
#endif
|
|
||||||
|
|
||||||
#undef _GNU_SOURCE
|
#undef _GNU_SOURCE
|
||||||
|
|
||||||
@ -69,3 +63,5 @@ SOFTWARE.
|
|||||||
|
|
||||||
#undef timeGetTime
|
#undef timeGetTime
|
||||||
#undef Time
|
#undef Time
|
||||||
|
|
||||||
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user