mirror of
https://github.com/celisej567/mcpe.git
synced 2026-01-08 06:09:54 +03:00
a0f71c7b27
* WIP C++03 + Xbox 360 Support * math.h & _USE_MATH_DEFINES on Level.hpp Updated Xenon vcxproj file for new file structure. * * Fix bad GUI scale setup. * * Gui: Use ratios instead of hardcoded sub-1 floating point values, to make the mechanism more clear. * Add Direct Connect Button and Screen (#30) * Add Direct Connect Button and Screen * Remove accidental extra build directories for wasm * Add DirectConnectScreen.cpp to the CMake * Use Hungarian coding style notation * * Fix errors caused by #30 * * Improve the Chat Screen * * Improve the DirectConnectScreen, among other things. * * Update the game title once again. * * Add build-wasm.bat. * * Add info about compiling for wasm * * Fix send to specific GUID actually broadcasting to everyone * * Add command manager. * * Add writeable configuration. * * Allow dynamic screen size change on windows * * Allow the same thing on the emscripten version. * WIP C++03 + Xbox 360 Support * Fixed a possible merging issue that broke RakNet? * Additional Xbox 360 compatability fixes --------- Co-authored-by: Brent Da Mage <BrentDaMage@users.noreply.github.com> Co-authored-by: iProgramInCpp <iprogramincpp@gmail.com> Co-authored-by: ts <124226059+uniformization@users.noreply.github.com>
34 lines
1.1 KiB
C
34 lines
1.1 KiB
C
/*
|
|
* Copyright (c) 2014, Oculus VR, Inc.
|
|
* All rights reserved.
|
|
*
|
|
* This source code is licensed under the BSD-style license found in the
|
|
* LICENSE file in the root directory of this source tree. An additional grant
|
|
* of patent rights can be found in the PATENTS file in the same directory.
|
|
*
|
|
*/
|
|
|
|
#if defined (WINDOWS_STORE_RT)
|
|
#include <windows.h>
|
|
#include <winsock.h>
|
|
#elif defined (_XBOX)
|
|
#include <xtl.h>
|
|
#include <winsockx.h>
|
|
#elif defined (_WIN32) && !defined(WINDOWS_PHONE_8) && !defined(WINDOWS_STORE_RT)
|
|
#define _WINPC
|
|
#include <WinSock2.h>
|
|
#include <windows.h>
|
|
#include <Ws2tcpip.h>
|
|
|
|
// Must always include Winsock2.h before windows.h
|
|
// or else:
|
|
// winsock2.h(99) : error C2011: 'fd_set' : 'struct' type redefinition
|
|
// winsock2.h(134) : warning C4005: 'FD_SET' : macro redefinition
|
|
// winsock.h(83) : see previous definition of 'FD_SET'
|
|
// winsock2.h(143) : error C2011: 'timeval' : 'struct' type redefinition
|
|
// winsock2.h(199) : error C2011: 'hostent' : 'struct' type redefinition
|
|
// winsock2.h(212) : error C2011: 'netent' : 'struct' type redefinition
|
|
// winsock2.h(219) : error C2011: 'servent' : 'struct' type redefinition
|
|
|
|
#endif
|