diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-08-20 01:05:57 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-08-20 01:05:57 -0300 |
| commit | 38338e90c05e60fbea63ab4b68f14b82406e51ef (patch) | |
| tree | 2ccab9afee128ad7e642d6fffaa3305a64aad50f | |
| parent | 2fa693273c4eca763a0d65385e1a44bd46dd715c (diff) | |
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.
| -rw-r--r-- | modules/enet/networked_multiplayer_enet.cpp | 2 | ||||
| -rw-r--r-- | modules/enet/register_types.cpp | 1 | ||||
| -rw-r--r-- | modules/enet/win32.c | 2 | ||||
| -rw-r--r-- | platform/windows/detect.py | 5 |
4 files changed, 4 insertions, 6 deletions
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 <windows.h> #include <mmsystem.h> diff --git a/platform/windows/detect.py b/platform/windows/detect.py index 320fb9d269..a272e5df28 100644 --- a/platform/windows/detect.py +++ b/platform/windows/detect.py @@ -237,8 +237,7 @@ def configure(env): env.Append(CCFLAGS=['/DTYPED_METHOD_BIND']) env.Append(CCFLAGS=['/DGLES2_ENABLED']) - - LIBS=['winmm','opengl32','dsound','kernel32','ole32','oleaut32','user32','gdi32', 'IPHLPAPI','Shlwapi', 'wsock32', 'shell32','advapi32','dinput8','dxguid'] + LIBS=['winmm','opengl32','dsound','kernel32','ole32','oleaut32','user32','gdi32', 'IPHLPAPI','Shlwapi', 'wsock32','Ws2_32', 'shell32','advapi32','dinput8','dxguid'] env.Append(LINKFLAGS=[p+env["LIBSUFFIX"] for p in LIBS]) env.Append(LIBPATH=[os.getenv("WindowsSdkDir")+"/Lib"]) @@ -361,7 +360,7 @@ def configure(env): env.Append(CCFLAGS=['-DWINDOWS_ENABLED','-mwindows']) env.Append(CPPFLAGS=['-DRTAUDIO_ENABLED']) env.Append(CCFLAGS=['-DGLES2_ENABLED']) - env.Append(LIBS=['mingw32','opengl32', 'dsound', 'ole32', 'd3d9','winmm','gdi32','iphlpapi','shlwapi','wsock32','kernel32', 'oleaut32', 'dinput8', 'dxguid']) + env.Append(LIBS=['mingw32','opengl32', 'dsound', 'ole32', 'd3d9','winmm','gdi32','iphlpapi','shlwapi','wsock32','wsa2_32','kernel32', 'oleaut32', 'dinput8', 'dxguid']) # if (env["bits"]=="32"): # env.Append(LIBS=['gcc_s']) |