commit 29a8d946dbc2bf6502731ecaeeaa3b26a14452b4
Author: Ivan Romanov <[email protected]>
Date: Mon Mar 26 00:36:41 2012 +0600
windres options for cmake (RHBZ #652435)
Toolchain-mingw32.cmake | 2 ++
mingw32-filesystem.spec | 5 ++++-
2 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/Toolchain-mingw32.cmake b/Toolchain-mingw32.cmake
index 6c9c932..c000ca8 100644
--- a/Toolchain-mingw32.cmake
+++ b/Toolchain-mingw32.cmake
@@ -20,6 +20,8 @@ SET(QT_LIBRARY_DIR ${CMAKE_FIND_ROOT_PATH}/lib)
# set the resource compiler (RHBZ #652435)
SET(CMAKE_RC_COMPILER /usr/bin/i686-pc-mingw32-windres)
+SET(CMAKE_RC_COMPILE_OBJECT
+ "<CMAKE_RC_COMPILER> <FLAGS> <DEFINES> -O coff -o <OBJECT> <SOURCE>")
# override boost library suffix which defaults to -mgw
SET(Boost_COMPILER -gcc45)
diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec
index 2dad86f..31517aa 100644
--- a/mingw32-filesystem.spec
+++ b/mingw32-filesystem.spec
@@ -2,7 +2,7 @@
Name: mingw32-filesystem
Version: 69
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: MinGW base filesystem and environment
Group: Development/Libraries
@@ -191,6 +191,9 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32
%changelog
+* Mon Mar 26 2012 Ivan Romanov <[email protected]> - 69.5
+- windres options for cmake (RHBZ #652435)
+
* Sat Nov 12 2011 Erik van Pienbroek <[email protected]> - 69-4
- Backported the changes from f16/master up to 69-8 excluding 69-3
This contains a more complete list of Win32 default DLLs and
_______________________________________________
mingw mailing list
[email protected]
https://admin.fedoraproject.org/mailman/listinfo/mingw
