Merge lp:~widelands-dev/widelands/fixbug-669380 into lp:widelands
Proposed by
Tino
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Jens Beyer | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 5642 | ||||
Proposed branch: | lp:~widelands-dev/widelands/fixbug-669380 | ||||
Merge into: | lp:widelands | ||||
Diff against target: |
20 lines (+6/-2) 1 file modified
src/CMakeLists.txt (+6/-2) |
||||
To merge this branch: | bzr merge lp:~widelands-dev/widelands/fixbug-669380 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jens Beyer | Approve | ||
Review via email: mp+39737@code.launchpad.net |
Description of the change
Don't include the win32 icon to the library on all other platforms, but use it for the binary just on win32/mingw.
To post a comment you must log in.
looks quite good, shouldn't harm on Linux and Mac
shouldn't harm Linux -> Windows MinGW crosscompiling either