godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENet windows compilation fixes.

Browse Source 
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.
This commit is contained in:
Juan Linietsky 2016-08-20 01:05:57 -03:00
parent 2fa693273c
commit 38338e90c0
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/enet/networked_multiplayer_enet.cpp
View File

@ -1,6 +1,6 @@
#include "networked_multiplayer_enet.h"
#include "os/os.h" #include "os/os.h"
#include "io/marshalls.h" #include "io/marshalls.h"
#include "networked_multiplayer_enet.h"
void NetworkedMultiplayerENet::set_transfer_mode(TransferMode p_mode) { void NetworkedMultiplayerENet::set_transfer_mode(TransferMode p_mode) {

1
modules/enet/register_types.cpp
View File

@ -27,7 +27,6 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/ /*************************************************************************/
#include "register_types.h" #include "register_types.h"
#include "enet/enet.h"
#include "error_macros.h" #include "error_macros.h"
#include "networked_multiplayer_enet.h" #include "networked_multiplayer_enet.h"

2
modules/enet/win32.c
View File

@ -4,7 +4,7 @@
*/ */
#ifdef _WIN32 #ifdef _WIN32
#define ENET_BUILDING_LIB 1 #define ENET_BUILDING_LIB 0
#include "enet/enet.h" #include "enet/enet.h"
#include <windows.h> #include <windows.h>
#include <mmsystem.h> #include <mmsystem.h>

5
platform/windows/detect.py
View File

@ -237,8 +237,7 @@ def configure(env):
env.Append(CCFLAGS=['/DTYPED_METHOD_BIND']) env.Append(CCFLAGS=['/DTYPED_METHOD_BIND'])
env.Append(CCFLAGS=['/DGLES2_ENABLED']) env.Append(CCFLAGS=['/DGLES2_ENABLED'])
LIBS=['winmm','opengl32','dsound','kernel32','ole32','oleaut32','user32','gdi32', 'IPHLPAPI','Shlwapi', 'wsock32','Ws2_32', 'shell32','advapi32','dinput8','dxguid']
LIBS=['winmm','opengl32','dsound','kernel32','ole32','oleaut32','user32','gdi32', 'IPHLPAPI','Shlwapi', 'wsock32', 'shell32','advapi32','dinput8','dxguid']
env.Append(LINKFLAGS=[p+env["LIBSUFFIX"] for p in LIBS]) env.Append(LINKFLAGS=[p+env["LIBSUFFIX"] for p in LIBS])
env.Append(LIBPATH=[os.getenv("WindowsSdkDir")+"/Lib"]) env.Append(LIBPATH=[os.getenv("WindowsSdkDir")+"/Lib"])
@ -361,7 +360,7 @@ def configure(env):
env.Append(CCFLAGS=['-DWINDOWS_ENABLED','-mwindows']) env.Append(CCFLAGS=['-DWINDOWS_ENABLED','-mwindows'])
env.Append(CPPFLAGS=['-DRTAUDIO_ENABLED']) env.Append(CPPFLAGS=['-DRTAUDIO_ENABLED'])
env.Append(CCFLAGS=['-DGLES2_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"): # if (env["bits"]=="32"):
# env.Append(LIBS=['gcc_s']) # env.Append(LIBS=['gcc_s'])