widelands-dev team mailing list archive

[Tino <tino.miegel@xxxxxxxxxxxxxx>]

Tino has proposed merging lp:~widelands-dev/widelands/fixbug-669380 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  #669380 win32 binary file is missing wl-icon
  https://bugs.launchpad.net/bugs/669380


Don't include the win32 icon to the library on all other platforms, but use it for the binary just on win32/mingw.
-- 
https://code.launchpad.net/~widelands-dev/widelands/fixbug-669380/+merge/39737
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fixbug-669380 into lp:widelands.

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2010-11-01 05:35:09 +0000
+++ src/CMakeLists.txt	2010-11-01 10:21:23 +0000
@@ -42,10 +42,14 @@
 IF (DEFINED MSVC)
   add_executable (widelands ${GUI_TYPE} main.cc build_info.cc widelands.rc)
 else (DEFINED MSVC)
-  add_executable (widelands ${GUI_TYPE} main.cc build_info.cc)
+  if (DEFINED MINGW)
+    add_executable (widelands ${GUI_TYPE} main.cc build_info.cc ${WIN32_ICON_O})
+  else (DEFINED MINGW)
+    add_executable (widelands ${GUI_TYPE} main.cc build_info.cc)
+  endif (DEFINED MINGW) 
 endif (DEFINED MSVC)
 
-add_library (widelands_all ${WIN32_ICON_O} ${WL_SRCS_CC} ${WL_SRCS_H})
+add_library (widelands_all ${WL_SRCS_CC} ${WL_SRCS_H})
 
 set (WL_SOURCES_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
 set (WL_SOURCES_BINARY_ROOT ${CMAKE_CURRENT_BINARY_DIR})