aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-12-20 07:58:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Ryzom server compile under MinGW

Browse source
This commit is contained in:
kaetemi 2014-06-19 20:19:39 +02:00
parent 2e096a9b36
commit b18203fc4e
30 changed files with 91 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/include/nel/misc/hierarchical_timer.h
View file

@ -74,7 +74,7 @@
namespace NLMISC
{
#ifdef NL_OS_WINDOWS
#ifdef NL_COMP_VC
// Visual C++ warning : ebp maybe modified
# pragma warning(disable:4731)
#endif

6
code/nel/include/nel/misc/types_nl.h
View file

@ -152,7 +152,7 @@
//
// NL_ISO_TEMPLATE_SPEC can be used in front of an instanciated class-template member data definition,
// because sometimes MSVC++ 6 produces an error C2908 with a definition with template <>.
#if defined(NL_OS_WINDOWS) || (defined(__GNUC__) && ((__GNUC__ < 3) || (__GNUC__ == 3 && __GNUC_MINOR__ <= 3)))
#if defined(NL_COMP_VC) || (defined(__GNUC__) && ((__GNUC__ < 3) || (__GNUC__ == 3 && __GNUC_MINOR__ <= 3)))
# define NL_ISO_SYNTAX 0
# define NL_ISO_TEMPLATE_SPEC
#else
@ -398,8 +398,8 @@ typedef uint16 ucchar;
// To define a 64bits constant; ie: UINT64_CONSTANT(0x123456781234)
#ifdef NL_OS_WINDOWS
# if defined(NL_COMP_VC) && (NL_COMP_VC_VERSION >= 80)
#ifdef NL_COMP_VC
# if (NL_COMP_VC_VERSION >= 80)
# define INT64_CONSTANT(c) (c##LL)
# define SINT64_CONSTANT(c) (c##LL)
# define UINT64_CONSTANT(c) (c##LL)

13
code/nel/src/misc/mem_displayer.cpp
View file

@ -150,7 +150,11 @@ static string getSourceInfo (DWORD_TYPE addr)
return str;
}
static uintptr_t __stdcall GetModuleBase(HANDLE hProcess, uintptr_t dwReturnAddress)
#ifdef NL_OS_WIN64
static DWORD64 __stdcall GetModuleBase(HANDLE hProcess, DWORD64 dwReturnAddress)
#else
static DWORD __stdcall GetModuleBase(HANDLE hProcess, DWORD dwReturnAddress)
#endif
{
IMAGEHLP_MODULE moduleInfo;
@ -291,12 +295,13 @@ static void displayCallStack (CLog *log)
#ifdef NL_OS_WIN64
MachineType = IMAGE_FILE_MACHINE_AMD64;
BOOL res = StackWalk64(MachineType, GetCurrentProcess(), GetCurrentThread(), &callStack,
NULL, NULL, SymFunctionTableAccess, GetModuleBase, NULL);
#else
MachineType = IMAGE_FILE_MACHINE_I386;
#endif
BOOL res = StackWalk (MachineType, GetCurrentProcess(), GetCurrentThread(), &callStack,
BOOL res = StackWalk(MachineType, GetCurrentProcess(), GetCurrentThread(), &callStack,
NULL, NULL, SymFunctionTableAccess, GetModuleBase, NULL);
#endif
/* if (res == FALSE)
{

8
code/ryzom/common/src/game_share/mirror_prop_value.h
View file

@ -1150,7 +1150,7 @@ public:
typedef _CMirrorPropValueListIterator<T,CPropLocationClass> iterator;
typedef _CCMirrorPropValueListIterator<T,CPropLocationClass> const_iterator;
#ifdef NL_OS_WINDOWS
#ifdef NL_COMP_VC
friend iterator; // MSVC
friend const_iterator;
#else
@ -1192,7 +1192,7 @@ public:
// If changing this struct, don't forget to change the places where it is initialized
TSharedListRow Next;
T Value;
#ifdef NL_OS_WINDOWS
#ifdef NL_COMP_VC
};
#else
} __attribute__((packed));
@ -1237,7 +1237,7 @@ public:
typedef _CMirrorPropValueListIterator<NLMISC::CEntityId,CPropLocationClass> iterator;
typedef _CCMirrorPropValueListIterator<NLMISC::CEntityId,CPropLocationClass> const_iterator;
#ifdef NL_OS_WINDOWS
#ifdef NL_COMP_VC
friend iterator; // MSVC
friend const_iterator;
#else
@ -1280,7 +1280,7 @@ public:
// If changing this struct, don't forget to change the places where it is initialized
TSharedListRow Next;
uint64 Value;
#ifdef NL_OS_WINDOWS
#ifdef NL_COMP_VC
};
#else
} __attribute__((packed));

4
code/ryzom/server/src/ai_service/ai_entity_physical.h
View file

@ -55,7 +55,9 @@ template <class T>
class CTargetable
{
#ifdef NL_OS_WINDOWS
friend class CTargetable<T>;
# ifndef NL_COMP_MINGW
friend class CTargetable<T>;
# endif
#endif
public:
typedef NLMISC::CDbgPtr<T> TPtr;

2
code/ryzom/server/src/ai_service/ai_grp_npc.cpp
View file

@ -59,7 +59,7 @@ CSpawnGroupNpc::CSpawnGroupNpc(CPersistent<CSpawnGroup>& owner)
_LastUpdate = (randomVal>=0)?randomVal:CTimeInterface::gameCycle();
_LastBotUpdate = CTimeInterface::gameCycle();
activityProfile().setAIProfile(new CGrpProfileNormal(this));
_BotUpdateTimer.set((CAIS::rand32(40)+((long)this>>2))%20); // start with a random value.
_BotUpdateTimer.set((CAIS::rand32(40)+((intptr_t)this>>2))%20); // start with a random value.
resetSlowUpdateCycle();
_DespawnBotsWhenNoMoreHandleTimerActive = false;
}

4
code/ryzom/server/src/ai_service/service_main.cpp
View file

@ -38,7 +38,9 @@
#include "ais_user_models.h"
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# ifndef NL_COMP_MINGW
# define NOMINMAX
# endif
# include <windows.h>
#endif // NL_OS_WINDOWS

4
code/ryzom/server/src/ai_service/stdpch.h
View file

@ -191,7 +191,9 @@ namespace MULTI_LINE_FORMATER {
#include "ai_share/world_map.h"
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# ifndef NL_COMP_MINGW
# define NOMINMAX
# endif
# include <windows.h>
#endif // NL_OS_WINDOWS

4
code/ryzom/server/src/backup_service/backup_service.cpp
View file

@ -30,7 +30,9 @@
#include "web_connection.h"
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# ifndef NL_COMP_MINGW
# define NOMINMAX
# endif
# include <windows.h>
#endif // NL_OS_WINDOWS

4
code/ryzom/server/src/entities_game_service/CMakeLists.txt
View file

@ -111,8 +111,8 @@ NL_ADD_RUNTIME_FLAGS(ryzom_entities_game_service)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
IF(WITH_PCH)
IF(WITH_PCH AND NOT MINGW) # FIXME: PCH too large (> 130MB), crashes cc1plus under MinGW
ADD_NATIVE_PRECOMPILED_HEADER(ryzom_entities_game_service ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
ENDIF(WITH_PCH)
ENDIF(WITH_PCH AND NOT MINGW)
INSTALL(TARGETS ryzom_entities_game_service RUNTIME DESTINATION sbin COMPONENT services)

4
code/ryzom/server/src/entities_game_service/entities_game_service.cpp
View file

@ -127,7 +127,9 @@
#include "server_share/stl_allocator_checker.h"
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# ifndef NL_COMP_MINGW
# define NOMINMAX
# endif
# include <windows.h>
#endif // NL_OS_WINDOWS

4
code/ryzom/server/src/frontend_service/fe_receive_task.cpp
View file

@ -22,7 +22,9 @@
#include "fe_types.h"
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# ifndef NL_COMP_MINGW
# define NOMINMAX
# endif
# include <windows.h>
#elif defined NL_OS_UNIX

4
code/ryzom/server/src/frontend_service/frontend_service.cpp
View file

@ -57,7 +57,9 @@
#include "uid_impulsions.h"
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# ifndef NL_COMP_MINGW
# define NOMINMAX
# endif
# include <windows.h>
#endif // NL_OS_WINDOWS

4
code/ryzom/server/src/frontend_service/module_manager.cpp
View file

@ -178,7 +178,7 @@ void CModuleManager::addModule(uint id, TModuleExecCallback cb)
{
nlassert(id < _MaxModules);
nlassert(cb != NULL);
nldebug("FEMMAN: [%s] Added module %d (Cb=%p) to stack", _StackName.c_str(), id, cb);
nldebug("FEMMAN: [%s] Added module %d (Cb=%p) to stack", _StackName.c_str(), id, (void *)cb);
_ExecutionStack.push_back(CExecutionItem());
@ -372,7 +372,7 @@ void CModuleManager::executeStack()
nlwarning("FEMMAN: Unexpected ExecutionItem type (%d) at item %d of the execution stack %s", item.Type, i, _StackName.c_str());
uint j;
for (j=0; j<_ExecutionStack.size(); ++j)
nlwarning("FEMMAN: > %d [%s] Id=%d Cb=%p", j, (item.Type == Module) ? "MOD" : (item.Type == Wait) ? "WAIT" : "ERR", item.Id, item.Cb);
nlwarning("FEMMAN: > %d [%s] Id=%d Cb=%p", j, (item.Type == Module) ? "MOD" : (item.Type == Wait) ? "WAIT" : "ERR", item.Id, (void *)item.Cb);
nlerror("FEMMAN: Error in execution stack %s", _StackName.c_str());
}
}

4
code/ryzom/server/src/general_utilities_service/service_main.cpp
View file

@ -34,7 +34,9 @@
#include "service_main.h"
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# ifndef NL_COMP_MINGW
# define NOMINMAX
# endif
# include <windows.h>
#endif // NL_OS_WINDOWS

4
code/ryzom/server/src/gpm_service/gpm_service.cpp
View file

@ -50,7 +50,9 @@
#include "sheets.h"
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# ifndef NL_COMP_MINGW
# define NOMINMAX
# endif
# include <windows.h>
#endif // NL_OS_WINDOWS

4
code/ryzom/server/src/input_output_service/input_output_service.cpp
View file

@ -47,7 +47,9 @@
*/
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# ifndef NL_COMP_MINGW
# define NOMINMAX
# endif
# include <windows.h>
#endif // NL_OS_WINDOWS

4
code/ryzom/server/src/log_analyser_service/log_analyser_service.cpp
View file

@ -20,7 +20,9 @@
#include <nel/misc/variable.h>
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# ifndef NL_COMP_MINGW
# define NOMINMAX
# endif
# include <windows.h>
#endif // NL_OS_WINDOWS

4
code/ryzom/server/src/logger_service/logger_service.cpp
View file

@ -36,7 +36,9 @@
#include "log_storage.h"
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# ifndef NL_COMP_MINGW
# define NOMINMAX
# endif
# include <windows.h>
#endif // NL_OS_WINDOWS

4
code/ryzom/server/src/mail_forum_service/mail_forum_service.cpp
View file

@ -25,7 +25,9 @@
#include "hof_generator.h"
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# ifndef NL_COMP_MINGW
# define NOMINMAX
# endif
# include <windows.h>
#endif // NL_OS_WINDOWS

4
code/ryzom/server/src/mirror_service/data_set_ms.h
View file

@ -338,7 +338,7 @@ public:
// If changing this struct, don't forget to change the places where it is initialized
TSharedListRow Next;
T Value;
#ifdef NL_OS_WINDOWS
#ifdef NL_COMP_VC
};
#else
} __attribute__((packed));
@ -409,7 +409,7 @@ void push_front( const NLMISC::CEntityId& value );
// If changing this struct, don't forget to change the places where it is initialized
TSharedListRow Next;
uint64 Value;
#ifdef NL_OS_WINDOWS
#ifdef NL_COMP_VC
};
#else
} __attribute__((packed));

