diff options
| author | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2023-12-22 12:47:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-22 12:47:24 +0100 |
| commit | 86d080b328b4367984cd7932bd1ce676e9ca5103 (patch) | |
| tree | f27f2a0513032a14ed4b49ecd448bcbfafaad735 | |
| parent | fa28efa51d232c7e3cd0fe8100861c5d518eefd0 (diff) | |
| parent | 1831677f6366db9ee8ff08497f5dc58ae396b057 (diff) | |
| download | fork-godot-webrtc-native-86d080b328b4367984cd7932bd1ce676e9ca5103.tar.gz fork-godot-webrtc-native-86d080b328b4367984cd7932bd1ce676e9ca5103.tar.bz2 fork-godot-webrtc-native-86d080b328b4367984cd7932bd1ce676e9ca5103.zip | |
Merge pull request #134 from Faless/fix/mingw_only_export_init_symbol
[Windows/MinGW] Only export extension init symbol
| -rw-r--r-- | SConstruct | 8 | ||||
| -rw-r--r-- | misc/gcc/symbols-extension.map (renamed from misc/dist/linux/symbols-extension.map) | 0 | ||||
| -rw-r--r-- | misc/gcc/symbols-gdnative.map (renamed from misc/dist/linux/symbols-gdnative.map) | 0 |
3 files changed, 5 insertions, 3 deletions
@@ -167,11 +167,13 @@ env.Depends(sources, ssl + rtc) # symbols using a GCC version script, or we might end up overriding symbols from other libraries. # Using "-fvisibility=hidden" will not work, since libstdc++ explicitly exports its symbols. symbols_file = None -if env["platform"] == "linux": +if env["platform"] == "linux" or ( + env["platform"] == "windows" and env.get("use_mingw", False) and not env.get("use_llvm", False) +): if env["godot_version"] == "3": - symbols_file = env.File("misc/dist/linux/symbols-gdnative.map") + symbols_file = env.File("misc/gcc/symbols-gdnative.map") else: - symbols_file = env.File("misc/dist/linux/symbols-extension.map") + symbols_file = env.File("misc/gcc/symbols-extension.map") env.Append( LINKFLAGS=[ "-Wl,--no-undefined,--version-script=" + symbols_file.abspath, diff --git a/misc/dist/linux/symbols-extension.map b/misc/gcc/symbols-extension.map index 5af224e..5af224e 100644 --- a/misc/dist/linux/symbols-extension.map +++ b/misc/gcc/symbols-extension.map diff --git a/misc/dist/linux/symbols-gdnative.map b/misc/gcc/symbols-gdnative.map index d048dc3..d048dc3 100644 --- a/misc/dist/linux/symbols-gdnative.map +++ b/misc/gcc/symbols-gdnative.map |