mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-05 21:57:41 +02:00
Code Issues Releases Wiki Activity

Few minor fixes/improvements for Windows installer

Browse Source
This commit is contained in:
Dominik Schmidt
2013-06-27 15:32:07 +02:00
parent a1cc970443
commit 1637436b4f
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeModules/NSIS.template.in
View File

@@ -274,7 +274,6 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
File "${INSTALL_PATH}\bin\tomahawk.exe" File "${INSTALL_PATH}\bin\tomahawk.exe"
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.dll" File "${INSTALL_PATH}\bin\libtomahawk.dll"
; plugins ; plugins
@@ -285,7 +284,6 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
File "${BUILD_PATH}\tomahawk.exe" File "${BUILD_PATH}\tomahawk.exe"
File "${BUILD_PATH}\tomahawk_crash_reporter.exe" File "${BUILD_PATH}\tomahawk_crash_reporter.exe"
File "${BUILD_PATH}\libtomahawk_breakpad.dll"
File "${BUILD_PATH}\libtomahawk.dll" File "${BUILD_PATH}\libtomahawk.dll"
; plugins ; plugins
@@ -361,8 +359,8 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
File "${MING_BIN}\libssl-8.dll" File "${MING_BIN}\libssl-8.dll"
File "${MING_BIN}\libcrypto-8.dll" File "${MING_BIN}\libcrypto-8.dll"
File "${MING_LIB}\libclucene-core.dll" File "${MING_BIN}\libclucene-core.dll"
File "${MING_LIB}\libclucene-shared.dll" File "${MING_BIN}\libclucene-shared.dll"
File "${MING_BIN}\libqtsparkle.dll" File "${MING_BIN}\libqtsparkle.dll"
File "${MING_BIN}\libattica.dll" File "${MING_BIN}\libattica.dll"

6
thirdparty/breakpad/CMakeLists.txt vendored
View File

@@ -80,9 +80,5 @@ ENDIF(WIN32)
INCLUDE_DIRECTORIES(.) INCLUDE_DIRECTORIES(.)
ADD_DEFINITIONS( -fPIC ) ADD_DEFINITIONS( -fPIC )
IF(WIN32) ADD_LIBRARY( tomahawk_breakpad STATIC ${breakpadSources} )
ADD_LIBRARY( tomahawk_breakpad SHARED ${breakpadSources} )
ELSE()
ADD_LIBRARY( tomahawk_breakpad STATIC ${breakpadSources} )
ENDIF()
TARGET_LINK_LIBRARIES( tomahawk_breakpad ) TARGET_LINK_LIBRARIES( tomahawk_breakpad )