Merge pull request #19 from jayands/master

Fix for T2
2016-08-09 10:12:13 -04:00 · 2016-08-09 10:12:13 -04:00 · 1eb768578b
parent 5b7a9ea52c e4354eedd2
commit 1eb768578b
3 changed files with 4 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -4,3 +4,5 @@ src/wx/cmd-evtable.h
 src/wx/cmdhandlers.h
 src/wx/cmdtab.cpp
 src/wx/wxvbam.xrs
+build/
+
--- a/src/gba/GBASockClient.cpp
+++ b/src/gba/GBASockClient.cpp
@ -7,7 +7,7 @@
 GBASockClient::GBASockClient(sf::IpAddress _server_addr)
 {
    if (_server_addr == sf::IpAddress::None)
-        server_addr = sf::IpAddress::LocalHost;
+        server_addr = sf::IpAddress::getPublicAddress();
    else
        server_addr = _server_addr;

--- a/src/gba/GBASockClient.h
+++ b/src/gba/GBASockClient.h
@ -1,6 +1,6 @@
 #pragma once

-#include <cstdlib>
+#include <cstdint>
 #include <SFML/Network.hpp>

 class GBASockClient {