aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Weissflog <floooh@gmail.com>2020-11-28 14:56:34 +0100
committerAndre Weissflog <floooh@gmail.com>2020-11-28 14:58:33 +0100
commit900df0ee04e4c0b9db7a5b2352c69a645394aa08 (patch)
treeb264953e4d9ba3b4acec882cc76cef174a4670ad
parentfad0bf816dd94b8f55a8aa85b1746cce752589e2 (diff)
document SOKOL_API_DECL (these macros are still valid)
-rw-r--r--sokol_app.h1
-rw-r--r--sokol_args.h1
-rw-r--r--sokol_audio.h1
-rw-r--r--sokol_fetch.h1
-rw-r--r--sokol_gfx.h1
-rw-r--r--sokol_glue.h1
-rw-r--r--sokol_time.h1
-rw-r--r--util/sokol_debugtext.h5
-rw-r--r--util/sokol_fontstash.h3
-rw-r--r--util/sokol_gfx_imgui.h1
-rw-r--r--util/sokol_gl.h1
-rw-r--r--util/sokol_imgui.h1
-rw-r--r--util/sokol_memtrack.h3
-rw-r--r--util/sokol_shape.h1
14 files changed, 18 insertions, 4 deletions
diff --git a/sokol_app.h b/sokol_app.h
index a654c5ca..dc1e6a28 100644
--- a/sokol_app.h
+++ b/sokol_app.h
@@ -30,6 +30,7 @@
SOKOL_WIN32_FORCE_MAIN - define this on Win32 to use a main() entry point instead of WinMain
SOKOL_NO_ENTRY - define this if sokol_app.h shouldn't "hijack" the main() function
SOKOL_APP_API_DECL - public function declaration prefix (default: extern)
+ SOKOL_API_DECL - same as SOKOL_APP_API_DECL
SOKOL_API_IMPL - public function implementation prefix (default: -)
SOKOL_CALLOC - your own calloc function (default: calloc(n, s))
SOKOL_FREE - your own free function (default: free(p))
diff --git a/sokol_args.h b/sokol_args.h
index 68504d4b..9695c987 100644
--- a/sokol_args.h
+++ b/sokol_args.h
@@ -16,6 +16,7 @@
SOKOL_CALLOC(n,s) - your own calloc() implementation (default: calloc(n,s))
SOKOL_FREE(p) - your own free() implementation (default: free(p))
SOKOL_ARGS_API_DECL - public function declaration prefix (default: extern)
+ SOKOL_API_DECL - same as SOKOL_ARGS_API_DECL
SOKOL_API_IMPL - public function implementation prefix (default: -)
If sokol_args.h is compiled as a DLL, define the following before
diff --git a/sokol_audio.h b/sokol_audio.h
index dd248969..d0c118c2 100644
--- a/sokol_audio.h
+++ b/sokol_audio.h
@@ -17,6 +17,7 @@
SOKOL_MALLOC(s) - your own malloc() implementation (default: malloc(s))
SOKOL_FREE(p) - your own free() implementation (default: free(p))
SOKOL_AUDIO_API_DECL- public function declaration prefix (default: extern)
+ SOKOL_API_DECL - same as SOKOL_AUDIO_API_DECL
SOKOL_API_IMPL - public function implementation prefix (default: -)
SAUDIO_RING_MAX_SLOTS - max number of slots in the push-audio ring buffer (default 1024)
diff --git a/sokol_fetch.h b/sokol_fetch.h
index 4b4bb839..6b56f258 100644
--- a/sokol_fetch.h
+++ b/sokol_fetch.h
@@ -17,6 +17,7 @@
SOKOL_LOG(msg) - your own logging function (default: puts(msg))
SOKOL_UNREACHABLE() - a guard macro for unreachable code (default: assert(false))
SOKOL_FETCH_API_DECL - public function declaration prefix (default: extern)
+ SOKOL_API_DECL - same as SOKOL_FETCH_API_DECL
SOKOL_API_IMPL - public function implementation prefix (default: -)
SFETCH_MAX_PATH - max length of UTF-8 filesystem path / URL (default: 1024 bytes)
SFETCH_MAX_USERDATA_UINT64 - max size of embedded userdata in number of uint64_t, userdata
diff --git a/sokol_gfx.h b/sokol_gfx.h
index 403d1c1c..1ffcef2f 100644
--- a/sokol_gfx.h
+++ b/sokol_gfx.h
@@ -39,6 +39,7 @@
SOKOL_LOG(msg) - your own logging function (default: puts(msg))
SOKOL_UNREACHABLE() - a guard macro for unreachable code (default: assert(false))
SOKOL_GFX_API_DECL - public function declaration prefix (default: extern)
+ SOKOL_API_DECL - same as SOKOL_GFX_API_DECL
SOKOL_API_IMPL - public function implementation prefix (default: -)
SOKOL_TRACE_HOOKS - enable trace hook callbacks (search below for TRACE HOOKS)
diff --git a/sokol_glue.h b/sokol_glue.h
index b6e949ec..7219b5c1 100644
--- a/sokol_glue.h
+++ b/sokol_glue.h
@@ -13,6 +13,7 @@
SOKOL_ASSERT(c) - your own assert macro (default: assert(c))
SOKOL_GLUE_API_DECL - public function declaration prefix (default: extern)
+ SOKOL_API_DECL - same as SOKOL_GLUE_API_DECL
SOKOL_API_IMPL - public function implementation prefix (default: -)
If sokol_glue.h is compiled as a DLL, define the following before
diff --git a/sokol_time.h b/sokol_time.h
index b310df57..6f7db2e6 100644
--- a/sokol_time.h
+++ b/sokol_time.h
@@ -12,6 +12,7 @@
Optionally provide the following defines with your own implementations:
SOKOL_ASSERT(c) - your own assert macro (default: assert(c))
SOKOL_TIME_API_DECL - public function declaration prefix (default: extern)
+ SOKOL_API_DECL - same as SOKOL_TIME_API_DECL
SOKOL_API_IMPL - public function implementation prefix (default: -)
If sokol_time.h is compiled as a DLL, define the following before
diff --git a/util/sokol_debugtext.h b/util/sokol_debugtext.h
index 4656b53c..72458984 100644
--- a/util/sokol_debugtext.h
+++ b/util/sokol_debugtext.h
@@ -26,7 +26,8 @@
SOKOL_ASSERT(c) - your own assert macro (default: assert(c))
SOKOL_MALLOC(s) - your own malloc function (default: malloc(s))
SOKOL_FREE(p) - your own free function (default: free(p))
- SOKOL_DEBUGTEXT_API_DECL - public function declaration prefix (default: extern)
+ SOKOL_DEBUGTEXT_API_DECL - public function declaration prefix (default: extern)
+ SOKOL_API_DECL - same as SOKOL_DEBUGTEXT_API_DECL
SOKOL_API_IMPL - public function implementation prefix (default: -)
SOKOL_LOG(msg) - your own logging function (default: puts(msg))
SOKOL_UNREACHABLE() - a guard macro for unreachable code (default: assert(false))
@@ -2195,7 +2196,7 @@ static const uint8_t _sdtx_font_oric[2048] = {
frag_color = texture(tex, uv).xxxx * color;
}
@end
-
+
@program debugtext vs fs
*/
#if defined(SOKOL_GLCORE33)
diff --git a/util/sokol_fontstash.h b/util/sokol_fontstash.h
index e286f9cc..b018e426 100644
--- a/util/sokol_fontstash.h
+++ b/util/sokol_fontstash.h
@@ -27,7 +27,8 @@
SOKOL_ASSERT(c) - your own assert macro (default: assert(c))
SOKOL_MALLOC(s) - your own malloc function (default: malloc(s))
SOKOL_FREE(p) - your own free function (default: free(p))
- SOKOL_FONTSTASH_API_DECL - public function declaration prefix (default: extern)
+ SOKOL_FONTSTASH_API_DECL - public function declaration prefix (default: extern)
+ SOKOL_API_DECL - same as SOKOL_FONTSTASH_API_DECL
SOKOL_API_IMPL - public function implementation prefix (default: -)
SOKOL_LOG(msg) - your own logging function (default: puts(msg))
SOKOL_UNREACHABLE() - a guard macro for unreachable code (default: assert(false))
diff --git a/util/sokol_gfx_imgui.h b/util/sokol_gfx_imgui.h
index 78eb3586..b76db2fc 100644
--- a/util/sokol_gfx_imgui.h
+++ b/util/sokol_gfx_imgui.h
@@ -45,6 +45,7 @@
SOKOL_MALLOC(s) -- your own memory allocation function, default: malloc(s)
SOKOL_FREE(p) -- your own memory free function, default: free(p)
SOKOL_GFX_IMGUI_API_DECL - public function declaration prefix (default: extern)
+ SOKOL_API_DECL - same as SOKOL_GFX_IMGUI_API_DECL
SOKOL_API_IMPL - public function implementation prefix (default: -)
If sokol_gfx_imgui.h is compiled as a DLL, define the following before
diff --git a/util/sokol_gl.h b/util/sokol_gl.h
index e548686e..fa80a9f3 100644
--- a/util/sokol_gl.h
+++ b/util/sokol_gl.h
@@ -26,6 +26,7 @@
SOKOL_MALLOC(s) - your own malloc function (default: malloc(s))
SOKOL_FREE(p) - your own free function (default: free(p))
SOKOL_GL_API_DECL - public function declaration prefix (default: extern)
+ SOKOL_API_DECL - same as SOKOL_GL_API_DECL
SOKOL_API_IMPL - public function implementation prefix (default: -)
SOKOL_LOG(msg) - your own logging function (default: puts(msg))
SOKOL_UNREACHABLE() - a guard macro for unreachable code (default: assert(false))
diff --git a/util/sokol_imgui.h b/util/sokol_imgui.h
index 178f396b..b72e4aa5 100644
--- a/util/sokol_imgui.h
+++ b/util/sokol_imgui.h
@@ -40,6 +40,7 @@
SOKOL_ASSERT(c) - your own assert macro (default: assert(c))
SOKOL_IMGUI_API_DECL- public function declaration prefix (default: extern)
+ SOKOL_API_DECL - same as SOKOL_IMGUI_API_DECL
SOKOL_API_IMPL - public function implementation prefix (default: -)
If sokol_imgui.h is compiled as a DLL, define the following before
diff --git a/util/sokol_memtrack.h b/util/sokol_memtrack.h
index d9ebaeea..127cd384 100644
--- a/util/sokol_memtrack.h
+++ b/util/sokol_memtrack.h
@@ -16,7 +16,8 @@
Optionally provide the following defines with your own implementations:
- SOKOL_MEMTRACK_API_DECL - public function declaration prefix (default: extern)
+ SOKOL_MEMTRACK_API_DECL - public function declaration prefix (default: extern)
+ SOKOL_API_DECL - same as SOKOL_MEMTRACK_API_DECL
SOKOL_API_IMPL - public function implementation prefix (default: -)
If sokol_memtrack.h is compiled as a DLL, define the following before
diff --git a/util/sokol_shape.h b/util/sokol_shape.h
index d441a88e..beb39122 100644
--- a/util/sokol_shape.h
+++ b/util/sokol_shape.h
@@ -17,6 +17,7 @@
SOKOL_ASSERT(c) - your own assert macro (default: assert(c))
SOKOL_SHAPE_API_DECL- public function declaration prefix (default: extern)
+ SOKOL_API_DECL - same as SOKOL_SHAPE_API_DECL
SOKOL_API_IMPL - public function implementation prefix (default: -)
If sokol_shape.h is compiled as a DLL, define the following before