Merge pull request #4744 from ligfx/cleanup-osx-cmake

CMake: Cleanup macOS-related logic
This commit is contained in:
Markus Wick authored and GitHub committed 2017-01-24 14:36:10 +01:00
commit eed64bb0fe
6 files changed
+28 -61

No files matched your search

+1 -2
View File
@@ -839,14 +839,13 @@ if(APPLE)
iconv
${APPKIT_LIBRARY}
${APPSERV_LIBRARY}
${ATB_LIBRARY}
${CARBON_LIBRARY}
${COCOA_LIBRARY}
${COREFUND_LIBRARY}
${CORESERV_LIBRARY}
${IOK_LIBRARY}
${OPENGL_LIBRARY}
${QUICKTIME_LIBRARY})
)
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+1 -1
View File
@@ -48,7 +48,7 @@
*/
#define wxOSX_USE_QUICKTIME 0
#define wxOSX_USE_AUDIOTOOLBOX 1
#define wxOSX_USE_AUDIOTOOLBOX 0
/*
Use the more efficient FSEvents API instead of kqueue
+1 -1
View File
@@ -875,7 +875,7 @@
/*
* wxWebKitCtrl
*/
#define wxUSE_WEBKIT 1
#define wxUSE_WEBKIT 0
/*
* Objective-C class name uniquifying