ashikk
/
kaliber
mirror of https://github.com/auygun/kaliber.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Enable C++20

This commit is contained in:
Attila Uygun 2022-11-10 21:52:19 +01:00
parent 8c05aae086
commit 8cd680d6a4
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build/linux/Makefile
View File

@ -32,6 +32,9 @@ LDFLAGS = -lX11 -lGL -pthread -lasound -ldl
# Always enable debug information. # Always enable debug information.
CFLAGS += -g CFLAGS += -g
# Make all warnings into errors.
CFLAGS += -Werror
# Flags to generate dependency information. # Flags to generate dependency information.
CFLAGS += -MD -MP -MT $@ CFLAGS += -MD -MP -MT $@
@ -55,8 +58,8 @@ CFLAGS += -msse2
# Let C++ inherit all C flags. # Let C++ inherit all C flags.
CXXFLAGS = $(CFLAGS) -I$(SRC_ROOT) CXXFLAGS = $(CFLAGS) -I$(SRC_ROOT)
# Enable C++17 # Enable C++20
CXXFLAGS += -std=c++17 CXXFLAGS += -std=c++20
# Vulkan config # Vulkan config
CFLAGS += -DVK_USE_PLATFORM_XLIB_KHR CFLAGS += -DVK_USE_PLATFORM_XLIB_KHR

6
src/engine/font.cc
View File

@ -187,8 +187,10 @@ void Font::Print(int x,
// q.x0, q.y0, q.x1, q.y1, q.s0, q.t0, q.s1, q.t1); // q.x0, q.y0, q.x1, q.y1, q.s0, q.t0, q.s1, q.t1);
int ix0 = (int)q.x0, iy0 = (int)q.y0, ix1 = (int)q.x1, iy1 = (int)q.y1, int ix0 = (int)q.x0, iy0 = (int)q.y0, ix1 = (int)q.x1, iy1 = (int)q.y1,
iu0 = (int)(q.s0 * kGlyphSize), iv0 = (int)(q.t0 * kGlyphSize), iu0 = (int)(q.s0 * (float)kGlyphSize),
iu1 = (int)(q.s1 * kGlyphSize), iv1 = (int)(q.t1 * kGlyphSize); iv0 = (int)(q.t0 * (float)kGlyphSize),
iu1 = (int)(q.s1 * (float)kGlyphSize),
iv1 = (int)(q.t1 * (float)kGlyphSize);
StretchBlit_I8_to_RGBA32(ix0, iy0, ix1, iy1, iu0, iv0, iu1, iv1, buffer, StretchBlit_I8_to_RGBA32(ix0, iy0, ix1, iy1, iu0, iv0, iu1, iv1, buffer,
width, glyph_cache_.get(), kGlyphSize); width, glyph_cache_.get(), kGlyphSize);