Added Xcode projects to .gitignore, added some Xcode settings to GYP.

This commit is contained in:
John Preston 2016-08-29 20:46:57 -06:00
parent d703746875
commit b821978a36
4 changed files with 46 additions and 10 deletions

1
.gitignore vendored
View File

@ -25,6 +25,7 @@
*.opendb *.opendb
*.VC.db *.VC.db
*.aps *.aps
*.xcodeproj
/Win32/ /Win32/
ipch/ ipch/

View File

@ -57,11 +57,14 @@
'build_win%': '<(build_win)', 'build_win%': '<(build_win)',
'build_mac%': '<(build_mac)', 'build_mac%': '<(build_mac)',
'build_linux%': '<(build_linux)', 'build_linux%': '<(build_linux)',
'official_build_target%': '<!(python <(DEPTH)/official.py --read-target)',
}, },
'build_os%': '<(build_os)', 'build_os%': '<(build_os)',
'build_win%': '<(build_win)', 'build_win%': '<(build_win)',
'build_mac%': '<(build_mac)', 'build_mac%': '<(build_mac)',
'build_linux%': '<(build_linux)', 'build_linux%': '<(build_linux)',
'official_build_target%': '<(official_build_target)',
'mac_target%': '10.8', 'mac_target%': '10.8',
# GYP does not support per-configuration libraries :( # GYP does not support per-configuration libraries :(
@ -77,6 +80,13 @@
'ld_lib_postfix': '', 'ld_lib_postfix': '',
'exe_ext': '', '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_prefix': '<(ld_lib_prefix)',
'ld_lib_postfix': '<(ld_lib_postfix)', 'ld_lib_postfix': '<(ld_lib_postfix)',
@ -84,7 +94,6 @@
'library%': 'static_library', 'library%': 'static_library',
'official_build_target%': '<!(python <(DEPTH)/official.py --read-target)',
}, },
'configurations': { 'configurations': {

View File

@ -46,19 +46,37 @@
'CoreWLAN', 'CoreWLAN',
'IOKit', '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': { 'xcode_settings': {
'SYMROOT': '../../out', 'SYMROOT': '../../out',
'OTHER_CFLAGS': [
'<@(mac_common_flags)',
],
'OTHER_CPLUSPLUSFLAGS': [ 'OTHER_CPLUSPLUSFLAGS': [
'-std=c++14', '<@(mac_common_flags)',
'-Wno-switch',
'-stdlib=libc++',
], ],
'OTHER_LDFLAGS': [ 'OTHER_LDFLAGS': [
'-stdlib=libc++', '-stdlib=libc++',
'<!@(python -c "for s in \'<@(mac_frameworks)\'.split(\' \'): print(\'-framework \' + s)")', '<!@(python -c "for s in \'<@(mac_frameworks)\'.split(\' \'): print(\'-framework \' + s)")',
], ],
'MACOSX_DEPLOYMENT_TARGET': '<(mac_target)', 'MACOSX_DEPLOYMENT_TARGET': '<(mac_target)',
'COMBINE_HIDPI_IMAGES': 'YES',
'COPY_PHASE_STRIP': 'NO',
'CLANG_CXX_LANGUAGE_STANDARD': 'c++14',
'CLANG_CXX_LIBRARY': 'libc++',
}, },
}], }],
], ],

View File

@ -31,16 +31,16 @@
'-lm', '-lm',
'-lssl', '-lssl',
'-lcrypto', '-lcrypto',
'-llzma', '/usr/local/lib/liblzma.a',
'-lopenal', '/usr/local/lib/libopenal.a',
'-lopus', '/usr/local/lib/libopus.a',
'-lexif', '/usr/local/lib/libexif.a',
'-lavcodec', '-lavcodec',
'-lavformat', '-lavformat',
'-lswscale', '-lswscale',
'-lswresample', '-lswresample',
'-lavutil', '-lavutil',
'-liconv', '/usr/local/lib/libiconv.a',
'-lbase', '-lbase',
'-lcrashpad_client', '-lcrashpad_client',
'-lcrashpad_util', '-lcrashpad_util',
@ -60,11 +60,19 @@
'library_dirs': [ 'library_dirs': [
'<(libs_loc)/crashpad/crashpad/out/Debug', '<(libs_loc)/crashpad/crashpad/out/Debug',
], ],
'xcode_settings': {
'GCC_OPTIMIZATION_LEVEL': '0',
},
}, },
'Release': { 'Release': {
'library_dirs': [ 'library_dirs': [
'<(libs_loc)/crashpad/crashpad/out/Release', '<(libs_loc)/crashpad/crashpad/out/Release',
], ],
'xcode_settings': {
'DEBUG_INFORMATION_FORMAT': 'dwarf-with-dsym',
'LLVM_LTO': 'YES',
'GCC_OPTIMIZATION_LEVEL': 'fast',
},
}, },
}, },
'mac_bundle': '1', 'mac_bundle': '1',