From 0040694505411785ec98e660fe81faad9630f515 Mon Sep 17 00:00:00 2001 From: Johannes Goslar Date: Tue, 12 Jul 2016 16:08:42 +0200 Subject: Update Xcodeproj Include all currently relevent files. Call autogen is build script. Fix compiler settings. Fix mach include. --- generate-darwin-source-and-headers.py | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) mode change 100644 => 100755 generate-darwin-source-and-headers.py (limited to 'generate-darwin-source-and-headers.py') diff --git a/generate-darwin-source-and-headers.py b/generate-darwin-source-and-headers.py old mode 100644 new mode 100755 index 005537f..271dd88 --- a/generate-darwin-source-and-headers.py +++ b/generate-darwin-source-and-headers.py @@ -19,7 +19,7 @@ class simulator_platform(Platform): prefix = "#ifdef __i386__\n\n" suffix = "\n\n#endif" src_dir = 'x86' - src_files = ['sysv.S', 'ffi.c'] + src_files = ['sysv.S', 'ffi.c', 'internal.h'] class simulator64_platform(Platform): @@ -32,7 +32,7 @@ class simulator64_platform(Platform): prefix = "#ifdef __x86_64__\n\n" suffix = "\n\n#endif" src_dir = 'x86' - src_files = ['unix64.S', 'ffi64.c'] + src_files = ['unix64.S', 'ffi64.c', 'ffiw64.c', 'win64.S', 'internal64.h', 'asmnames.h'] class device_platform(Platform): @@ -45,7 +45,7 @@ class device_platform(Platform): prefix = "#ifdef __arm__\n\n" suffix = "\n\n#endif" src_dir = 'arm' - src_files = ['sysv.S', 'trampoline.S', 'ffi.c'] + src_files = ['sysv.S', 'ffi.c', 'internal.h'] class device64_platform(Platform): @@ -58,7 +58,7 @@ class device64_platform(Platform): prefix = "#ifdef __arm64__\n\n" suffix = "\n\n#endif" src_dir = 'aarch64' - src_files = ['sysv.S', 'ffi.c'] + src_files = ['sysv.S', 'ffi.c', 'internal.h'] class desktop32_platform(Platform): @@ -100,8 +100,11 @@ def move_file(src_dir, dst_dir, filename, file_suffix=None, prefix='', suffix='' out_filename = filename if file_suffix: - split_name = os.path.splitext(filename) - out_filename = "%s_%s%s" % (split_name[0], file_suffix, split_name[1]) + if filename in ['internal64.h', 'asmnames.h', 'internal.h']: + out_filename = filename + else: + split_name = os.path.splitext(filename) + out_filename = "%s_%s%s" % (split_name[0], file_suffix, split_name[1]) with open(os.path.join(src_dir, filename)) as in_file: with open(os.path.join(dst_dir, out_filename), 'w') as out_file: @@ -160,18 +163,11 @@ def build_target(platform, platform_headers): platform_headers[filename].add((platform.prefix, platform.arch, platform.suffix)) -def make_tramp(): - with open('src/arm/trampoline.S', 'w') as tramp_out: - p = subprocess.Popen(['bash', 'src/arm/gentramp.sh'], stdout=tramp_out) - p.wait() - - def generate_source_and_headers(generate_osx=True, generate_ios=True): copy_files('src', 'darwin_common/src', pattern='*.c') copy_files('include', 'darwin_common/include', pattern='*.h') if generate_ios: - make_tramp() copy_src_platform_files(simulator_platform) copy_src_platform_files(simulator64_platform) copy_src_platform_files(device_platform) -- cgit v1.2.1