mirror of
https://github.com/telegramdesktop/tdesktop
synced 2025-01-29 19:03:03 +00:00
Added Xcode projects to .gitignore, added some Xcode settings to GYP.
This commit is contained in:
parent
d703746875
commit
b821978a36
1
.gitignore
vendored
1
.gitignore
vendored
@ -25,6 +25,7 @@
|
||||
*.opendb
|
||||
*.VC.db
|
||||
*.aps
|
||||
*.xcodeproj
|
||||
/Win32/
|
||||
ipch/
|
||||
|
||||
|
@ -57,11 +57,14 @@
|
||||
'build_win%': '<(build_win)',
|
||||
'build_mac%': '<(build_mac)',
|
||||
'build_linux%': '<(build_linux)',
|
||||
|
||||
'official_build_target%': '<!(python <(DEPTH)/official.py --read-target)',
|
||||
},
|
||||
'build_os%': '<(build_os)',
|
||||
'build_win%': '<(build_win)',
|
||||
'build_mac%': '<(build_mac)',
|
||||
'build_linux%': '<(build_linux)',
|
||||
'official_build_target%': '<(official_build_target)',
|
||||
'mac_target%': '10.8',
|
||||
|
||||
# GYP does not support per-configuration libraries :(
|
||||
@ -77,6 +80,13 @@
|
||||
'ld_lib_postfix': '',
|
||||
'exe_ext': '',
|
||||
}],
|
||||
[ '"<(official_build_target)" == "mac32"', {
|
||||
'mac_target%': '10.6',
|
||||
'build_mac32': 1,
|
||||
}, {
|
||||
'mac_target%': '10.8',
|
||||
'build_mac32': 0,
|
||||
}]
|
||||
],
|
||||
'ld_lib_prefix': '<(ld_lib_prefix)',
|
||||
'ld_lib_postfix': '<(ld_lib_postfix)',
|
||||
@ -84,7 +94,6 @@
|
||||
|
||||
'library%': 'static_library',
|
||||
|
||||
'official_build_target%': '<!(python <(DEPTH)/official.py --read-target)',
|
||||
},
|
||||
|
||||
'configurations': {
|
||||
|
@ -46,19 +46,37 @@
|
||||
'CoreWLAN',
|
||||
'IOKit',
|
||||
],
|
||||
'mac_common_flags': [
|
||||
'-pipe',
|
||||
'-g',
|
||||
'-Wall',
|
||||
'-W',
|
||||
'-fPIE',
|
||||
'-Wno-unused-variable',
|
||||
'-Wno-unused-parameter',
|
||||
'-Wno-unused-function',
|
||||
'-Wno-switch',
|
||||
'-Wno-comment',
|
||||
'-Wno-missing-field-initializers',
|
||||
],
|
||||
},
|
||||
'xcode_settings': {
|
||||
'SYMROOT': '../../out',
|
||||
'SYMROOT': '../../out',
|
||||
'OTHER_CFLAGS': [
|
||||
'<@(mac_common_flags)',
|
||||
],
|
||||
'OTHER_CPLUSPLUSFLAGS': [
|
||||
'-std=c++14',
|
||||
'-Wno-switch',
|
||||
'-stdlib=libc++',
|
||||
'<@(mac_common_flags)',
|
||||
],
|
||||
'OTHER_LDFLAGS': [
|
||||
'-stdlib=libc++',
|
||||
'<!@(python -c "for s in \'<@(mac_frameworks)\'.split(\' \'): print(\'-framework \' + s)")',
|
||||
],
|
||||
'MACOSX_DEPLOYMENT_TARGET': '<(mac_target)',
|
||||
'COMBINE_HIDPI_IMAGES': 'YES',
|
||||
'COPY_PHASE_STRIP': 'NO',
|
||||
'CLANG_CXX_LANGUAGE_STANDARD': 'c++14',
|
||||
'CLANG_CXX_LIBRARY': 'libc++',
|
||||
},
|
||||
}],
|
||||
],
|
||||
|
@ -31,16 +31,16 @@
|
||||
'-lm',
|
||||
'-lssl',
|
||||
'-lcrypto',
|
||||
'-llzma',
|
||||
'-lopenal',
|
||||
'-lopus',
|
||||
'-lexif',
|
||||
'/usr/local/lib/liblzma.a',
|
||||
'/usr/local/lib/libopenal.a',
|
||||
'/usr/local/lib/libopus.a',
|
||||
'/usr/local/lib/libexif.a',
|
||||
'-lavcodec',
|
||||
'-lavformat',
|
||||
'-lswscale',
|
||||
'-lswresample',
|
||||
'-lavutil',
|
||||
'-liconv',
|
||||
'/usr/local/lib/libiconv.a',
|
||||
'-lbase',
|
||||
'-lcrashpad_client',
|
||||
'-lcrashpad_util',
|
||||
@ -60,11 +60,19 @@
|
||||
'library_dirs': [
|
||||
'<(libs_loc)/crashpad/crashpad/out/Debug',
|
||||
],
|
||||
'xcode_settings': {
|
||||
'GCC_OPTIMIZATION_LEVEL': '0',
|
||||
},
|
||||
},
|
||||
'Release': {
|
||||
'library_dirs': [
|
||||
'<(libs_loc)/crashpad/crashpad/out/Release',
|
||||
],
|
||||
'xcode_settings': {
|
||||
'DEBUG_INFORMATION_FORMAT': 'dwarf-with-dsym',
|
||||
'LLVM_LTO': 'YES',
|
||||
'GCC_OPTIMIZATION_LEVEL': 'fast',
|
||||
},
|
||||
},
|
||||
},
|
||||
'mac_bundle': '1',
|
||||
|
Loading…
Reference in New Issue
Block a user