diff --git a/meson.build b/meson.build index cddb78307..77bd8288c 100644 --- a/meson.build +++ b/meson.build @@ -20,7 +20,7 @@ copt_msvc = cpp_compiler.get_id() in [ 'msvc' ] if cpp_compiler.get_id() in [ 'msvc' ] copt_compiler = 'msvc' -elif cpp_compiler.get_id() in [ 'gcc' ] +elif cpp_compiler.get_id() in [ 'gcc', 'clang' ] copt_compiler = 'gcc' else warning('unsupported compiler: ' + cpp_compiler.get_id() + '; you are on your own') @@ -53,7 +53,7 @@ endif uopt_static = get_option('static') use_tpt_libs = 'no' -tpt_libs_vtag = 'v20210320221332' +tpt_libs_vtag = 'v20210409104352' if uopt_static == 'system' if copt_platform == 'win' error('no way to find static system libraries on windows') @@ -208,6 +208,10 @@ else '-fomit-frame-pointer', ] endif + if copt_platform == 'mac' + args_ccomp += [ '-mmacosx-version-min=10.9' ] + project_link_args += [ '-mmacosx-version-min=10.9' ] + endif project_c_args += args_ccomp project_cpp_args += args_ccomp + [ '-Wno-invalid-offsetof' ] endif diff --git a/subprojects/tpt-libs-prebuilt-i686-win-msvc-dynamic-v20210320221332.wrap b/subprojects/tpt-libs-prebuilt-i686-win-msvc-dynamic-v20210320221332.wrap deleted file mode 100644 index afbdb095c..000000000 --- a/subprojects/tpt-libs-prebuilt-i686-win-msvc-dynamic-v20210320221332.wrap +++ /dev/null @@ -1,6 +0,0 @@ -[wrap-file] -directory = tpt-libs-prebuilt-i686-win-msvc-dynamic-v20210320221332 - -source_url = https://github.com/The-Powder-Toy/tpt-libs/releases/download/v20210320221332/tpt-libs-prebuilt-i686-win-msvc-dynamic-v20210320221332.zip -source_filename = tpt-libs-prebuilt-i686-win-msvc-dynamic-v20210320221332.zip -source_hash = 9589cc47f30bb1f1b19496d5355bade6a8fe84c09de5f4ce4ce394386c3cdb95 diff --git a/subprojects/tpt-libs-prebuilt-i686-win-msvc-dynamic-v20210409104352.wrap b/subprojects/tpt-libs-prebuilt-i686-win-msvc-dynamic-v20210409104352.wrap new file mode 100644 index 000000000..fe8d7e218 --- /dev/null +++ b/subprojects/tpt-libs-prebuilt-i686-win-msvc-dynamic-v20210409104352.wrap @@ -0,0 +1,6 @@ +[wrap-file] +directory = tpt-libs-prebuilt-i686-win-msvc-dynamic-v20210409104352 + +source_url = https://github.com/The-Powder-Toy/tpt-libs/releases/download/v20210409104352/tpt-libs-prebuilt-i686-win-msvc-dynamic-v20210409104352.zip +source_filename = tpt-libs-prebuilt-i686-win-msvc-dynamic-v20210409104352.zip +source_hash = 540560540220d43e80a516e4b081959725abecf5fc4526bfe82135b93c5dadc6 diff --git a/subprojects/tpt-libs-prebuilt-i686-win-msvc-static-v20210320221332.wrap b/subprojects/tpt-libs-prebuilt-i686-win-msvc-static-v20210320221332.wrap deleted file mode 100644 index a953b0d64..000000000 --- a/subprojects/tpt-libs-prebuilt-i686-win-msvc-static-v20210320221332.wrap +++ /dev/null @@ -1,6 +0,0 @@ -[wrap-file] -directory = tpt-libs-prebuilt-i686-win-msvc-static-v20210320221332 - -source_url = https://github.com/The-Powder-Toy/tpt-libs/releases/download/v20210320221332/tpt-libs-prebuilt-i686-win-msvc-static-v20210320221332.zip -source_filename = tpt-libs-prebuilt-i686-win-msvc-static-v20210320221332.zip -source_hash = c3f8174885766df351be0597dc98315bb99e4b39a58d3b2d629956642b6c64bf diff --git a/subprojects/tpt-libs-prebuilt-i686-win-msvc-static-v20210409104352.wrap b/subprojects/tpt-libs-prebuilt-i686-win-msvc-static-v20210409104352.wrap new file mode 100644 index 000000000..851b545a1 --- /dev/null +++ b/subprojects/tpt-libs-prebuilt-i686-win-msvc-static-v20210409104352.wrap @@ -0,0 +1,6 @@ +[wrap-file] +directory = tpt-libs-prebuilt-i686-win-msvc-static-v20210409104352 + +source_url = https://github.com/The-Powder-Toy/tpt-libs/releases/download/v20210409104352/tpt-libs-prebuilt-i686-win-msvc-static-v20210409104352.zip +source_filename = tpt-libs-prebuilt-i686-win-msvc-static-v20210409104352.zip +source_hash = d9c6bfe60178d6948700d702d06cf2c189b64c912659c3e908610a9e284abad6 diff --git a/subprojects/tpt-libs-prebuilt-x86_64-lin-gcc-static-v20210320221332.wrap b/subprojects/tpt-libs-prebuilt-x86_64-lin-gcc-static-v20210320221332.wrap deleted file mode 100644 index f03691c8e..000000000 --- a/subprojects/tpt-libs-prebuilt-x86_64-lin-gcc-static-v20210320221332.wrap +++ /dev/null @@ -1,6 +0,0 @@ -[wrap-file] -directory = tpt-libs-prebuilt-x86_64-lin-gcc-static-v20210320221332 - -source_url = https://github.com/The-Powder-Toy/tpt-libs/releases/download/v20210320221332/tpt-libs-prebuilt-x86_64-lin-gcc-static-v20210320221332.zip -source_filename = tpt-libs-prebuilt-x86_64-lin-gcc-static-v20210320221332.zip -source_hash = 9b2c0031f724e3f66447f74f3975af8da9f9fa4dff717f21e58dd3ef525af7a9 diff --git a/subprojects/tpt-libs-prebuilt-x86_64-lin-gcc-static-v20210409104352.wrap b/subprojects/tpt-libs-prebuilt-x86_64-lin-gcc-static-v20210409104352.wrap new file mode 100644 index 000000000..c6bb3419a --- /dev/null +++ b/subprojects/tpt-libs-prebuilt-x86_64-lin-gcc-static-v20210409104352.wrap @@ -0,0 +1,6 @@ +[wrap-file] +directory = tpt-libs-prebuilt-x86_64-lin-gcc-static-v20210409104352 + +source_url = https://github.com/The-Powder-Toy/tpt-libs/releases/download/v20210409104352/tpt-libs-prebuilt-x86_64-lin-gcc-static-v20210409104352.zip +source_filename = tpt-libs-prebuilt-x86_64-lin-gcc-static-v20210409104352.zip +source_hash = ea6761ceaf903b97cf695c6e703a903d8598216b894699c6d33df01612fcfd45 diff --git a/subprojects/tpt-libs-prebuilt-x86_64-mac-gcc-static-v20210320221332.wrap b/subprojects/tpt-libs-prebuilt-x86_64-mac-gcc-static-v20210320221332.wrap deleted file mode 100644 index 6ad053030..000000000 --- a/subprojects/tpt-libs-prebuilt-x86_64-mac-gcc-static-v20210320221332.wrap +++ /dev/null @@ -1,6 +0,0 @@ -[wrap-file] -directory = tpt-libs-prebuilt-x86_64-mac-gcc-static-v20210320221332 - -source_url = https://github.com/The-Powder-Toy/tpt-libs/releases/download/v20210320221332/tpt-libs-prebuilt-x86_64-mac-gcc-static-v20210320221332.zip -source_filename = tpt-libs-prebuilt-x86_64-mac-gcc-static-v20210320221332.zip -source_hash = 478f9fe93376439b2b9f07f22009433a264ebb40f11fa493f6b12f6540392125 diff --git a/subprojects/tpt-libs-prebuilt-x86_64-mac-gcc-static-v20210409104352.wrap b/subprojects/tpt-libs-prebuilt-x86_64-mac-gcc-static-v20210409104352.wrap new file mode 100644 index 000000000..9b6fce25a --- /dev/null +++ b/subprojects/tpt-libs-prebuilt-x86_64-mac-gcc-static-v20210409104352.wrap @@ -0,0 +1,6 @@ +[wrap-file] +directory = tpt-libs-prebuilt-x86_64-mac-gcc-static-v20210409104352 + +source_url = https://github.com/The-Powder-Toy/tpt-libs/releases/download/v20210409104352/tpt-libs-prebuilt-x86_64-mac-gcc-static-v20210409104352.zip +source_filename = tpt-libs-prebuilt-x86_64-mac-gcc-static-v20210409104352.zip +source_hash = ed380d140e823442e280aa86c8b957cb78d32dea6a38ff09628d346a94bf4ec8 diff --git a/subprojects/tpt-libs-prebuilt-x86_64-win-msvc-dynamic-v20210320221332.wrap b/subprojects/tpt-libs-prebuilt-x86_64-win-msvc-dynamic-v20210320221332.wrap deleted file mode 100644 index 30923e78a..000000000 --- a/subprojects/tpt-libs-prebuilt-x86_64-win-msvc-dynamic-v20210320221332.wrap +++ /dev/null @@ -1,6 +0,0 @@ -[wrap-file] -directory = tpt-libs-prebuilt-x86_64-win-msvc-dynamic-v20210320221332 - -source_url = https://github.com/The-Powder-Toy/tpt-libs/releases/download/v20210320221332/tpt-libs-prebuilt-x86_64-win-msvc-dynamic-v20210320221332.zip -source_filename = tpt-libs-prebuilt-x86_64-win-msvc-dynamic-v20210320221332.zip -source_hash = 622b81d1438857e9bf955ed59035e2e99d050b53f4a04befbb4feda4a259e68d diff --git a/subprojects/tpt-libs-prebuilt-x86_64-win-msvc-dynamic-v20210409104352.wrap b/subprojects/tpt-libs-prebuilt-x86_64-win-msvc-dynamic-v20210409104352.wrap new file mode 100644 index 000000000..ee42b7666 --- /dev/null +++ b/subprojects/tpt-libs-prebuilt-x86_64-win-msvc-dynamic-v20210409104352.wrap @@ -0,0 +1,6 @@ +[wrap-file] +directory = tpt-libs-prebuilt-x86_64-win-msvc-dynamic-v20210409104352 + +source_url = https://github.com/The-Powder-Toy/tpt-libs/releases/download/v20210409104352/tpt-libs-prebuilt-x86_64-win-msvc-dynamic-v20210409104352.zip +source_filename = tpt-libs-prebuilt-x86_64-win-msvc-dynamic-v20210409104352.zip +source_hash = 28044391e5caad42e4707cb75a4684f562a595d2c415d4d76b400cf91a7a8d8e diff --git a/subprojects/tpt-libs-prebuilt-x86_64-win-msvc-static-v20210320221332.wrap b/subprojects/tpt-libs-prebuilt-x86_64-win-msvc-static-v20210320221332.wrap deleted file mode 100644 index 003ea6dda..000000000 --- a/subprojects/tpt-libs-prebuilt-x86_64-win-msvc-static-v20210320221332.wrap +++ /dev/null @@ -1,6 +0,0 @@ -[wrap-file] -directory = tpt-libs-prebuilt-x86_64-win-msvc-static-v20210320221332 - -source_url = https://github.com/The-Powder-Toy/tpt-libs/releases/download/v20210320221332/tpt-libs-prebuilt-x86_64-win-msvc-static-v20210320221332.zip -source_filename = tpt-libs-prebuilt-x86_64-win-msvc-static-v20210320221332.zip -source_hash = 20d647a5fd64c1bb7118ed8843c21845bcf648f39efa925b2a38757c0eb8f562 diff --git a/subprojects/tpt-libs-prebuilt-x86_64-win-msvc-static-v20210409104352.wrap b/subprojects/tpt-libs-prebuilt-x86_64-win-msvc-static-v20210409104352.wrap new file mode 100644 index 000000000..14571435c --- /dev/null +++ b/subprojects/tpt-libs-prebuilt-x86_64-win-msvc-static-v20210409104352.wrap @@ -0,0 +1,6 @@ +[wrap-file] +directory = tpt-libs-prebuilt-x86_64-win-msvc-static-v20210409104352 + +source_url = https://github.com/The-Powder-Toy/tpt-libs/releases/download/v20210409104352/tpt-libs-prebuilt-x86_64-win-msvc-static-v20210409104352.zip +source_filename = tpt-libs-prebuilt-x86_64-win-msvc-static-v20210409104352.zip +source_hash = 3b7265612a3030624f0b8d01b861dcc77c68638316ada94bc61488639d87672b