4
code/ryzom/server/src/mirror_service/mirror_service.cpp
View file

@ -25,7 +25,9 @@
#include <nel/georges/load_form.h>
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# ifndef NL_COMP_MINGW
# define NOMINMAX
# endif
# include <windows.h>
#endif // NL_OS_WINDOWS

4
code/ryzom/server/src/monitor_service/service_main.cpp
View file

@ -28,7 +28,9 @@
#include "messages.h"
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# ifndef NL_COMP_MINGW
# define NOMINMAX
# endif
# include <WinSock2.h>
# include <Windows.h>
typedef unsigned long ulong;

6
code/ryzom/server/src/patchman_service/service_main.cpp
View file

@ -36,8 +36,10 @@
#include "patchman_tester.h"
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# include <windows.h>
# ifndef NL_COMP_MINGW
# define NOMINMAX
# endif
# include <windows.h>
#endif // NL_OS_WINDOWS

4
code/ryzom/server/src/pd_reference_builder/reference_builder_service.cpp
View file

@ -21,7 +21,9 @@
#include "delta_builder_task.h"
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# ifndef NL_COMP_MINGW
# define NOMINMAX
# endif
# include <windows.h>
#endif // NL_OS_WINDOWS

4
code/ryzom/server/src/pd_support_service/service_main.cpp
View file

