wanp/townengine
2
1
Fork 0
Code Issues 8 Pull Requests Packages Projects Releases Wiki Activity

CMakeLists.txt: don't precompile stb_ds.h, precompile SDL.h

Browse Source
This commit is contained in:
veclav talica 2024-10-13 18:14:36 +03:00
parent 1a7322dccf
commit f96d521af2
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -133,7 +133,7 @@ set_target_properties(${TWN_TARGET} PROPERTIES
# precompile commonly used not-so-small headers # precompile commonly used not-so-small headers
target_precompile_headers(${TWN_TARGET} PRIVATE target_precompile_headers(${TWN_TARGET} PRIVATE
$<$<NOT:$<BOOL:${EMSCRIPTEN}>>:third-party/glad/include/glad/glad.h> $<$<NOT:$<BOOL:${EMSCRIPTEN}>>:third-party/glad/include/glad/glad.h>
third-party/stb/stb_ds.h) ${SDL2_INCLUDE_DIR}/SDL.h)
function(give_options_without_warnings target) function(give_options_without_warnings target)

1
src/rendering/twn_gl_15_rendering.c
View File

@ -5,6 +5,7 @@
#include "twn_text_c.h" #include "twn_text_c.h"
#include <glad/glad.h> #include <glad/glad.h>
#include <stb_ds.h>
/* interleaved vertex array data */ /* interleaved vertex array data */

2
src/rendering/twn_text.c
View File

@ -5,7 +5,7 @@
#include "twn_engine_context_c.h" #include "twn_engine_context_c.h"
#include <stb_truetype.h> #include <stb_truetype.h>
#include <stb_ds.h>
#define ASCII_START 32 #define ASCII_START 32
#define ASCII_END 128 #define ASCII_END 128

3
src/twn_util.c
View File

@ -125,7 +125,6 @@ int clampi(int i, int min, int max) {
} }
int64_t file_to_bytes(const char *path, unsigned char **buf_out) { int64_t file_to_bytes(const char *path, unsigned char **buf_out) {
SDL_RWops *handle = PHYSFSRWOPS_openRead(path); SDL_RWops *handle = PHYSFSRWOPS_openRead(path);
@ -272,10 +271,12 @@ void tick_timer(int *value) {
*value = MAX(*value - 1, 0); *value = MAX(*value - 1, 0);
} }
void tick_ftimer(float *value) { void tick_ftimer(float *value) {
*value = MAX(*value - ((float)ctx.delta_time / (float)ctx.clocks_per_second), 0.0f); *value = MAX(*value - ((float)ctx.delta_time / (float)ctx.clocks_per_second), 0.0f);
} }
bool repeat_ftimer(float *value, float at) { bool repeat_ftimer(float *value, float at) {
*value -= (float)ctx.delta_time / (float)ctx.clocks_per_second; *value -= (float)ctx.delta_time / (float)ctx.clocks_per_second;
if (*value < 0.0f) { if (*value < 0.0f) {