mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 14:16:32 +02:00
Code Issues Releases Wiki Activity

Merge pull request #149 from TheOneRing/fix_windows

Browse Source 
Fix native windows build
This commit is contained in:
Dominik Schmidt
2013-01-11 06:36:51 -08:00
parent a70ece1523 08369c0476
commit 346a24ed7f
3 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeModules/NSIS.template.in
View File

@@ -276,7 +276,6 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
File "${INSTALL_PATH}\bin\tomahawk_crash_reporter.exe" File "${INSTALL_PATH}\bin\tomahawk_crash_reporter.exe"
File "${INSTALL_PATH}\bin\libtomahawk_breakpad.dll" File "${INSTALL_PATH}\bin\libtomahawk_breakpad.dll"
File "${INSTALL_PATH}\bin\libqxtweb-standalone.dll"
File "${INSTALL_PATH}\bin\libtomahawk_portfwd.dll" File "${INSTALL_PATH}\bin\libtomahawk_portfwd.dll"
File "${INSTALL_PATH}\bin\libtomahawklib.dll" File "${INSTALL_PATH}\bin\libtomahawklib.dll"
; plugins ; plugins
@@ -290,7 +289,6 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
File "${BUILD_PATH}\libtomahawk_breakpad.dll" File "${BUILD_PATH}\libtomahawk_breakpad.dll"
File "${BUILD_PATH}\libtomahawklib.dll" File "${BUILD_PATH}\libtomahawklib.dll"
File "${BUILD_PATH}\libqxtweb-standalone.dll"
File "${BUILD_PATH}\libtomahawk_portfwd.dll" File "${BUILD_PATH}\libtomahawk_portfwd.dll"
; plugins ; plugins
File "${BUILD_PATH}\libtomahawk_*_*.dll" File "${BUILD_PATH}\libtomahawk_*_*.dll"

14
thirdparty/qxt/qxtweb-standalone/CMakeLists.txt vendored
View File

@@ -58,25 +58,11 @@ SET( sources
) )
# DLL on windows due to linker issues, otherwise static
IF(WIN32)
ADD_LIBRARY(qxtweb-standalone SHARED
${mocstuff}
${headers}
${sources}
)
INSTALL( TARGETS qxtweb-standalone
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)
ELSE()
ADD_LIBRARY(qxtweb-standalone STATIC ADD_LIBRARY(qxtweb-standalone STATIC
${mocstuff} ${mocstuff}
${headers} ${headers}
${sources} ${sources}
) )
ENDIF()
target_link_libraries( qxtweb-standalone target_link_libraries( qxtweb-standalone

2
thirdparty/qxt/qxtweb-standalone/qxtweb/qxtglobal.h vendored
View File

@@ -51,6 +51,8 @@
#define QXT_DLLEXPORT DO_NOT_USE_THIS_ANYMORE #define QXT_DLLEXPORT DO_NOT_USE_THIS_ANYMORE
#define QXT_STATIC
#if !defined(QXT_STATIC) && !defined(QXT_DOXYGEN_RUN) #if !defined(QXT_STATIC) && !defined(QXT_DOXYGEN_RUN)
# if defined(BUILD_QXT_CORE) # if defined(BUILD_QXT_CORE)
# define QXT_CORE_EXPORT Q_DECL_EXPORT # define QXT_CORE_EXPORT Q_DECL_EXPORT