From 38338e90c05e60fbea63ab4b68f14b82406e51ef Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Sat, 20 Aug 2016 01:05:57 -0300 Subject: ENet windows compilation fixes. For reference, when you include a Windows header (be it directly windows.h or something that includes it) put it at the end of the includes. it seems I forgot. --- modules/enet/networked_multiplayer_enet.cpp | 2 +- modules/enet/register_types.cpp | 1 - modules/enet/win32.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) (limited to 'modules') diff --git a/modules/enet/networked_multiplayer_enet.cpp b/modules/enet/networked_multiplayer_enet.cpp index 1e52083b6b..5433afdfdd 100644 --- a/modules/enet/networked_multiplayer_enet.cpp +++ b/modules/enet/networked_multiplayer_enet.cpp @@ -1,6 +1,6 @@ -#include "networked_multiplayer_enet.h" #include "os/os.h" #include "io/marshalls.h" +#include "networked_multiplayer_enet.h" void NetworkedMultiplayerENet::set_transfer_mode(TransferMode p_mode) { diff --git a/modules/enet/register_types.cpp b/modules/enet/register_types.cpp index f80b82a412..630b76ced8 100644 --- a/modules/enet/register_types.cpp +++ b/modules/enet/register_types.cpp @@ -27,7 +27,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include "register_types.h" -#include "enet/enet.h" #include "error_macros.h" #include "networked_multiplayer_enet.h" diff --git a/modules/enet/win32.c b/modules/enet/win32.c index 5cc167997c..d77fa9a49a 100644 --- a/modules/enet/win32.c +++ b/modules/enet/win32.c @@ -4,7 +4,7 @@ */ #ifdef _WIN32 -#define ENET_BUILDING_LIB 1 +#define ENET_BUILDING_LIB 0 #include "enet/enet.h" #include #include -- cgit v1.2.3