Rename libtomahawklib.* files to libtomahawk.*

Needed lots of fixes for exporting on windows because otherwise a
libtomahawk.dll.a was created for tomahawk.exe which conflicted with the
libtomahawk.dll.a that is created for libtomahawk.dll

thirdparty/libportfwd/CMakeLists.txt

@@ -8,19 +8,19 @@ SET(NATPMP_DIR      "third-party/libnatpmp-20100808")
 
 ADD_DEFINITIONS(-Wall -O2 -DNDEBUG)
 IF(WIN32)
-	ADD_DEFINITIONS(-DWIN32 -DMINIUPNP_EXPORTS )
+	ADD_DEFINITIONS(-DWIN32 )
 ELSE()
 	ADD_DEFINITIONS(-fPIC)
 ENDIF()
 INCLUDE_DIRECTORIES( ${MINIUPNP_DIR} include ${QT_INCLUDES} )
 SET( CMAKE_C_FLAGS ${CLEAN_C_FLAGS} )
 
-ADD_DEFINITIONS( -DPORTFWDDLLEXPORT_PRO )
+ADD_DEFINITIONS( -DPORTFWDDLLEXPORT_STATIC -DSTATICLIB )
 if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
   ADD_DEFINITIONS( -DMACOSX -D_DARWIN_C_SOURCE )
 endif ()
 
-ADD_LIBRARY(tomahawk_portfwd SHARED
+ADD_LIBRARY(tomahawk_portfwd STATIC
         # the needed bits of miniupnpc (no python module, no tests, no cli)
         ${MINIUPNP_DIR}/connecthostport.c
         ${MINIUPNP_DIR}/igd_desc_parse.c

thirdparty/libportfwd/include/portfwd/portfwddllmacro.h

@@ -21,12 +21,16 @@
 
 #include <QtCore/qglobal.h>
 
-#ifndef PORTFWDDLLEXPORT
-# if defined (PORTFWDDLLEXPORT_PRO)
-#  define PORTFWDDLLEXPORT Q_DECL_EXPORT
+# if defined (PORTFWDDLLEXPORT_STATIC)
+#   define PORTFWDDLLEXPORT
 # else
-#  define PORTFWDDLLEXPORT Q_DECL_IMPORT
+#   ifndef PORTFWDDLLEXPORT
+#       if defined (PORTFWDDLLEXPORT_PRO)
+#           define PORTFWDDLLEXPORT Q_DECL_EXPORT
+#       else
+#           define PORTFWDDLLEXPORT Q_DECL_IMPORT
+#       endif
+#   endif
 # endif
-#endif
 
 #endif