Fixed: Windows compilation problems

This commit is contained in:
kervala 2010-09-04 19:54:22 +02:00
parent 7f72ef0bcb
commit 968a752e55
11 changed files with 30 additions and 22 deletions

View file

@ -33,7 +33,6 @@
#ifdef NL_OS_WINDOWS
# include <process.h>
# include <intrin.h>
# include <windows.h>
#else
# include <cmath>
# include <unistd.h>
@ -43,6 +42,10 @@
#include "string_common.h"
#ifdef NL_OS_WINDOWS
struct nameHICON__;
typedef struct HICON__ *HICON;
struct nameHWND__;
typedef struct HWND__ *HWND;
typedef HWND nlWindow;
#define EmptyWindow NULL
#elif defined(NL_OS_MAC)

View file

@ -28,8 +28,6 @@
#include <unistd.h>
#define __forceinline
#elif defined(NL_OS_WINDOWS)
# define NOMINMAX
# include <windows.h>
# ifdef NL_NO_ASM
# include <intrin.h>
# endif

View file

@ -24,11 +24,6 @@
#include "nel/misc/types_nl.h"
#if defined(NL_OS_WINDOWS) && defined(_WINDOWS)
# define NOMINMAX
# include <windows.h>
#endif
#include "nel/misc/config_file.h"
#include "nel/misc/entity_id.h"
#include "nel/misc/variable.h"

View file

@ -18,13 +18,8 @@
#ifdef NL_OS_WINDOWS
#if !defined(NL_COMP_VC9)
# if !defined(NL_COMP_VC8)
# include <winsock2.h>
# endif
#endif
# define NOMINMAX
# include <windows.h>
#elif defined NL_OS_UNIX
#include <unistd.h>

View file

@ -61,3 +61,8 @@
#include "nel/misc/vector.h"
#include "nel/misc/rgba.h"
#include "nel/misc/file.h"
#ifdef NL_OS_WINDOWS
#define NOMINMAX
#include <windows.h>
#endif

View file

@ -49,3 +49,8 @@
#include "nel/misc/stream.h"
#include "nel/misc/path.h"
#include "nel/misc/string_common.h"
#ifdef NL_OS_WINDOWS
#define NOMINMAX
#include <windows.h>
#endif

View file

@ -40,6 +40,11 @@
// Tempyoyo.
#include <nel/3d/height_map.h>
#ifdef NL_OS_WINDOWS
#define NOMINMAX
#include <windows.h>
#endif // NL_OS_WINDOWS
using namespace std;
using namespace NLMISC;
using namespace NL3D;

View file

@ -27,6 +27,7 @@
#include "nel/misc/variable.h"
using namespace std;
using namespace NLMISC;
using namespace PHRASE_UTILITIES;
CVariable<bool> ResPawnPVPInSameRegionForbiden("egs","ResPawnPVPInSameRegionForbiden", "When character dead in PvP Faction, it can't respawn in same same region of it's death", true, 0, true );

View file

@ -21,15 +21,12 @@
#include "game_share/effect_families.h"
#include "creature_manager/creature.h"
using namespace std;
using namespace NLMISC;
class CSEffect;
class CCharacter;
class CTotemEffect;
class CFileDescription;
extern CVariable<uint32> TotemBuildTime;
extern NLMISC::CVariable<uint32> TotemBuildTime;
/**
* A Totem Base with its effects on faction PVP
@ -46,7 +43,7 @@ public :
CTotemBase( std::string const& name );
/// Return all effects a given character gets on this totem
void getTotemEffect( CCharacter* user, vector<CSEffect*>& outEffects ) const;
void getTotemEffect( CCharacter* user, std::vector<CSEffect*>& outEffects ) const;
/// Start building this totem
void startBuilding( CCharacter* builder );
@ -127,13 +124,13 @@ private :
PVP_CLAN::TPVPClan _OwnerFaction;
/// Neighbor regions
vector<TAIAlias> _Neighbours;
std::vector<TAIAlias> _Neighbours;
/// Effect of the totem base
EFFECT_FAMILIES::TEffectFamily _TotemEffect;
/// Used BotObject
CRefPtr<CCreature> _BotObject;
NLMISC::CRefPtr<CCreature> _BotObject;
/// Is the building finished ? True if no totem
bool _IsBuildingFinished;

View file

@ -24,6 +24,7 @@
#include "mirror_service.h"
using namespace NLMISC;
using namespace NLNET;
using namespace NLGEORGES;
using namespace std;

View file

@ -72,6 +72,9 @@
#include "mirror_service.h"
#include "tick_proxy.h"
using namespace NLMISC;
using namespace NLNET;
using namespace std;
extern NLMISC::CLog _QuickLog;