mirror of
https://github.com/ZDoom/zdoom-macos-deps.git
synced 2025-02-22 03:11:08 +00:00
build script: do not override compilers and other options for xcode
This commit is contained in:
parent
201a326f8f
commit
5b6aaf81aa
1 changed files with 21 additions and 16 deletions
15
build.py
15
build.py
|
@ -104,6 +104,8 @@ class Target(BaseTarget):
|
|||
env['PATH'] = env['PATH'] \
|
||||
+ os.pathsep + '/Applications/CMake.app/Contents/bin' \
|
||||
+ os.pathsep + builder.bin_path
|
||||
|
||||
if not builder.xcode:
|
||||
env['CC'] = builder.c_compiler()
|
||||
env['CXX'] = builder.cxx_compiler()
|
||||
|
||||
|
@ -400,15 +402,18 @@ class CMakeTarget(Target):
|
|||
|
||||
args = [
|
||||
'cmake',
|
||||
builder.xcode and '-GXcode' or '-GUnix Makefiles',
|
||||
'-DCMAKE_C_COMPILER=' + builder.c_compiler(),
|
||||
'-DCMAKE_CXX_COMPILER=' + builder.cxx_compiler(),
|
||||
'-DCMAKE_BUILD_TYPE=Release',
|
||||
'-DCMAKE_INSTALL_PREFIX=' + self.prefix,
|
||||
'-DCMAKE_PREFIX_PATH=' + builder.prefix_path,
|
||||
]
|
||||
|
||||
if not builder.xcode:
|
||||
if builder.xcode:
|
||||
args.append('-GXcode')
|
||||
else:
|
||||
args.append('-GUnix Makefiles')
|
||||
args.append('-DCMAKE_C_COMPILER=' + builder.c_compiler())
|
||||
args.append('-DCMAKE_CXX_COMPILER=' + builder.cxx_compiler())
|
||||
|
||||
architecture = builder.architecture()
|
||||
if architecture != machine():
|
||||
args.append('-DCMAKE_SYSTEM_NAME=Darwin')
|
||||
|
@ -1758,9 +1763,9 @@ class Builder(object):
|
|||
self.output_path = arguments.output_path
|
||||
self.verbose = arguments.verbose
|
||||
|
||||
self.platform = None
|
||||
self._platforms = []
|
||||
self._populate_platforms(arguments)
|
||||
self.platform = self._platforms[0]
|
||||
|
||||
if arguments.target:
|
||||
self.target = self.targets[arguments.target]
|
||||
|
|
Loading…
Reference in a new issue