Fixed linux compile errors

This commit is contained in:
Kernell 2015-12-19 11:58:39 +03:00
parent 013a924092
commit 790223566a
46 changed files with 460 additions and 78 deletions

BIN
mta-mono/lib/eglib.lib Normal file

Binary file not shown.

View File

@ -10,6 +10,7 @@
* *
*********************************************************/ *********************************************************/
#include "StdInc.h"
#include "CEvent.h" #include "CEvent.h"
CEvent::CEvent( CEventManager* pEventManager, string strName, DWORD pElement, MonoObject* pMonoDelegate, bool bPropagated, string strPriority ) CEvent::CEvent( CEventManager* pEventManager, string strName, DWORD pElement, MonoObject* pMonoDelegate, bool bPropagated, string strPriority )
@ -26,7 +27,6 @@ CEvent::CEvent( CEventManager* pEventManager, string strName, DWORD pElement, Mo
CEvent::~CEvent( void ) CEvent::~CEvent( void )
{ {
this->m_pMonoDelegate = nullptr; this->m_pMonoDelegate = nullptr;
this->m_bPropagated = nullptr;
this->m_pEventManager = nullptr; this->m_pEventManager = nullptr;
} }

View File

@ -10,6 +10,7 @@
* *
*********************************************************/ *********************************************************/
#include "StdInc.h"
#include "CEventManager.h" #include "CEventManager.h"
CEventManager::CEventManager( CResource* pResource ) CEventManager::CEventManager( CResource* pResource )

View File

@ -10,6 +10,7 @@
* *
*********************************************************/ *********************************************************/
#include "StdInc.h"
#include "CFunctions.h" #include "CFunctions.h"
#include "extra/CLuaArguments.h" #include "extra/CLuaArguments.h"
@ -131,7 +132,7 @@ int CFunctions::monoCommandHandler( lua_State* pLuaVM )
return 0; return 0;
} }
void* pPlayerSource; void* pPlayerSource = nullptr;
string strCommandName; string strCommandName;
uint i = 0; uint i = 0;
@ -140,8 +141,6 @@ int CFunctions::monoCommandHandler( lua_State* pLuaVM )
for( auto iter : pLuaArgs.GetArguments() ) for( auto iter : pLuaArgs.GetArguments() )
{ {
int iLuaType = iter->GetType();
switch( i ) switch( i )
{ {
case 0: case 0:

View File

@ -10,6 +10,7 @@
* *
*********************************************************/ *********************************************************/
#include "StdInc.h"
#include "CMonoClass.h" #include "CMonoClass.h"
CMonoClass::CMonoClass( MonoClass* pMonoClass, CMonoDomain* pDomain ) CMonoClass::CMonoClass( MonoClass* pMonoClass, CMonoDomain* pDomain )

View File

@ -10,6 +10,7 @@
* *
*********************************************************/ *********************************************************/
#include "StdInc.h"
#include "CMonoCorlib.h" #include "CMonoCorlib.h"
CMonoCorlib::CMonoCorlib( CMonoDomain* pDomain ) CMonoCorlib::CMonoCorlib( CMonoDomain* pDomain )

View File

@ -10,6 +10,7 @@
* *
*********************************************************/ *********************************************************/
#include "StdInc.h"
#include "CMonoDomain.h" #include "CMonoDomain.h"
CMonoDomain::CMonoDomain( CMonoInterface* pMono, MonoDomain* pDomain, CResource* pResource, const char* szName ) CMonoDomain::CMonoDomain( CMonoInterface* pMono, MonoDomain* pDomain, CResource* pResource, const char* szName )

View File

@ -10,6 +10,7 @@
* *
*********************************************************/ *********************************************************/
#include "StdInc.h"
#include "CMonoEvent.h" #include "CMonoEvent.h"
CMonoEvent::CMonoEvent( CMonoClass* pClass, MonoEvent* pEvent ) CMonoEvent::CMonoEvent( CMonoClass* pClass, MonoEvent* pEvent )

View File

@ -10,13 +10,14 @@
* *
*********************************************************/ *********************************************************/
#include "StdInc.h"
#include "CMonoFunctions.h" #include "CMonoFunctions.h"
void CMonoFunctions::AddInternals( void ) void CMonoFunctions::AddInternals( void )
{ {
mono_add_internal_call( "MultiTheftAuto.Debug::Log", CMonoFunctions::Debug::Log ); mono_add_internal_call( "MultiTheftAuto.Debug::Log", (const void*)CMonoFunctions::Debug::Log );
mono_add_internal_call( "MultiTheftAuto.Debug::Info", CMonoFunctions::Debug::Info ); mono_add_internal_call( "MultiTheftAuto.Debug::Info", (const void*)CMonoFunctions::Debug::Info );
mono_add_internal_call( "MultiTheftAuto.Debug::Error", CMonoFunctions::Debug::Error ); mono_add_internal_call( "MultiTheftAuto.Debug::Error", (const void*)CMonoFunctions::Debug::Error );
MONO_DECLARE( Config, Get ); MONO_DECLARE( Config, Get );
MONO_DECLARE( Config, Set ); MONO_DECLARE( Config, Set );

View File

@ -31,7 +31,7 @@ extern CResourceManager *g_pResourceManager;
#define RESOURCE g_pResourceManager->GetFromList( mono_domain_get() ) #define RESOURCE g_pResourceManager->GetFromList( mono_domain_get() )
#define MONO_DECLARE(a,b) mono_add_internal_call("MultiTheftAuto.Native."#a"::"#b,CMonoFunctions::a::b) #define MONO_DECLARE(a,b) mono_add_internal_call("MultiTheftAuto.Native."#a"::"#b,(const void*)CMonoFunctions::a::b)
class CMonoFunctions class CMonoFunctions
{ {

View File

@ -10,6 +10,7 @@
* *
*********************************************************/ *********************************************************/
#include "StdInc.h"
#include "CMonoFunctions.h" #include "CMonoFunctions.h"
// Account get funcs // Account get funcs

View File

@ -10,6 +10,7 @@
* *
*********************************************************/ *********************************************************/
#include "StdInc.h"
#include "CMonoFunctions.h" #include "CMonoFunctions.h"
// Audio funcs // Audio funcs
@ -27,7 +28,9 @@ bool CMonoFunctions::Audio::PlayMission( DWORD pUserData, MonoObject* pPosition,
{ {
if( RESOURCE ) if( RESOURCE )
{ {
return CLuaFunctionDefinitions::PlayMissionAudio( RESOURCE->GetLua(), (void*)pUserData, Vector3( pPosition ), usSlot ); Vector3 vecPosition( pPosition );
return CLuaFunctionDefinitions::PlayMissionAudio( RESOURCE->GetLua(), (void*)pUserData, vecPosition, usSlot );
} }
return false; return false;

View File

@ -10,6 +10,7 @@
* *
*********************************************************/ *********************************************************/
#include "StdInc.h"
#include "CMonoFunctions.h" #include "CMonoFunctions.h"
DWORD CMonoFunctions::Ban::Add( MonoString* msIP, MonoString* msUsername, MonoString* msSerial, DWORD pResponsible, MonoString* msResponsible, MonoString* msReason, int iUnban ) DWORD CMonoFunctions::Ban::Add( MonoString* msIP, MonoString* msUsername, MonoString* msSerial, DWORD pResponsible, MonoString* msResponsible, MonoString* msReason, int iUnban )

View File

@ -10,6 +10,7 @@
* *
*********************************************************/ *********************************************************/
#include "StdInc.h"
#include "CMonoFunctions.h" #include "CMonoFunctions.h"
// Blip create/destroy functions // Blip create/destroy functions

View File

@ -10,6 +10,7 @@
* *
*********************************************************/ *********************************************************/
#include "StdInc.h"
#include "CMonoFunctions.h" #include "CMonoFunctions.h"
// Element create/destroy // Element create/destroy

View File

@ -10,6 +10,7 @@
* *
*********************************************************/ *********************************************************/
#include "StdInc.h"
#include "CMonoFunctions.h" #include "CMonoFunctions.h"
bool CMonoFunctions::Event::Add( MonoString* msName, bool bAllowRemoteTrigger ) bool CMonoFunctions::Event::Add( MonoString* msName, bool bAllowRemoteTrigger )

View File

@ -10,6 +10,7 @@
* *
*********************************************************/ *********************************************************/
#include "StdInc.h"
#include "CMonoFunctions.h" #include "CMonoFunctions.h"
// Explosion funcs // Explosion funcs

View File

@ -10,6 +10,7 @@
* *
*********************************************************/ *********************************************************/
#include "StdInc.h"
#include "CMonoFunctions.h" #include "CMonoFunctions.h"
// Marker create/destroy functions // Marker create/destroy functions

View File

@ -10,6 +10,7 @@
* *
*********************************************************/ *********************************************************/
#include "StdInc.h"
#include "CMonoFunctions.h" #include "CMonoFunctions.h"
// Object create/destroy functions // Object create/destroy functions

View File

@ -10,6 +10,8 @@
* *
*********************************************************/ *********************************************************/
#include "StdInc.h"
#ifndef _CMONO_FUNCS_PED #ifndef _CMONO_FUNCS_PED
#define _CMONO_FUNCS_PED #define _CMONO_FUNCS_PED

View File

@ -10,6 +10,7 @@
* *
*********************************************************/ *********************************************************/
#include "StdInc.h"
#include "CMonoFunctions.h" #include "CMonoFunctions.h"
// Pickup create/destroy funcs // Pickup create/destroy funcs

View File

@ -10,6 +10,8 @@
* *
*********************************************************/ *********************************************************/
#include "StdInc.h"
#ifndef _CMONO_FUNCS_PLAYER #ifndef _CMONO_FUNCS_PLAYER
#define _CMONO_FUNCS_PLAYER #define _CMONO_FUNCS_PLAYER

View File

@ -10,6 +10,7 @@
* *
*********************************************************/ *********************************************************/
#include "StdInc.h"
#include "CMonoFunctions.h" #include "CMonoFunctions.h"
// Radar area create/destroy funcs // Radar area create/destroy funcs

View File

@ -10,6 +10,7 @@
* *
*********************************************************/ *********************************************************/
#include "StdInc.h"
#include "CMonoFunctions.h" #include "CMonoFunctions.h"
// Resource funcs // Resource funcs

View File

@ -10,6 +10,7 @@
* *
*********************************************************/ *********************************************************/
#include "StdInc.h"
#include "CMonoFunctions.h" #include "CMonoFunctions.h"
// Shape create funcs // Shape create funcs

View File

@ -10,6 +10,7 @@
* *
*********************************************************/ *********************************************************/
#include "StdInc.h"
#include "CMonoFunctions.h" #include "CMonoFunctions.h"
// Team get funcs // Team get funcs

View File

@ -10,6 +10,7 @@
* *
*********************************************************/ *********************************************************/
#include "StdInc.h"
#include "CMonoFunctions.h" #include "CMonoFunctions.h"
// Vehicle create/destroy functions // Vehicle create/destroy functions

View File

@ -10,6 +10,7 @@
* *
*********************************************************/ *********************************************************/
#include "StdInc.h"
#include "CMonoFunctions.h" #include "CMonoFunctions.h"
// Water funcs // Water funcs

View File

@ -10,6 +10,7 @@
* *
*********************************************************/ *********************************************************/
#include "StdInc.h"
#include "CMonoFunctions.h" #include "CMonoFunctions.h"
// General world get funcs // General world get funcs

View File

@ -10,6 +10,7 @@
* *
*********************************************************/ *********************************************************/
#include "StdInc.h"
#include "CMonoGC.h" #include "CMonoGC.h"
CMonoGC::CMonoGC( void ) CMonoGC::CMonoGC( void )
@ -73,20 +74,10 @@ int64 CMonoGC::GetHeapSize()
void CMonoGC::ReleaseGCHandle( unsigned int handle ) void CMonoGC::ReleaseGCHandle( unsigned int handle )
{ {
if( handle == -1 )
{
return;
}
mono_gchandle_free( handle ); mono_gchandle_free( handle );
} }
MonoObject* CMonoGC::GetGCHandleTarget( unsigned int handle ) MonoObject* CMonoGC::GetGCHandleTarget( unsigned int handle )
{ {
if( handle == -1 )
{
return nullptr;
}
return mono_gchandle_get_target( handle ); return mono_gchandle_get_target( handle );
} }

View File

@ -10,6 +10,7 @@
* *
*********************************************************/ *********************************************************/
#include "StdInc.h"
#include "CMonoInterface.h" #include "CMonoInterface.h"
#include "CMonoFunctions.h" #include "CMonoFunctions.h"

View File

@ -10,6 +10,7 @@
* *
*********************************************************/ *********************************************************/
#include "StdInc.h"
#include "CMonoMTALib.h" #include "CMonoMTALib.h"
CMonoMTALib::CMonoMTALib( CMonoDomain* pDomain ) CMonoMTALib::CMonoMTALib( CMonoDomain* pDomain )

View File

@ -10,6 +10,7 @@
* *
*********************************************************/ *********************************************************/
#include "StdInc.h"
#include "CMonoMethod.h" #include "CMonoMethod.h"
CMonoMethod::CMonoMethod( CMonoClass* pClass, MonoMethod* pMethod ) CMonoMethod::CMonoMethod( CMonoClass* pClass, MonoMethod* pMethod )

View File

@ -10,6 +10,7 @@
* *
*********************************************************/ *********************************************************/
#include "StdInc.h"
#include "CRegisteredCommands.h" #include "CRegisteredCommands.h"
CRegisteredCommands::CRegisteredCommands( CResource* pResource ) CRegisteredCommands::CRegisteredCommands( CResource* pResource )

View File

@ -10,6 +10,7 @@
* *
*********************************************************/ *********************************************************/
#include "StdInc.h"
#include "CResource.h" #include "CResource.h"
CResource::CResource( CMonoInterface* pMono, lua_State *pLuaVM, string sName ) CResource::CResource( CMonoInterface* pMono, lua_State *pLuaVM, string sName )

View File

@ -15,7 +15,6 @@ class CResource;
#ifndef __CRESOURCE_H #ifndef __CRESOURCE_H
#define __CRESOURCE_H #define __CRESOURCE_H
#include "Common.h"
#include "CMonoClass.h" #include "CMonoClass.h"
#include "CMonoEvent.h" #include "CMonoEvent.h"
#include "CMonoInterface.h" #include "CMonoInterface.h"

View File

@ -70,6 +70,57 @@ namespace FunctionArgumentType
}; };
} }
//
// Some templates
//
template < class T >T Min ( const T& a, const T& b )
{
return a < b ? a : b;
}
template < class T >T Max ( const T& a, const T& b )
{
return a > b ? a : b;
}
// Clamps a value between two other values ( min < a < max )
template< class T >T Clamp ( const T& min, const T& a, const T& max )
{
return a < min ? min : a > max ? max : a;
}
// Lerps between two values depending on the weight
template< class T >T Lerp ( const T& from, float fAlpha, const T& to )
{
return (T)( ( to - from ) * fAlpha + from );
}
// Find the relative position of Pos between From and To
inline const float Unlerp( const double dFrom, const double dPos, const double dTo )
{
// Avoid dividing by 0 (results in INF values)
if ( dFrom == dTo ) return 1.0f;
return static_cast< float >( ( dPos - dFrom ) / ( dTo - dFrom ) );
}
// Unlerp avoiding extrapolation
inline const float UnlerpClamped( const double dFrom, const double dPos, const double dTo )
{
return Clamp( 0.0f, Unlerp( dFrom, dPos, dTo ), 1.0f );
}
template < class T > int Round ( T value )
{
return static_cast< int >( floor( value + 0.5f ) );
}
template < class T > T WrapAround ( T fLow, T fValue, T fHigh )
{
const T fSize = fHigh - fLow;
return fValue - ( fSize * floor( ( fValue - fLow ) / fSize ) );
}
// //
// SColor // SColor
// //
@ -174,63 +225,6 @@ inline SColor COLOR_RGBA ( unsigned char R, unsigned char G, unsigned char B, un
inline SColor COLOR_ARGB ( unsigned char A, unsigned char R, unsigned char G, unsigned char B ) { return SColorRGBA ( R, G, B, A ); } inline SColor COLOR_ARGB ( unsigned char A, unsigned char R, unsigned char G, unsigned char B ) { return SColorRGBA ( R, G, B, A ); }
inline SColor COLOR_ABGR ( unsigned char A, unsigned char B, unsigned char G, unsigned char R ) { return SColorRGBA ( R, G, B, A ); } inline SColor COLOR_ABGR ( unsigned char A, unsigned char B, unsigned char G, unsigned char R ) { return SColorRGBA ( R, G, B, A ); }
//
// Some templates
//
template < class T >
T Min ( const T& a, const T& b )
{
return a < b ? a : b;
}
template < class T >
T Max ( const T& a, const T& b )
{
return a > b ? a : b;
}
// Clamps a value between two other values ( min < a < max )
template < class T >
T Clamp ( const T& min, const T& a, const T& max )
{
return a < min ? min : a > max ? max : a;
}
// Lerps between two values depending on the weight
template< class T >
T Lerp ( const T& from, float fAlpha, const T& to )
{
return (T)( ( to - from ) * fAlpha + from );
}
// Find the relative position of Pos between From and To
inline const float Unlerp ( const double dFrom, const double dPos, const double dTo )
{
// Avoid dividing by 0 (results in INF values)
if ( dFrom == dTo ) return 1.0f;
return static_cast < float > ( ( dPos - dFrom ) / ( dTo - dFrom ) );
}
// Unlerp avoiding extrapolation
inline const float UnlerpClamped ( const double dFrom, const double dPos, const double dTo )
{
return Clamp ( 0.0f, Unlerp( dFrom, dPos, dTo ), 1.0f );
}
template < class T >
int Round ( T value )
{
return static_cast < int > ( std::floor ( value + 0.5f ) );
}
template < class T >
T WrapAround ( T fLow, T fValue, T fHigh )
{
const T fSize = fHigh - fLow;
return fValue - ( fSize * std::floor ( ( fValue - fLow ) / fSize ) );
}
class CVehicleColor class CVehicleColor
{ {
public: public:

View File

@ -30,10 +30,14 @@ extern "C"
#include <sys/stat.h> #include <sys/stat.h>
#include <assert.h> #include <assert.h>
#ifdef WIN32
#pragma warning( push ) #pragma warning( push )
#pragma warning( disable: 4996 ) #pragma warning( disable: 4996 )
#include <glib.h> #include <glib.h>
#pragma warning( pop ) #pragma warning( pop )
#else
#include <glib.h>
#endif
#include <mono/jit/jit.h> #include <mono/jit/jit.h>
#include <mono/metadata/assembly.h> #include <mono/metadata/assembly.h>

View File

@ -16,6 +16,7 @@
* *
*********************************************************/ *********************************************************/
#include "../StdInc.h"
#include "CLuaArgument.h" #include "CLuaArgument.h"
#include <assert.h> #include <assert.h>
#include <cstring> #include <cstring>

View File

@ -16,6 +16,7 @@
* *
*********************************************************/ *********************************************************/
#include "../StdInc.h"
#include "CLuaArguments.h" #include "CLuaArguments.h"
#include <assert.h> #include <assert.h>
@ -103,7 +104,6 @@ bool CLuaArguments::Call ( lua_State* luaVM, const char* szFunction, int iResult
if ( iret == LUA_ERRRUN || iret == LUA_ERRMEM ) if ( iret == LUA_ERRRUN || iret == LUA_ERRMEM )
{ {
const char* szRes = lua_tostring( luaVM, -1 );
return false; // the function call failed return false; // the function call failed
} }

View File

@ -1,3 +1,4 @@
#include "../StdInc.h"
#include "Vector2.h" #include "Vector2.h"
Vector2::Vector2( void ) Vector2::Vector2( void )

View File

@ -1,3 +1,4 @@
#include "../StdInc.h"
#include "Vector3.h" #include "Vector3.h"
Vector3::Vector3( void ) Vector3::Vector3( void )

View File

@ -10,6 +10,7 @@
* *
*********************************************************/ *********************************************************/
#include "../StdInc.h"
#include "CLuaFunctionDefinitions.h" #include "CLuaFunctionDefinitions.h"
// All-Seeing Eye related Functions // All-Seeing Eye related Functions

View File

@ -10,6 +10,8 @@
* *
*********************************************************/ *********************************************************/
#include "StdInc.h"
#define MODULE_NAME "Mono 4.2.1" #define MODULE_NAME "Mono 4.2.1"
#define MODULE_AUTHOR "Dmitry Korolev <kernell@mtaroleplay.ru>" #define MODULE_AUTHOR "Dmitry Korolev <kernell@mtaroleplay.ru>"
#define MODULE_VERSION 0.24f #define MODULE_VERSION 0.24f

309
mta-mono/vendor/eglib/eglib.vcxproj vendored Normal file
View File

@ -0,0 +1,309 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug_SGen|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug_SGen|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release_SGen|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release_SGen|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{158073ED-99AE-4196-9EDC-DDB2344F8466}</ProjectGuid>
<RootNamespace>eglib</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\lib</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">$(Platform)\lib\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\lib</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">$(Platform)\lib\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\lib\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">$(Platform)\lib\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\lib\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">$(Platform)\lib\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
<Command>
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>../eglib/src;../eglib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|Win32'">
<PreBuildEvent>
<Command>winsetup.bat</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>../eglib/src;../eglib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
<Command>
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>MinSpace</Optimization>
<AdditionalIncludeDirectories>../eglib/src;../eglib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|Win32'">
<PreBuildEvent>
<Command>winsetup.bat</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>MinSpace</Optimization>
<AdditionalIncludeDirectories>../eglib/src;../eglib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
<Command>winsetup.bat</Command>
</PreBuildEvent>
<Midl>
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>../eglib/src;../eglib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_SGen|x64'">
<PreBuildEvent>
<Command>winsetup.bat</Command>
</PreBuildEvent>
<Midl>
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>../eglib/src;../eglib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
<Command>winsetup.bat</Command>
</PreBuildEvent>
<Midl>
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
<Optimization>MinSpace</Optimization>
<AdditionalIncludeDirectories>../eglib/src;../eglib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_SGen|x64'">
<PreBuildEvent>
<Command>winsetup.bat</Command>
</PreBuildEvent>
<Midl>
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
<Optimization>MinSpace</Optimization>
<AdditionalIncludeDirectories>../eglib/src;../eglib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_eglib|Win32'">
<ClCompile />
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_eglib|Win32'">
<ClCompile />
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="src\garray.c" />
<ClCompile Include="src\gdate-win32.c" />
<ClCompile Include="src\gdir-win32.c" />
<ClCompile Include="src\gerror.c" />
<ClCompile Include="src\gfile-posix.c" />
<ClCompile Include="src\gfile-win32.c" />
<ClCompile Include="src\gfile.c" />
<ClCompile Include="src\ghashtable.c" />
<ClCompile Include="src\giconv.c" />
<ClCompile Include="src\glist.c" />
<ClCompile Include="src\gmarkup.c" />
<ClCompile Include="src\gmem.c" />
<ClCompile Include="src\gmisc-win32.c" />
<ClCompile Include="src\gmodule-win32.c" />
<ClCompile Include="src\goutput.c" />
<ClCompile Include="src\gpath.c" />
<ClCompile Include="src\gpattern.c" />
<ClCompile Include="src\gptrarray.c" />
<ClCompile Include="src\gqsort.c" />
<ClCompile Include="src\gqueue.c" />
<ClCompile Include="src\gshell.c" />
<ClCompile Include="src\gslist.c" />
<ClCompile Include="src\gspawn.c" />
<ClCompile Include="src\gstr.c" />
<ClCompile Include="src\gstring.c" />
<ClCompile Include="src\gtimer-win32.c" />
<ClCompile Include="src\gunicode.c" />
<ClCompile Include="src\gutf8.c" />
<ClCompile Include="src\vasprintf.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\glib.h" />
<ClInclude Include="src\gmodule.h" />
<ClInclude Include="src\sort.frag.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

View File

@ -0,0 +1,46 @@
#ifndef __EGLIB_CONFIG_H
#define __EGLIB_CONFIG_H
/*
* System-dependent settings
*/
#define G_GNUC_PRETTY_FUNCTION
#define G_GNUC_UNUSED __attribute__((__unused__))
#define G_BYTE_ORDER G_LITTLE_ENDIAN
#define G_GNUC_NORETURN __attribute__((__noreturn__))
#define G_SEARCHPATH_SEPARATOR_S ":"
#define G_SEARCHPATH_SEPARATOR ':'
#define G_DIR_SEPARATOR '/'
#define G_DIR_SEPARATOR_S "/"
#define G_BREAKPOINT() G_STMT_START { __asm__ ("int $03"); } G_STMT_END
#define G_OS_UNIX
#define GPOINTER_TO_INT(ptr) ((gint)(long) (ptr))
#define GPOINTER_TO_UINT(ptr) ((guint)(long) (ptr))
#define GINT_TO_POINTER(v) ((gpointer)(glong) (v))
#define GUINT_TO_POINTER(v) ((gpointer)(gulong) (v))
#if 1 == 1
#define G_HAVE_ALLOCA_H
#endif
typedef unsigned long gsize;
typedef signed long gssize;
#define G_GSIZE_FORMAT "lu"
#define G_GUINT64_FORMAT "lu"
#define G_GINT64_FORMAT "ld"
#define G_GUINT32_FORMAT "u"
#define G_GINT32_FORMAT "d"
#if 1 == 1
#define G_HAVE_ISO_VARARGS
#endif
#if defined (__native_client__)
#undef G_BREAKPOINT
#define G_BREAKPOINT()
#endif
typedef int GPid;
#endif