Merge branch 'master' into modern-cmake
This commit is contained in:
commit
2b95f10bbb
|
@ -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
|
||||||
|
|
|
@ -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
|
@ -1,4 +1,5 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
#include <utility>
|
||||||
#include <atomic>
|
#include <atomic>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <tuple>
|
#include <tuple>
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue