Current version of Psi+ is 1.2.32

It is based on: * psi: 83e671e2 * patches: 327535e * plugins: 054fa8e * resources: b261bbc
psi-plus · Aug 8, 2017 · be381e4 · be381e4
1 parent 075b2b0
commit be381e4
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 38 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,6 +14,7 @@ option( ENABLE_WEBKIT "Enable webkit support" ON )
 option( USE_WEBENGINE "Use WebEngine support instead of Webkit" OFF )
 option( USE_CCACHE "Use ccache utility if found" ON )
 option( VERBOSE_PROGRAM_NAME "Verbose output binary name" OFF ) #Experimental
+option( USE_CRASH "Enable builtin sigsegv handling" OFF )
 #Windows or MXE only
 option( USE_MXE "Use MXE cross-compilation" OFF )
 option( ENABLE_PORTABLE "Create portable version of Psi+ in win32" OFF)
@@ -70,6 +71,10 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug" OR ("${CMAKE_BUILD_TYPE}" STREQUAL "Re
 	set(ISDEBUG ON)
 endif()
 
+if(USE_CRASH)
+	add_definitions(-DUSE_CRASH)
+endif()
+
 if(WIN32)
 	if(MSVC)
 		set(BUILD_ARCH "win64" CACHE STRING "CPU architecture win32/win64")
@@ -119,7 +124,7 @@ if(WIN32)
 endif()
 
 set(VER_FILE ${PROJECT_SOURCE_DIR}/version)
-set(DEFAULT_VER "1.1")
+set(DEFAULT_VER "1.2")
 if(EXISTS "${VER_FILE}")
 	message(STATUS "Found Psi version file: ${VER_FILE}")
 	file(STRINGS "${VER_FILE}" VER_LINES)
@@ -197,29 +202,42 @@ else()
 	if(NOT MSVC)
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wextra")
 		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra")
+		set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0")
+		set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0")
 	else()
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
-		if(NOT ISDEBUG)
-			set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /LTCG")
-			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LTCG")
-		endif()
+		set(DEFAULT_DEBUG_FLAG "/ENTRY:mainCRTStartup /DEBUG /INCREMENTAL /SAFESEH:NO /MANIFEST:NO")
+		set(DEFAULT_LINKER_FLAG "/ENTRY:mainCRTStartup /INCREMENTAL:NO /LTCG")
+		set (CMAKE_EXE_LINKER_FLAGS_DEBUG		"${DEFAULT_DEBUG_FLAG}" CACHE STRING "" FORCE)
+		set (CMAKE_EXE_LINKER_FLAGS_MINSIZEREL		"${DEFAULT_LINKER_FLAG}" CACHE STRING "" FORCE)
+		set (CMAKE_EXE_LINKER_FLAGS_RELEASE		"${DEFAULT_LINKER_FLAG}" CACHE STRING "" FORCE)
+		set (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO	"${DEFAULT_DEBUG_FLAG}" CACHE STRING "" FORCE)
+		set (CMAKE_MODULE_LINKER_FLAGS_DEBUG		"/DEBUG /INCREMENTAL /SAFESEH:NO /MANIFEST:NO" CACHE STRING "" FORCE)
+		set (CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL	"/INCREMENTAL:NO /LTCG" CACHE STRING "" FORCE)
+		set (CMAKE_MODULE_LINKER_FLAGS_RELEASE		"/INCREMENTAL:NO /LTCG" CACHE STRING "" FORCE)
+		set (CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO	"/DEBUG /INCREMENTAL:NO /MANIFEST:NO" CACHE STRING "" FORCE)
+		set (CMAKE_SHARED_LINKER_FLAGS_DEBUG		"${DEFAULT_DEBUG_FLAG}" CACHE STRING "" FORCE)
+		set (CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL	"${DEFAULT_LINKER_FLAG}" CACHE STRING "" FORCE)
+		set (CMAKE_SHARED_LINKER_FLAGS_RELEASE		"${DEFAULT_LINKER_FLAG}" CACHE STRING "" FORCE)
+		set (CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO	"${DEFAULT_DEBUG_FLAG}" CACHE STRING "" FORCE)
+		set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /ZI")
+		set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /ZI /MTd")
 		add_definitions(-DNOMINMAX)
