Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2025-10-10 01:18:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "[host] avoid manual windres command"

Browse Source 
This reverts commit d82f2e510d.
While the proposed change is more correct, it breaks the generation of
the file due to failure to locate the resource files, such as
`resources/icon.ico`.
This commit is contained in:
Geoffrey McRae
2021-07-04 19:30:06 +10:00
parent e9b009db9f
commit cd10e02862
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
host/platform/Windows/CMakeLists.txt
View File

@@ -10,7 +10,6 @@ add_library(platform_Windows STATIC
src/service.c src/service.c
src/mousehook.c src/mousehook.c
src/force_compose.c src/force_compose.c
resource.rc
) )
# allow use of functions for Windows Vista or later # allow use of functions for Windows Vista or later
@@ -18,7 +17,15 @@ add_definitions(-D _WIN32_WINNT=0x6000)
add_subdirectory("capture") add_subdirectory("capture")
FIND_PROGRAM(WINDRES_EXECUTABLE NAMES "x86_64-w64-mingw32-windres" "windres.exe" DOC "windres executable")
ADD_CUSTOM_COMMAND(TARGET platform_Windows POST_BUILD
WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
COMMAND ${WINDRES_EXECUTABLE} -i resource.rc -o "${PROJECT_BINARY_DIR}/resource.o"
VERBATIM
)
target_link_libraries(platform_Windows target_link_libraries(platform_Windows
"${PROJECT_BINARY_DIR}/resource.o"
lg_common lg_common
capture capture