Merge pull request #334 from TheOneRing/ecm

Use ECMAddAppIcon instead of the copy of the kde4 macro.

src/crashreporter/resources.qrc

@@ -1,5 +1,5 @@
 <RCC>
     <qresource prefix="/">
-        <file alias="tomahawk-icon.png">../../data/icons/tomahawk-icon-128x128.png</file>
+        <file alias="tomahawk-icon.png">../../data/icons/128x128-tomahawk-icon.png</file>
     </qresource>
 </RCC>

src/tomahawk/CMakeLists.txt

@@ -1,9 +1,6 @@
-PROJECT( tomahawk )
-CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
-
 set(TOMAHAWK_APPLICATION_TARGET "tomahahawk-bin")
 
-include( AddAppIconMacro )
+include( ECMAddAppIcon )
 
 # SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" )
 # SET( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" )
@@ -148,7 +145,10 @@ IF( BUILD_GUI )
     qt_wrap_ui( tomahawkUI_H ${tomahawkUI} )
 ENDIF()
 
-tomahawk_add_app_icon( tomahawkSources Tomahawk "${CMAKE_SOURCE_DIR}/data/icons/tomahawk-icon-*.png" )
+file( GLOB_RECURSE TOMAHAWK_ICONS "${CMAKE_SOURCE_DIR}/data/icons/*-tomahawk-icon.png" )
+
+ecm_add_app_icon( tomahawkSources ICONS ${TOMAHAWK_ICONS} )
+
 qt_add_resources( RC_SRCS "../../resources.qrc" )
 
 SET( final_src ${final_src} ${tomahawkUI_H} ${tomahawkMoc} ${tomahawkSources} ${RC_SRCS} )

src/tomahawk/CMakeLists.win32.cmake

@@ -1,6 +1,6 @@
 ADD_DEFINITIONS( -DNOMINMAX )
 ADD_DEFINITIONS( -DWIN32_LEAN_AND_MEAN )
-ADD_DEFINITIONS( -static-libgcc )
+set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static-libgcc" )
 ADD_DEFINITIONS( -DUNICODE )
 
 SET( OS_SPECIFIC_LINK_LIBRARIES