+		add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+		add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
+		add_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS)
+		add_definitions(-D_SCL_SECURE_NO_WARNINGS)
+		add_definitions(-D_WINSOCK_DEPRECATED_NO_WARNINGS)
+		add_definitions(-D_UNICODE)
 	endif()
 endif()
 
-message(STATUS "CXX flags: ${CMAKE_CXX_FLAGS}")
-message(STATUS "C flags: ${CMAKE_C_FLAGS}")
-
 if(ISDEBUG)
-	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0")
-	set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0")
-	if(MSVC)
-		set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /INCREMENT:NO /MANIFEST:NO")
-		set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /INCREMENT:NO /MANIFEST:NO")
-		set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
-	endif()
 	message(STATUS "CXX debug flags: ${CMAKE_CXX_FLAGS_DEBUG}")
 	message(STATUS "C debug flags: ${CMAKE_C_FLAGS_DEBUG}")
+else()
+	message(STATUS "CXX flags: ${CMAKE_CXX_FLAGS}")
+	message(STATUS "C flags: ${CMAKE_C_FLAGS}")
 endif()
 
 if(NOT WIN32 AND PRODUCTION)

diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
@@ -67,25 +67,27 @@ list(APPEND PLAIN_HEADERS
 	tunecontroller/tunecontrollerplugin.h
 )
 
-list(APPEND PLAIN_HEADERS
-	crash/crash.h
-)
-
-if(LINUX)
-	list(APPEND PLAIN_SOURCES
-		crash/crash_sigsegv.cpp
-		crash/crash.cpp
-	)
+if(USE_CRASH)
 	list(APPEND PLAIN_HEADERS
-		crash/crash_sigsegv.h
-	)
-endif()
-if(WIN32)
-	list(APPEND PLAIN_SOURCES
-		crash/crash_dummy.cpp
+		crash/crash.h
 	)
+
+	if(LINUX)
+		list(APPEND PLAIN_SOURCES
+			crash/crash_sigsegv.cpp
+			crash/crash.cpp
+		)
+		list(APPEND PLAIN_HEADERS
+			crash/crash_sigsegv.h
+		)
+	endif()
+	if(WIN32)
+		list(APPEND PLAIN_SOURCES
+			crash/crash_dummy.cpp
+		)
+	endif()
 endif()
-	
+
 include_directories(tunecontroller)
 
 add_definitions(-DTC_PSIFILE)

diff --git a/src/win32-prepare-deps.cmake b/src/win32-prepare-deps.cmake
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.1.0)
-if(CMAKE_BUILD_TYPE STREQUAL "Debug" AND WIN32)
-	set(D "d")
-endif()
 if(WIN32)
+	if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+		set(D "d")
+	endif()
 	# Get Qt installation path
 	string(REGEX REPLACE "([^ ]+)[/\\].*" "\\1" QT_BIN_DIR_TMP "${QT_MOC_EXECUTABLE}")
 	string(REGEX REPLACE "\\\\" "/" QT_BIN_DIR "${QT_BIN_DIR_TMP}")
@@ -43,9 +43,7 @@ if(WIN32)
 		message(STATUS "WinDeployQt utility - FOUND")
 		if(CMAKE_BUILD_TYPE STREQUAL "Debug")
 			list(APPEND WDARGS --debug)
-		elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
-			list(APPEND WDARGS --release-with-debug-info)
-		elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
+		else()
 			list(APPEND WDARGS --release)
 		endif()
 		add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD

diff --git a/version b/version
@@ -1 +1 @@
-1.2.31 (2017-08-08, Psi:46365f48, Psi+:327535e)
+1.2.32 (2017-08-09, Psi:83e671e2, Psi+:327535e)