From 1637436b4f6d63e24e4097b66d9dca48bf5d2fff Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Thu, 27 Jun 2013 15:32:07 +0200 Subject: [PATCH] Few minor fixes/improvements for Windows installer --- CMakeModules/NSIS.template.in | 6 ++---- thirdparty/breakpad/CMakeLists.txt | 6 +----- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/CMakeModules/NSIS.template.in b/CMakeModules/NSIS.template.in index b50e0c38f..08ee16a95 100644 --- a/CMakeModules/NSIS.template.in +++ b/CMakeModules/NSIS.template.in @@ -274,7 +274,6 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER File "${INSTALL_PATH}\bin\tomahawk.exe" File "${INSTALL_PATH}\bin\tomahawk_crash_reporter.exe" - File "${INSTALL_PATH}\bin\libtomahawk_breakpad.dll" File "${INSTALL_PATH}\bin\libtomahawk.dll" ; plugins @@ -285,7 +284,6 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER File "${BUILD_PATH}\tomahawk.exe" File "${BUILD_PATH}\tomahawk_crash_reporter.exe" - File "${BUILD_PATH}\libtomahawk_breakpad.dll" File "${BUILD_PATH}\libtomahawk.dll" ; plugins @@ -361,8 +359,8 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER File "${MING_BIN}\libssl-8.dll" File "${MING_BIN}\libcrypto-8.dll" - File "${MING_LIB}\libclucene-core.dll" - File "${MING_LIB}\libclucene-shared.dll" + File "${MING_BIN}\libclucene-core.dll" + File "${MING_BIN}\libclucene-shared.dll" File "${MING_BIN}\libqtsparkle.dll" File "${MING_BIN}\libattica.dll" diff --git a/thirdparty/breakpad/CMakeLists.txt b/thirdparty/breakpad/CMakeLists.txt index 446175f3c..a9761dcc9 100644 --- a/thirdparty/breakpad/CMakeLists.txt +++ b/thirdparty/breakpad/CMakeLists.txt @@ -80,9 +80,5 @@ ENDIF(WIN32) INCLUDE_DIRECTORIES(.) ADD_DEFINITIONS( -fPIC ) -IF(WIN32) - ADD_LIBRARY( tomahawk_breakpad SHARED ${breakpadSources} ) -ELSE() - ADD_LIBRARY( tomahawk_breakpad STATIC ${breakpadSources} ) -ENDIF() +ADD_LIBRARY( tomahawk_breakpad STATIC ${breakpadSources} ) TARGET_LINK_LIBRARIES( tomahawk_breakpad )