Merge branch 'master' into modern-cmake

This commit is contained in:
Nadia Holmquist Pedersen 2022-05-21 19:41:18 +02:00 committed by GitHub
commit 2b95f10bbb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5305 additions and 1699 deletions

View File

@ -44,6 +44,7 @@ As for the rest, the interface should be pretty straightforward. If you have a q
git clone https://github.com/Arisotura/melonDS git clone https://github.com/Arisotura/melonDS
cd melonDS cd melonDS
``` ```
3. Compile: 3. Compile:
```bash ```bash
cmake -B build cmake -B build

View File

@ -58,6 +58,7 @@ else()
-pedantic -pedantic
-pedantic-errors -pedantic-errors
-Wfatal-errors -Wfatal-errors
-Wno-error=maybe-uninitialized
-Wno-missing-braces -Wno-missing-braces
-Wno-unused-parameter) -Wno-unused-parameter)

File diff suppressed because it is too large Load Diff

View File

@ -1,4 +1,5 @@
#pragma once #pragma once
#include <utility>
#include <atomic> #include <atomic>
#include <stdexcept> #include <stdexcept>
#include <tuple> #include <tuple>

View File

@ -97,7 +97,7 @@ def install_name_tool(exec, action, path1, path2 = nil)
end end
def strip(lib) def strip(lib)
out, _ = Open3.capture2("strip", "-SNTx", lib) out, _ = Open3.capture2("strip", "-Sx", lib)
print out print out
end end