TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 00:06:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix includes for Windows on case-sensitive filesystems

Browse Source 
Closes #866
This commit is contained in:
kamgha 2020-02-22 12:55:45 +01:00 committed by rdb
parent 8ff2064fe5
commit c2866ea4ed
11 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dtool/src/dtoolutil/win32ArgParser.cxx
View File

@ -22,7 +22,7 @@
#include "executionEnvironment.h" #include "executionEnvironment.h"
#include <windows.h> #include <windows.h>
#include <Tlhelp32.h> #include <tlhelp32.h>
using std::string; using std::string;

2
panda/src/device/winInputDeviceManager.h
View File

@ -20,7 +20,7 @@
#include "xInputDevice.h" #include "xInputDevice.h"
#include <CfgMgr32.h> #include <cfgmgr32.h>
#include <devpkey.h> #include <devpkey.h>
class WinRawInputDevice; class WinRawInputDevice;

2
panda/src/device/winRawInputDevice.cxx
View File

@ -19,7 +19,7 @@
#if defined(_WIN32) && !defined(CPPPARSER) #if defined(_WIN32) && !defined(CPPPARSER)
#include <CfgMgr32.h> #include <cfgmgr32.h>
#include <devpkey.h> #include <devpkey.h>
#include "phidsdi.h" #include "phidsdi.h"

4
panda/src/device/xInputDevice.cxx
View File

@ -19,8 +19,8 @@
#include "inputDeviceManager.h" #include "inputDeviceManager.h"
#include "string_utils.h" #include "string_utils.h"
#include <XInput.h> #include <xinput.h>
#include <CfgMgr32.h> #include <cfgmgr32.h>
#ifndef XUSER_MAX_COUNT #ifndef XUSER_MAX_COUNT
#define XUSER_MAX_COUNT 4 #define XUSER_MAX_COUNT 4

2
panda/src/device/xInputDevice.h
View File

@ -19,7 +19,7 @@
#if defined(_WIN32) && !defined(CPPPARSER) #if defined(_WIN32) && !defined(CPPPARSER)
#include <CfgMgr32.h> #include <cfgmgr32.h>
class InputDeviceManager; class InputDeviceManager;

2
panda/src/display/graphicsEngine.cxx
View File

@ -55,7 +55,7 @@
#if defined(WIN32) #if defined(WIN32)
#define WINDOWS_LEAN_AND_MEAN #define WINDOWS_LEAN_AND_MEAN
#include <WinSock2.h> #include <winsock2.h>
#include <wtypes.h> #include <wtypes.h>
#undef WINDOWS_LEAN_AND_MEAN #undef WINDOWS_LEAN_AND_MEAN
#else #else

2
panda/src/downloader/bioStreamBuf.cxx
View File

@ -19,7 +19,7 @@
#ifdef HAVE_OPENSSL #ifdef HAVE_OPENSSL
#if defined(WIN32_VC) || defined(WIN64_VC) #if defined(WIN32_VC) || defined(WIN64_VC)
#include <WinSock2.h> #include <winsock2.h>
#include <windows.h> // for WSAGetLastError() #include <windows.h> // for WSAGetLastError()
#undef X509_NAME #undef X509_NAME
#endif // WIN32_VC #endif // WIN32_VC

2
panda/src/downloader/httpChannel.cxx
View File

@ -30,7 +30,7 @@
#include "openSSLWrapper.h" #include "openSSLWrapper.h"
#if defined(WIN32_VC) || defined(WIN64_VC) #if defined(WIN32_VC) || defined(WIN64_VC)
#include <WinSock2.h> #include <winsock2.h>
#include <windows.h> // for select() #include <windows.h> // for select()
#undef X509_NAME #undef X509_NAME
#endif // WIN32_VC #endif // WIN32_VC

2
panda/src/nativenet/socket_portable.h
View File

@ -53,7 +53,7 @@ typedef unsigned long SOCKET;
************************************************************************/ ************************************************************************/
#elif defined(_WIN32) #elif defined(_WIN32)
#include <winsock2.h> #include <winsock2.h>
#include <Ws2tcpip.h> #include <ws2tcpip.h>
typedef u_short sa_family_t; typedef u_short sa_family_t;

2
panda/src/net/connectionManager.cxx
View File

@ -25,7 +25,7 @@
#if defined(CPPPARSER) #if defined(CPPPARSER)
#elif defined(WIN32_VC) || defined(WIN64_VC) #elif defined(WIN32_VC) || defined(WIN64_VC)
#include <winsock2.h> // For gethostname() #include <winsock2.h> // For gethostname()
#include <Iphlpapi.h> // For GetAdaptersAddresses() #include <iphlpapi.h> // For GetAdaptersAddresses()
#elif defined(__ANDROID__) #elif defined(__ANDROID__)
#include <net/if.h> #include <net/if.h>
#else #else

2
panda/src/pstatclient/pStatClientImpl.cxx
View File

@ -28,7 +28,7 @@
#include <algorithm> #include <algorithm>
#if defined(WIN32_VC) || defined(WIN64_VC) #if defined(WIN32_VC) || defined(WIN64_VC)
#include <Winsock2.h> #include <winsock2.h>
#include <windows.h> #include <windows.h>
#endif #endif