From f10416af8a3faf223a3c49f3a08145554cc5c87f Mon Sep 17 00:00:00 2001 From: Braden Obrzut Date: Thu, 7 May 2015 23:52:58 -0400 Subject: [PATCH 1/2] - Fixed: Missing WINAPI macro in SHGetFolderPathA (MSDN documentation didn't include it so I didn't. Apparently Microsoft is just incosistent since it's documented in functions like GetLongPathName.) --- src/m_specialpaths.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/m_specialpaths.cpp b/src/m_specialpaths.cpp index 3e12be17d..7a48a2b9c 100644 --- a/src/m_specialpaths.cpp +++ b/src/m_specialpaths.cpp @@ -83,7 +83,7 @@ bool GetKnownFolder(int shell_folder, REFKNOWNFOLDERID known_folder, bool create // new to Vista, hence the reason we support both. if (SHGetKnownFolderPath == NULL) { - static TOptWin32Proc + static TOptWin32Proc SHGetFolderPathA("shell32.dll", "SHGetFolderPathA"); // NT4 doesn't even have this function. From 92989a8c77354455d68b8b679bc1154d6182e9f0 Mon Sep 17 00:00:00 2001 From: svdijk Date: Sat, 16 May 2015 12:10:08 +0200 Subject: [PATCH 2/2] CMake: Fix building on 32-bit Linux (Fedora 20). --- dumb/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dumb/CMakeLists.txt b/dumb/CMakeLists.txt index d13f23254..e95c69154 100644 --- a/dumb/CMakeLists.txt +++ b/dumb/CMakeLists.txt @@ -111,6 +111,6 @@ if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE ) CHECK_CXX_COMPILER_FLAG( -msse DUMB_CAN_USE_SSE ) if( DUMB_CAN_USE_SSE ) - set_source_files_properties( src/it/filter.cpp PROPERTIES COMPILE_FLAGS -msse ) + set_source_files_properties( src/helpers/resampler.c PROPERTIES COMPILE_FLAGS -msse ) endif( DUMB_CAN_USE_SSE ) endif( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )