Skip to content

Commit

Permalink
Fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
Eeems committed Feb 2, 2024
1 parent 0c7a7c5 commit 71139a9
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 6 deletions.
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@ clean: clean-base
rm -rf $(BUILD)

release: clean-base build $(DIST)
ifneq ($(filter sentry,$(FEATURES)),)
# Force sentry makefile to regenerate so that install targets get when being build in toltecmk
cd $(BUILD)/oxide/shared/sentry && make qmake
endif
# Force liboxide makefile to regenerate so that install targets get when being build in toltecmk
cd $(BUILD)/oxide/shared/liboxide && make qmake
INSTALL_ROOT=$(DIST) $(MAKE) --output-sync=target -C $(BUILD)/oxide install
Expand Down
6 changes: 3 additions & 3 deletions shared/libblight/libblight.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ namespace Blight{
return {};
}
const void* clipboard = nullptr;
size_t size = 0;
::size_t size = 0;
auto res = sd_bus_message_read_array(
reply->message,
'y',
&clipboard,
static_cast<::size_t*>(&size)
&size
);
if(res < 0){
_WARN(
Expand All @@ -51,7 +51,7 @@ namespace Blight{
}
auto data = new unsigned char[size];
memcpy(data, clipboard, size);
return clipboard_t(name, data, size);
return clipboard_t(name, data, static_cast<size_t>(size));
}

bool connect(bool use_system){
Expand Down
2 changes: 1 addition & 1 deletion shared/libblight/libblight.pro
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ PRECOMPILED_HEADER = \
LIBS += -lsystemd

include(../../qmake/common.pri)
RELATIVE_PWD = $$system(realpath --relative-to $$OUT_PWD $$PWD)
RELATIVE_PWD = $$system(realpath --canonicalize-missing --relative-to $$OUT_PWD $$PWD)

libblight_libblight_h.target = include/libblight/libblight.h
for(h, HEADERS){
Expand Down
2 changes: 1 addition & 1 deletion shared/libblight_client/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -733,7 +733,7 @@ extern "C" {
void* mmap(void* addr, size_t len, int prot, int flags, int fd, __off_t offset){
_DEBUG(
"mmap 0x%u %lld 0x%02x 0x%02x %d %d",
(unsigned)addr,
static_cast<int>(reinterpret_cast<std::uintptr_t>(addr)),
len,
prot,
flags,
Expand Down
2 changes: 1 addition & 1 deletion shared/liboxide/liboxide.pro
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ DBUS_INTERFACES += \
LIBS += -lsystemd

include(../../qmake/common.pri)
RELATIVE_PWD = $$system(realpath --relative-to $$OUT_PWD $$PWD)
RELATIVE_PWD = $$system(realpath --canonicalize-missing --relative-to $$OUT_PWD $$PWD)

liboxide_liboxide_h.target = include/liboxide/liboxide.h
for(h, HEADERS){
Expand Down

0 comments on commit 71139a9

Please sign in to comment.