diff options
| author | Juan Linietsky | 2014-06-11 10:41:43 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2014-06-11 10:41:43 -0300 |
| commit | 64e83bfd1404ea593f0c79b478d196a3fcde42a8 (patch) | |
| tree | c18c61da239443532a94fb9fa54df702df12a90b /platform/windows | |
| parent | 9b8696d3dd92e2ed6f310ad0f0bf3c2182c9c6ae (diff) | |
| parent | 5f5cd5e6d1508f85ac1bffa44e122b4dc0e2bb1d (diff) | |
| download | godot-64e83bfd1404ea593f0c79b478d196a3fcde42a8.tar.gz godot-64e83bfd1404ea593f0c79b478d196a3fcde42a8.tar.zst godot-64e83bfd1404ea593f0c79b478d196a3fcde42a8.zip | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'platform/windows')
| -rw-r--r-- | platform/windows/detect.py | 10 | ||||
| -rw-r--r-- | platform/windows/tcp_server_winsock.cpp | 3 |
2 files changed, 9 insertions, 4 deletions
diff --git a/platform/windows/detect.py b/platform/windows/detect.py index 7f7133251..0e21540e1 100644 --- a/platform/windows/detect.py +++ b/platform/windows/detect.py @@ -143,10 +143,12 @@ def configure(env): mingw_prefix=""
if (env["force_32_bits"]!="no"):
- env['OBJSUFFIX'] = ".32"+env['OBJSUFFIX']
- env['LIBSUFFIX'] = ".32"+env['LIBSUFFIX']
- env.Append(CCFLAGS=['-m32'])
- env.Append(LINKFLAGS=['-m32'])
+ env['OBJSUFFIX'] = ".32"+env['OBJSUFFIX']
+ env['LIBSUFFIX'] = ".32"+env['LIBSUFFIX']
+ env.Append(CCFLAGS=['-m32'])
+ env.Append(LINKFLAGS=['-m32'])
+ env.Append(LINKFLAGS=['-static-libgcc'])
+ env.Append(LINKFLAGS=['-static-libstdc++'])
diff --git a/platform/windows/tcp_server_winsock.cpp b/platform/windows/tcp_server_winsock.cpp index 7b35bcc7a..e77ca6fea 100644 --- a/platform/windows/tcp_server_winsock.cpp +++ b/platform/windows/tcp_server_winsock.cpp @@ -86,6 +86,9 @@ Error TCPServerWinsock::listen(uint16_t p_port,const List<String> *p_accepted_ho closesocket(sockfd);
ERR_FAIL_V(FAILED);
};
+ }
+ else {
+ return ERR_ALREADY_IN_USE;
};
if (listen_sockfd != INVALID_SOCKET) {
|