OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 11:19:10 +00:00
Code Releases Activity

Various MinGW compile fixes.

Browse Source
This commit is contained in:
Darryl Pogue
2014-02-19 23:24:40 -08:00
parent a4af9e4243
commit a1e3fa6faf
26 changed files with 55 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Sources/Plasma/Apps/plClient/CMakeLists.txt
View File

@ -169,10 +169,10 @@ if(USE_VLD)
endif()
if (WIN32)
target_link_libraries(plClient Rpcrt4)
target_link_libraries(plClient Version)
target_link_libraries(plClient Vfw32)
target_link_libraries(plClient Ws2_32)
target_link_libraries(plClient rpcrt4)
target_link_libraries(plClient version)
target_link_libraries(plClient vfw32)
target_link_libraries(plClient ws2_32)
target_link_libraries(plClient winmm)
target_link_libraries(plClient strmiids)
endif(WIN32)

5
Sources/Plasma/CoreLib/hsWindows.h
View File

@ -61,7 +61,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
# define _WIN32_IE 0x400
# endif
# define NOMINMAX
# ifndef NOMINMAX
# define NOMINMAX
# endif
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
# include <ws2tcpip.h> // Pulls in WinSock 2 for us

2
Sources/Plasma/CoreLib/plString.cpp
View File

@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "HeadSpin.h"
#include <functional>
#include <memory>
#include <wchar.h>
#include <cwchar>
#pragma hdrstop
#include "plString.h"

4
Sources/Plasma/FeatureLib/pfCrashHandler/plCrashSrv.cpp
View File

@ -47,8 +47,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifdef HS_BUILD_FOR_WIN32
#include <DbgHelp.h>
#include <ShlObj.h>
#include <dbghelp.h>
#include <shlobj.h>
plCrashSrv::plCrashSrv(const char* file)
: fLink(nil), fLinkH(nil)

2
Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNtSocket.cpp
View File

@ -803,7 +803,7 @@ static void StartListenThread () {
//===========================================================================
#ifdef HS_DEBUGGING
#include <StdIo.h>
#include <cstdio>
static void __cdecl DumpInvalidData (
const plFileName & filename,
unsigned bytes,

2
Sources/Plasma/NucleusLib/pnNetCommon/CMakeLists.txt
View File

@ -41,7 +41,7 @@ target_link_libraries(pnNetCommon pnKeyedObject)
target_link_libraries(pnNetCommon pnUUID)
target_link_libraries(pnNetCommon plStatusLog)
if(WIN32)
target_link_libraries(pnNetCommon Ws2_32)
target_link_libraries(pnNetCommon ws2_32)
endif(WIN32)
source_group("Header Files" FILES ${pnNetCommon_HEADERS})

2
Sources/Plasma/NucleusLib/pnUUID/CMakeLists.txt
View File

@ -21,7 +21,7 @@ add_library(pnUUID STATIC ${pnUUID_SOURCES} ${pnUUID_HEADERS})
target_link_libraries(pnUUID CoreLib)
if(WIN32)
target_link_libraries(pnUUID pnUtils)
target_link_libraries(pnUUID Rpcrt4)
target_link_libraries(pnUUID rpcrt4)
else(WIN32)
target_link_libraries(pnUUID uuid)
endif(WIN32)

2
Sources/Plasma/NucleusLib/pnUtils/Pch.h
View File

@ -57,7 +57,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#pragma warning(push, 3)
#include <ws2tcpip.h>
#define NTDDI_XP NTDDI_WINXP //Because Microsoft sucks.
#include <Iphlpapi.h>
#include <iphlpapi.h>
#include <shlobj.h> // for SHGetSpecialFolderPath
#pragma warning(pop)
#endif

4
Sources/Plasma/PubUtilLib/plPipeline/DX/plDXPixelShader.cpp
View File

@ -42,8 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "HeadSpin.h"
#include "hsWindows.h"
#include <D3d9.h>
#include <D3dx9core.h>
#include <d3d9.h>
#include <d3dx9core.h>
#include "plDXPixelShader.h"

4
Sources/Plasma/PubUtilLib/plPipeline/DX/plDXShader.cpp
View File

@ -41,8 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#include "HeadSpin.h"
#include <D3d9.h>
#include <D3dx9core.h>
#include <d3d9.h>
#include <d3dx9core.h>
#include "HeadSpin.h"

4
Sources/Plasma/PubUtilLib/plPipeline/DX/plDXVertexShader.cpp
View File

@ -42,8 +42,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "HeadSpin.h"
#include "hsWindows.h"
#include <D3d9.h>
#include <D3dx9core.h>
#include <d3d9.h>
#include <d3dx9core.h>
#include "plDXVertexShader.h"

2
Sources/Plasma/PubUtilLib/plStatusLog/plStatusLog.cpp
View File

@ -67,7 +67,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plEncryptLogLine.h"
#if HS_BUILD_FOR_WIN32
#include <Shlobj.h>
#include <shlobj.h>
#endif
//////////////////////////////////////////////////////////////////////////////