diff options
| author | Arisotura <thetotalworm@gmail.com> | 2020-05-10 23:30:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-10 23:30:55 +0200 |
| commit | a7a286371a31f832234a8a241c216180b3fd6e3d (patch) | |
| tree | c1a1f6f4728a2bce5bbc698e969150a611572553 /src/libui_sdl | |
| parent | bc9c989f61b0f7e346d7bd688b4af8480bd3264b (diff) | |
| parent | 675b3f882ff1c0cc66a34e571a64e028f269f4bc (diff) | |
Merge pull request #622 from nadiaholmquist/fix/clang-build
Fix building with Clang
Diffstat (limited to 'src/libui_sdl')
| -rw-r--r-- | src/libui_sdl/OSD.cpp | 4 | ||||
| -rw-r--r-- | src/libui_sdl/libui/unix/CMakeLists.txt | 20 |
2 files changed, 3 insertions, 21 deletions
diff --git a/src/libui_sdl/OSD.cpp b/src/libui_sdl/OSD.cpp index a01e39b..02418cc 100644 --- a/src/libui_sdl/OSD.cpp +++ b/src/libui_sdl/OSD.cpp @@ -419,8 +419,8 @@ void Update(bool opengl, uiAreaDrawParams* params) item.DrawBitmapLoaded = true; } - uiRect rc_src = {0, 0, item.Width, item.Height}; - uiRect rc_dst = {kOSDMargin, y, item.Width, item.Height}; + uiRect rc_src = {0, 0, (int) item.Width, (int) item.Height}; + uiRect rc_dst = {kOSDMargin, (int) y, (int) item.Width, (int) item.Height}; uiDrawBitmapDraw(params->Context, item.DrawBitmap, &rc_src, &rc_dst, 0); } diff --git a/src/libui_sdl/libui/unix/CMakeLists.txt b/src/libui_sdl/libui/unix/CMakeLists.txt index 39f6c0a..1f4ab86 100644 --- a/src/libui_sdl/libui/unix/CMakeLists.txt +++ b/src/libui_sdl/libui/unix/CMakeLists.txt @@ -54,27 +54,9 @@ set(_LIBUI_INCLUDEDIRS _LIBUI_INCLUDEDIRS PARENT_SCOPE) set(_LIBUINAME libui PARENT_SCOPE) if(NOT BUILD_SHARED_LIBS) - set(_LIBUINAME libui-temporary PARENT_SCOPE) + # set(_LIBUINAME libui-temporary PARENT_SCOPE) endif() macro(_handle_static) - set_target_properties(${_LIBUINAME} PROPERTIES - ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}") - set(_aname $<TARGET_FILE:${_LIBUINAME}>) - set(_oname libui-combined.o) - add_custom_command( - OUTPUT ${_oname} - DEPENDS ${_LIBUINAME} - COMMAND - ${CMAKE_LINKER} -r --whole-archive ${_aname} -o ${_oname} - COMMAND - objcopy --localize-hidden ${_oname} - COMMENT "Removing hidden symbols") - add_library(libui STATIC ${_oname}) - # otherwise cmake won't know which linker to use - set_target_properties(libui PROPERTIES - LINKER_LANGUAGE C) - set(_aname) - set(_oname) endmacro() # TODO the other variables don't work? |