From ff6f295facbb874705b0c3fceb170d73c540d2d5 Mon Sep 17 00:00:00 2001 From: dijunkun Date: Thu, 18 Jul 2024 16:06:35 +0800 Subject: [PATCH] Do not use rc file on MacOS --- src/device_controller/mouse/mac/mouse_controller.cpp | 2 +- src/screen_capturer/macosx/screen_capturer_avf.cpp | 2 +- xmake.lua | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/device_controller/mouse/mac/mouse_controller.cpp b/src/device_controller/mouse/mac/mouse_controller.cpp index 5bddec3..b6b949d 100644 --- a/src/device_controller/mouse/mac/mouse_controller.cpp +++ b/src/device_controller/mouse/mac/mouse_controller.cpp @@ -2,7 +2,7 @@ #include -#include "log.h" +#include "rd_log.h" MouseController::MouseController() {} diff --git a/src/screen_capturer/macosx/screen_capturer_avf.cpp b/src/screen_capturer/macosx/screen_capturer_avf.cpp index e46f8e0..5869187 100644 --- a/src/screen_capturer/macosx/screen_capturer_avf.cpp +++ b/src/screen_capturer/macosx/screen_capturer_avf.cpp @@ -2,7 +2,7 @@ #include -#include "log.h" +#include "rd_log.h" #define NV12_BUFFER_SIZE 1280 * 720 * 3 / 2 unsigned char nv12_buffer_[NV12_BUFFER_SIZE]; diff --git a/xmake.lua b/xmake.lua index 559d646..626bd56 100644 --- a/xmake.lua +++ b/xmake.lua @@ -128,12 +128,14 @@ target("single_window") target("remote_desk") set_kind("binary") add_deps("rd_log", "common", "single_window") - if is_os("macosx") then + if is_os("windows") then + add_files("icon/app_icon.ico") + elseif is_os("macosx") then add_packages("ffmpeg") elseif is_os("linux") then add_packages("ffmpeg") end - add_files("src/gui/main.cpp", "icon/app.rc") + add_files("src/gui/main.cpp") -- target("screen_capturer") -- set_kind("binary")