Add more defines from gyp

This commit is contained in:
Berkus Decker 2017-12-17 05:17:00 +02:00 committed by Berkus Decker
parent fb2fe2057d
commit a1e200c273
1 changed files with 53 additions and 18 deletions

View File

@ -563,11 +563,24 @@ if(NOT WIN32)
endif() endif()
if (WIN32) if (WIN32)
add_definitions(-D_CRT_SECURE_NO_WARNINGS -DWIN32 -D_WINDOWS -DUNICODE -DWIN64 add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -D_USING_V110_SDK71_
-DWINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP) -DWIN32 -D_WINDOWS -D_UNICODE -DUNICODE -DWIN64
-DWINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP
-DHAVE_STDINT_H -DZLIB_WINAPI)
endif() endif()
add_definitions(-DAL_LIBTYPE_STATIC)
add_definitions(-DAL_ALEXT_PROTOTYPES)
add_definitions(-DTGVOIP_USE_CXX11_LIB)
add_definitions(-DTDESKTOP_DISABLE_CRASH_REPORTS) add_definitions(-DTDESKTOP_DISABLE_CRASH_REPORTS)
add_definitions(-DTDESKTOP_DISABLE_GTK_INTEGRATION) # Linux only
if (LINUX)
add_definitions(-D_REENTRANT)
endif()
# TODO check if needs libexif in deps
if (APPLE) if (APPLE)
set(MACOSX_BUNDLE_ICON_FILE Icon.icns) set(MACOSX_BUNDLE_ICON_FILE Icon.icns)
@ -593,6 +606,16 @@ if (APPLE)
target_sources(Telegram PRIVATE target_sources(Telegram PRIVATE
${CMAKE_CURRENT_BINARY_DIR}/${MACOSX_BUNDLE_ICON_FILE} ${CMAKE_CURRENT_BINARY_DIR}/${MACOSX_BUNDLE_ICON_FILE}
) )
foreach(langpack en de es it nl ko pt-BR)
set(LOCALIZABLE_STRINGS Resources/langs/${langpack}.lproj/Localizable.strings)
set_source_files_properties(${LOCALIZABLE_STRINGS}
PROPERTIES
MACOSX_PACKAGE_LOCATION ${LOCALIZABLE_STRINGS})
target_sources(Telegram PRIVATE
${LOCALIZABLE_STRINGS}
)
endforeach(langpack)
endif() endif()
# Disable a single annoying warning about c++17 # Disable a single annoying warning about c++17
@ -602,7 +625,10 @@ endif()
# Enable C++14 support for msvc (@todo this should be done in cmake - see ver 3.10 or above) # Enable C++14 support for msvc (@todo this should be done in cmake - see ver 3.10 or above)
if(WIN32) if(WIN32)
target_compile_options(Telegram PRIVATE /std:c++14) target_compile_options(Telegram PRIVATE
/std:c++14
/EHsc # Catch C++ exceptions only, extern C functions never throw a C++ exception.
)
endif() endif()
target_compile_definitions(Telegram PRIVATE ${FFMPEG_DEFINITIONS}) target_compile_definitions(Telegram PRIVATE ${FFMPEG_DEFINITIONS})
@ -630,22 +656,31 @@ if (APPLE)
PROPERTIES PROPERTIES
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Telegram.plist MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Telegram.plist
) )
find_library(COREFOUNDATION_LIB CoreFoundation) foreach(framework
find_library(COREAUDIO_LIB CoreAudio) Cocoa
find_library(AUDIOUNIT_LIB AudioUnit) CoreFoundation
find_library(AUDIOTOOLBOX_LIB AudioToolbox) CoreServices
find_library(COCOA_LIB Cocoa) CoreText
find_library(CARBON_LIB Carbon) CoreGraphics
find_library(IOKIT_LIB IOKit) OpenGL
target_link_libraries(Telegram AudioUnit
${COREFOUNDATION_LIB} ApplicationServices
${COCOA_LIB} Foundation
${CARBON_LIB} AGL
${COREAUDIO_LIB} Security
${AUDIOUNIT_LIB} SystemConfiguration
${AUDIOTOOLBOX_LIB} Carbon
${IOKIT_LIB} AudioToolbox
CoreAudio
QuartzCore
AppKit
CoreWLAN
IOKit
) )
find_library(FW_LIB ${framework})
target_link_libraries(Telegram ${FW_LIB})
set(FW_LIB FW_LIB-NOTFOUND)
endforeach(framework)
endif() endif()
if(WIN32) if(WIN32)