Browse Source

engine: move EXPORT definition to xash3d_types

pull/2/head
Alibek Omarov 6 years ago
parent
commit
4880ca3ca2
  1. 14
      common/xash3d_types.h
  2. 8
      engine/common/common.h

14
common/xash3d_types.h

@ -68,9 +68,19 @@ typedef integer64 longtime_t;
#define IsColorString( p ) ( p && *( p ) == '^' && *(( p ) + 1) && *(( p ) + 1) >= '0' && *(( p ) + 1 ) <= '9' ) #define IsColorString( p ) ( p && *( p ) == '^' && *(( p ) + 1) && *(( p ) + 1) >= '0' && *(( p ) + 1 ) <= '9' )
#define ColorIndex( c ) ((( c ) - '0' ) & 7 ) #define ColorIndex( c ) ((( c ) - '0' ) & 7 )
#if defined __i386__ && defined __GNUC__ #if defined(__GNUC__)
#define GAME_EXPORT __attribute__((force_align_arg_pointer)) #ifdef __i386__
#define EXPORT __attribute__ ((visibility ("default"),force_align_arg_pointer))
#define GAME_EXPORT __attribute((force_align_arg_pointer))
#else #else
#define EXPORT __attribute__ ((visibility ("default")))
#define GAME_EXPORT
#endif
#elif defined(_MSC_VER)
#define EXPORT __declspec( dllexport )
#define GAME_EXPORT
#else
#define EXPORT
#define GAME_EXPORT #define GAME_EXPORT
#endif #endif

8
engine/common/common.h

@ -47,16 +47,8 @@ XASH SPECIFIC - sort of hack that works only in Xash3D not in GoldSrc
#ifndef _WIN32 #ifndef _WIN32
#include <stddef.h> // size_t #include <stddef.h> // size_t
#ifdef __i386__
#define EXPORT __attribute__ ((visibility ("default"),force_align_arg_pointer))
#else
#define EXPORT __attribute__ ((visibility ("default")))
#endif
#else #else
#include <sys/types.h> // off_t #include <sys/types.h> // off_t
#define EXPORT __declspec( dllexport )
#endif #endif
// configuration // configuration

Loading…
Cancel
Save