Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix llvm cross build for win on arm #983

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Fix llvm cross build for win on arm #983

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1fb9c4f
Fix llvm cross build for win on arm
trcrsired Jun 20, 2024
d54f7f8
Split parameters for CMAKE_RC_COMPILER
trcrsired Jun 20, 2024
43b635f
Update CMakeLists.txt
trcrsired Jun 21, 2024
147b145
Merge remote-tracking branch 'parent/develop' into develop
trcrsired Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update CMakeLists.txt 
split CMAKE_RC_FLAGS instead of CMAKE_RC_COMPILER
  • Loading branch information
@trcrsired
trcrsired authored Jun 21, 2024
commit 43b635f228ef9f1738f2c05be4d6a0d19a90dacc
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,10 @@ if(MINGW)
if(NOT CMAKE_RC_COMPILER)
set(CMAKE_RC_COMPILER windres.exe)
endif()
string(REPLACE " " ";" ZLIB_RC_COMPILER_LIST ${CMAKE_RC_COMPILER})
string(REPLACE " " ";" ZLIB_CMAKE_RC_FLAGS_LIST ${CMAKE_RC_FLAGS})

add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
COMMAND ${ZLIB_RC_COMPILER_LIST}
COMMAND ${CMAKE_RC_COMPILER} ${ZLIB_CMAKE_RC_FLAGS_LIST}
-D GCC_WINDRES
-I ${CMAKE_CURRENT_SOURCE_DIR}
-I ${CMAKE_CURRENT_BINARY_DIR}
Expand Down