From ec6653705aad5eec057d3ca1c273c0c436aaa81e Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Wed, 15 Oct 2014 00:28:10 -0400 Subject: [PATCH] mxe-conf.cmake: Workaround buggy windres rules Signed-off-by: Timothy Gu --- src/pkgconf.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pkgconf.mk b/src/pkgconf.mk index 55c9cf58..1b6d516c 100644 --- a/src/pkgconf.mk +++ b/src/pkgconf.mk @@ -62,8 +62,9 @@ define $(PKG)_BUILD_COMMON echo 'set(CMAKE_MODULE_PATH $(PWD)/src/cmake) # For mxe FindPackage scripts'; \ echo 'set(CMAKE_INSTALL_PREFIX $(PREFIX)/$(TARGET) CACHE PATH "Installation Prefix")'; \ echo 'set(CMAKE_BUILD_TYPE Release CACHE STRING "Debug|Release|RelWithDebInfo|MinSizeRel")'; \ - echo 'set(CMAKE_CROSS_COMPILING ON) # Workaround for http://www.cmake.org/Bug/view.php?id=14075') \ - > '$(CMAKE_TOOLCHAIN_FILE)' + echo 'set(CMAKE_CROSS_COMPILING ON) # Workaround for http://www.cmake.org/Bug/view.php?id=14075'; \ + echo 'set(CMAKE_RC_COMPILE_OBJECT " -O coff -o ") # Workaround for buggy windres rules'; \ + ) > '$(CMAKE_TOOLCHAIN_FILE)' endef define $(PKG)_BUILD