diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-06-16 23:51:09 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-12-12 22:08:01 +0100 |
| commit | 3de41ff2657d558ba0b7121ff47b895fc0fedfdb (patch) | |
| tree | d2f4d2d471b72d61fcb26edfba153193952ca19d | |
| parent | 69a3d0fd5c9106d7a02729058df019b30fc1384c (diff) | |
Allow compilation of objective C sources.
| -rw-r--r-- | src/wx/wscript | 9 | ||||
| -rw-r--r-- | wscript | 4 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/wx/wscript b/src/wx/wscript index d3f3db88a..36fca77a3 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -21,9 +21,16 @@ import os import subprocess import shlex import glob -from waflib import Logs +from waflib import Logs, TaskGen import i18n + +@TaskGen.extension('.m') +def m_hook(self, node): + """Alias .m files to be compiled the same as .c files, gcc will do the right thing.""" + return self.create_compiled_task('c', node) + + sources = """ about_dialog.cc audio_backend.cc @@ -30,7 +30,7 @@ try: except ImportError: # python 3 from urllib.parse import urlencode -from waflib import Logs, Context +from waflib import Logs, Context, TaskGen APPNAME = 'dcpomatic' libdcp_version = '1.9.22' @@ -51,6 +51,7 @@ else: VERSION = this_version[1:].strip() def options(opt): + opt.load('compiler_c') opt.load('compiler_cxx') opt.load('winres') @@ -83,6 +84,7 @@ def options(opt): opt.add_option('--variant', help="build with variant") def configure(conf): + conf.load('compiler_c') conf.load('compiler_cxx') conf.load('clang_compilation_database', tooldir=['waf-tools']) if conf.options.target_windows_64 or conf.options.target_windows_32: |