mirror of
https://github.com/dhewm/dhewm3-sdk.git
synced 2024-11-21 20:21:19 +00:00
Split platform specific code from precompiled.h
New header sys/platform.h.
This commit is contained in:
dhewg
Daniel Gibson
parent
11b2cea993
commit
7d52a803ab
3 changed files with 208 additions and 172 deletions
|
|
@ -33,8 +33,6 @@ If you have questions concerning this license or the applicable additional terms
|
|||
|
||||
//-----------------------------------------------------
|
||||
|
||||
#define ID_TIME_T time_t
|
||||
|
||||
#ifdef _WIN32
|
||||
|
||||
#if defined(_MFC_VER) && !defined(_D3SDK) && !defined(GAME_DLL)
|
||||
|
|
@ -55,8 +53,6 @@ If you have questions concerning this license or the applicable additional terms
|
|||
#pragma warning(disable : 4996) // unsafe string operations
|
||||
|
||||
#include <malloc.h> // no malloc.h on mac or unix
|
||||
#include <windows.h> // for qgl.h
|
||||
#undef FindText // stupid namespace poluting Microsoft monkeys
|
||||
|
||||
#endif /* _WIN32 */
|
||||
|
||||
|
|
@ -82,6 +78,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
//-----------------------------------------------------
|
||||
|
||||
// non-portable system services
|
||||
#include "../sys/platform.h"
|
||||
#include "../sys/sys_public.h"
|
||||
|
||||
// id lib
|
||||
|
|
|
|||
207
sys/platform.h
Normal file
207
sys/platform.h
Normal file
|
|
@ -0,0 +1,207 @@
|
|||
/*
|
||||
===========================================================================
|
||||
|
||||
Doom 3 GPL Source Code
|
||||
Copyright (C) 1999-2011 id Software LLC, a ZeniMax Media company.
|
||||
|
||||
This file is part of the Doom 3 GPL Source Code ("Doom 3 Source Code").
|
||||
|
||||
Doom 3 Source Code is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
Doom 3 Source Code is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with Doom 3 Source Code. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
In addition, the Doom 3 Source Code is also subject to certain additional terms. You should have received a copy of these additional terms immediately following the terms and conditions of the GNU General Public License which accompanied the Doom 3 Source Code. If not, please request a copy in writing from id Software at the address below.
|
||||
|
||||
If you have questions concerning this license or the applicable additional terms, you may contact in writing id Software LLC, c/o ZeniMax Media Inc., Suite 120, Rockville, Maryland 20850 USA.
|
||||
|
||||
===========================================================================
|
||||
*/
|
||||
|
||||
#ifndef __PLATFORM__
|
||||
#define __PLATFORM__
|
||||
|
||||
/*
|
||||
===============================================================================
|
||||
|
||||
Non-portable system services.
|
||||
|
||||
===============================================================================
|
||||
*/
|
||||
|
||||
// Win32
|
||||
#if defined(WIN32) || defined(_WIN32)
|
||||
|
||||
#define BUILD_STRING "win-x86"
|
||||
#define BUILD_OS_ID 0
|
||||
#define CPUSTRING "x86"
|
||||
#define CPU_EASYARGS 1
|
||||
|
||||
#define _alloca16( x ) ((void *)((((uintptr_t)_alloca( (x)+15 )) + 15) & ~15))
|
||||
|
||||
#define PATHSEPERATOR_STR "\\"
|
||||
#define PATHSEPERATOR_CHAR '\\'
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#define ALIGN16( x ) __declspec(align(16)) x
|
||||
#define PACKED __attribute__((packed))
|
||||
#define ID_INLINE __forceinline
|
||||
#define ID_STATIC_TEMPLATE static
|
||||
#define assertmem( x, y ) assert( _CrtIsValidPointer( x, y, true ) )
|
||||
#else
|
||||
#define ALIGN16( x ) x __attribute__ ((aligned (16)))
|
||||
#define PACKED
|
||||
#define ID_INLINE inline
|
||||
#define ID_STATIC_TEMPLATE
|
||||
#define assertmem( x, y )
|
||||
#endif
|
||||
|
||||
#define THREAD_RETURN_TYPE DWORD
|
||||
|
||||
#if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64))
|
||||
#define ID_LITTLE_ENDIAN 1
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
// Mac OSX
|
||||
#if defined(MACOS_X) || defined(__APPLE__)
|
||||
|
||||
#define BUILD_STRING "MacOSX-universal"
|
||||
#define BUILD_OS_ID 1
|
||||
#ifdef __ppc__
|
||||
#define CPUSTRING "ppc"
|
||||
#define CPU_EASYARGS 0
|
||||
#elif defined(__i386__)
|
||||
#define CPUSTRING "x86"
|
||||
#define CPU_EASYARGS 1
|
||||
#endif
|
||||
|
||||
#define ALIGN16( x ) x __attribute__ ((aligned (16)))
|
||||
|
||||
#ifdef __MWERKS__
|
||||
#define PACKED
|
||||
#include <alloca.h>
|
||||
#else
|
||||
#define PACKED __attribute__((packed))
|
||||
#endif
|
||||
|
||||
#define _alloca alloca
|
||||
#define _alloca16( x ) ((void *)((((uintptr_t)alloca( (x)+15 )) + 15) & ~15))
|
||||
|
||||
#define PATHSEPERATOR_STR "/"
|
||||
#define PATHSEPERATOR_CHAR '/'
|
||||
|
||||
#define __cdecl
|
||||
#define ASSERT assert
|
||||
|
||||
#define ID_INLINE inline
|
||||
#define ID_STATIC_TEMPLATE
|
||||
|
||||
#define assertmem( x, y )
|
||||
|
||||
#define THREAD_RETURN_TYPE void *
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
// Unix
|
||||
#ifdef __unix__
|
||||
|
||||
#define BUILD_OS_ID 2
|
||||
|
||||
#ifdef __linux__
|
||||
#define BUILD_OS "linux"
|
||||
#elif defined(__FreeBSD__)
|
||||
#define BUILD_OS "FreeBSD"
|
||||
#elif defined(__DragonFly__)
|
||||
#define BUILD_OS "DragonFly"
|
||||
#elif defined(__OpenBSD__)
|
||||
#define BUILD_OS "OpenBSD"
|
||||
#elif defined(__NetBSD__)
|
||||
#define BUILD_OS "NetBSD"
|
||||
#else
|
||||
#error unknown operating system!
|
||||
#endif
|
||||
|
||||
#ifdef __i386__
|
||||
#define CPUSTRING "x86"
|
||||
#define CPU_EASYARGS 1
|
||||
#elif defined(__x86_64__)
|
||||
#define CPUSTRING "x86_64"
|
||||
#define CPU_EASYARGS 0
|
||||
#elif defined(__ppc__)
|
||||
#define CPUSTRING "ppc"
|
||||
#define CPU_EASYARGS 0
|
||||
#else
|
||||
#error unknown cpu architecture!
|
||||
#endif
|
||||
|
||||
#define BUILD_STRING (BUILD_OS "-" CPUSTRING)
|
||||
|
||||
#define _alloca alloca
|
||||
#define _alloca16( x ) ((void *)((((uintptr_t)alloca( (x)+15 )) + 15) & ~15))
|
||||
|
||||
#define ALIGN16( x ) x
|
||||
#define PACKED __attribute__((packed))
|
||||
|
||||
#define PATHSEPERATOR_STR "/"
|
||||
#define PATHSEPERATOR_CHAR '/'
|
||||
|
||||
#define __cdecl
|
||||
#define ASSERT assert
|
||||
|
||||
#define ID_INLINE inline
|
||||
#define ID_STATIC_TEMPLATE
|
||||
|
||||
#define assertmem( x, y )
|
||||
|
||||
#define THREAD_RETURN_TYPE void *
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
#if !defined(ID_LITTLE_ENDIAN) && !defined(ID_BIG_ENDIAN)
|
||||
#if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__)
|
||||
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
|
||||
#define ID_LITTLE_ENDIAN
|
||||
#endif
|
||||
#elif defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__)
|
||||
#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
|
||||
#define ID_BIG_ENDIAN
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if !defined(ID_LITTLE_ENDIAN) && !defined(ID_BIG_ENDIAN)
|
||||
#if defined(__i386__) || defined(__x86_64__)
|
||||
#define ID_LITTLE_ENDIAN 1
|
||||
#elif defined(__ppc__)
|
||||
#define ID_BIG_ENDIAN 1
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef __GNUC__
|
||||
#define id_attribute(x) __attribute__(x)
|
||||
#else
|
||||
#define id_attribute(x)
|
||||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#include <windows.h>
|
||||
#undef FindText // stupid namespace poluting Microsoft monkeys
|
||||
#endif
|
||||
|
||||
#define ID_TIME_T time_t
|
||||
|
||||
#endif
|
||||
168
sys/sys_public.h
168
sys/sys_public.h
|
|
@ -29,174 +29,6 @@ If you have questions concerning this license or the applicable additional terms
|
|||
#ifndef __SYS_PUBLIC__
|
||||
#define __SYS_PUBLIC__
|
||||
|
||||
/*
|
||||
===============================================================================
|
||||
|
||||
Non-portable system services.
|
||||
|
||||
===============================================================================
|
||||
*/
|
||||
|
||||
|
||||
// Win32
|
||||
#if defined(WIN32) || defined(_WIN32)
|
||||
|
||||
#define BUILD_STRING "win-x86"
|
||||
#define BUILD_OS_ID 0
|
||||
#define CPUSTRING "x86"
|
||||
#define CPU_EASYARGS 1
|
||||
|
||||
#define _alloca16( x ) ((void *)((((uintptr_t)_alloca( (x)+15 )) + 15) & ~15))
|
||||
|
||||
#define PATHSEPERATOR_STR "\\"
|
||||
#define PATHSEPERATOR_CHAR '\\'
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#define ALIGN16( x ) __declspec(align(16)) x
|
||||
#define PACKED __attribute__((packed))
|
||||
#define ID_INLINE __forceinline
|
||||
#define ID_STATIC_TEMPLATE static
|
||||
#define assertmem( x, y ) assert( _CrtIsValidPointer( x, y, true ) )
|
||||
#else
|
||||
#define ALIGN16( x ) x __attribute__ ((aligned (16)))
|
||||
#define PACKED
|
||||
#define ID_INLINE inline
|
||||
#define ID_STATIC_TEMPLATE
|
||||
#define assertmem( x, y )
|
||||
#endif
|
||||
|
||||
#define THREAD_RETURN_TYPE DWORD
|
||||
|
||||
#if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64))
|
||||
#define ID_LITTLE_ENDIAN 1
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
// Mac OSX
|
||||
#if defined(MACOS_X) || defined(__APPLE__)
|
||||
|
||||
#define BUILD_STRING "MacOSX-universal"
|
||||
#define BUILD_OS_ID 1
|
||||
#ifdef __ppc__
|
||||
#define CPUSTRING "ppc"
|
||||
#define CPU_EASYARGS 0
|
||||
#elif defined(__i386__)
|
||||
#define CPUSTRING "x86"
|
||||
#define CPU_EASYARGS 1
|
||||
#endif
|
||||
|
||||
#define ALIGN16( x ) x __attribute__ ((aligned (16)))
|
||||
|
||||
#ifdef __MWERKS__
|
||||
#define PACKED
|
||||
#include <alloca.h>
|
||||
#else
|
||||
#define PACKED __attribute__((packed))
|
||||
#endif
|
||||
|
||||
#define _alloca alloca
|
||||
#define _alloca16( x ) ((void *)((((uintptr_t)alloca( (x)+15 )) + 15) & ~15))
|
||||
|
||||
#define PATHSEPERATOR_STR "/"
|
||||
#define PATHSEPERATOR_CHAR '/'
|
||||
|
||||
#define __cdecl
|
||||
#define ASSERT assert
|
||||
|
||||
#define ID_INLINE inline
|
||||
#define ID_STATIC_TEMPLATE
|
||||
|
||||
#define assertmem( x, y )
|
||||
|
||||
#define THREAD_RETURN_TYPE void *
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
// Unix
|
||||
#ifdef __unix__
|
||||
|
||||
#define BUILD_OS_ID 2
|
||||
|
||||
#ifdef __linux__
|
||||
#define BUILD_OS "linux"
|
||||
#elif defined(__FreeBSD__)
|
||||
#define BUILD_OS "FreeBSD"
|
||||
#elif defined(__DragonFly__)
|
||||
#define BUILD_OS "DragonFly"
|
||||
#elif defined(__OpenBSD__)
|
||||
#define BUILD_OS "OpenBSD"
|
||||
#elif defined(__NetBSD__)
|
||||
#define BUILD_OS "NetBSD"
|
||||
#else
|
||||
#error unknown operating system!
|
||||
#endif
|
||||
|
||||
#ifdef __i386__
|
||||
#define CPUSTRING "x86"
|
||||
#define CPU_EASYARGS 1
|
||||
#elif defined(__x86_64__)
|
||||
#define CPUSTRING "x86_64"
|
||||
#define CPU_EASYARGS 0
|
||||
#elif defined(__ppc__)
|
||||
#define CPUSTRING "ppc"
|
||||
#define CPU_EASYARGS 0
|
||||
#else
|
||||
#error unknown cpu architecture!
|
||||
#endif
|
||||
|
||||
#define BUILD_STRING (BUILD_OS "-" CPUSTRING)
|
||||
|
||||
#define _alloca alloca
|
||||
#define _alloca16( x ) ((void *)((((uintptr_t)alloca( (x)+15 )) + 15) & ~15))
|
||||
|
||||
#define ALIGN16( x ) x
|
||||
#define PACKED __attribute__((packed))
|
||||
|
||||
#define PATHSEPERATOR_STR "/"
|
||||
#define PATHSEPERATOR_CHAR '/'
|
||||
|
||||
#define __cdecl
|
||||
#define ASSERT assert
|
||||
|
||||
#define ID_INLINE inline
|
||||
#define ID_STATIC_TEMPLATE
|
||||
|
||||
#define assertmem( x, y )
|
||||
|
||||
#define THREAD_RETURN_TYPE void *
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
#if !defined(ID_LITTLE_ENDIAN) && !defined(ID_BIG_ENDIAN)
|
||||
#if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__)
|
||||
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
|
||||
#define ID_LITTLE_ENDIAN
|
||||
#endif
|
||||
#elif defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__)
|
||||
#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
|
||||
#define ID_BIG_ENDIAN
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if !defined(ID_LITTLE_ENDIAN) && !defined(ID_BIG_ENDIAN)
|
||||
#if defined(__i386__) || defined(__x86_64__)
|
||||
#define ID_LITTLE_ENDIAN 1
|
||||
#elif defined(__ppc__)
|
||||
#define ID_BIG_ENDIAN 1
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef __GNUC__
|
||||
#define id_attribute(x) __attribute__(x)
|
||||
#else
|
||||
#define id_attribute(x)
|
||||
#endif
|
||||
|
||||
typedef enum {
|
||||
CPUID_NONE = 0x00000,
|
||||
CPUID_UNSUPPORTED = 0x00001, // unsupported (386/486)
|
||||
|
|
|
|||
Loading…
Reference in a new issue