@ -34,7 +34,9 @@
#include "service_main.h"
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# ifndef NL_COMP_MINGW
# define NOMINMAX
# endif
# include <windows.h>
#endif // NL_OS_WINDOWS

4
code/ryzom/server/src/persistant_data_service/persistant_data_service.cpp
View file

@ -19,7 +19,9 @@
#include "db_manager.h"
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# ifndef NL_COMP_MINGW
# define NOMINMAX
# endif
# include <windows.h>
#endif // NL_OS_WINDOWS

4
code/ryzom/server/src/ryzom_admin_service/ryzom_admin_service.cpp
View file

@ -22,7 +22,9 @@
#include "nel/net/service.h"
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# ifndef NL_COMP_MINGW
# define NOMINMAX
# endif
# include <windows.h>
#endif // NL_OS_WINDOWS

4
code/ryzom/server/src/shard_unifier_service/shard_unifier_service.cpp
View file

@ -24,7 +24,9 @@
//#include <sys/utime.h>
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# ifndef NL_COMP_MINGW
# define NOMINMAX
# endif
# include <windows.h>
#endif // NL_OS_WINDOWS

4
code/ryzom/server/src/tick_service/tick_service.cpp
View file

@ -31,7 +31,9 @@
#include <string>
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# ifndef NL_COMP_MINGW
# define NOMINMAX
# endif
# include <windows.h>
#endif // NL_OS_WINDOWS