Skip to content

Commit

Permalink
Merge pull request #247 from q4a/xd_dev
Browse files Browse the repository at this point in the history
Port stuff on Linux
  • Loading branch information
q4a committed Oct 7, 2018
2 parents 5a33028 + aa1bf00 commit c4eac4b
Show file tree
Hide file tree
Showing 13 changed files with 3 additions and 23 deletions.
16 changes: 0 additions & 16 deletions Externals/OPCODE/OPC_Preprocessor.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,6 @@
#ifndef __ICEPREPROCESSOR_H__
#define __ICEPREPROCESSOR_H__

// Check platform
#if defined(_WIN32) || defined(WIN32)
#pragma message("Compiling on Windows...")
#define PLATFORM_WINDOWS
#else
#pragma message("Compiling on unknown platform...")
#endif

// Check compiler
#if defined(_MSC_VER)
#pragma message("Compiling with VC++...")
#define COMPILER_VISUAL_CPP
#else
#pragma message("Compiling with unknown compiler...")
#endif

// Check compiler options
#ifdef COMPILER_VISUAL_CPP
#if defined(_CHAR_UNSIGNED)
Expand Down
10 changes: 3 additions & 7 deletions Externals/OPCODE/OPC_Types.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Include Guard
#pragma once
#include <stdint.h>
#ifndef __ICETYPES_H__
#define __ICETYPES_H__

Expand Down Expand Up @@ -42,8 +43,8 @@ typedef signed short sword; //!< sizeof(sword) must be 2
typedef unsigned short uword; //!< sizeof(uword) must be 2
typedef signed int sdword; //!< sizeof(sdword) must be 4
typedef unsigned int udword; //!< sizeof(udword) must be 4
typedef signed __int64 sqword; //!< sizeof(sqword) must be 8
typedef unsigned __int64 uqword; //!< sizeof(uqword) must be 8
typedef int64_t sqword; //!< sizeof(sqword) must be 8
typedef uint64_t uqword; //!< sizeof(uqword) must be 8
typedef float float32; //!< sizeof(float32) must be 4
typedef double float64; //!< sizeof(float64) must be 4

Expand All @@ -68,11 +69,6 @@ typedef udword RTYPE; //!< Relationship-type (!) between owners and references
#define INVALID_KID 0xffff //!< Invalid Kernel ID
#define INVALID_NUMBER 0xDEADBEEF //!< Standard junk value

// Define BOOL if needed
#ifndef BOOL
typedef int BOOL; //!< Another boolean type.
#endif

//! Union of a float and a sdword
typedef union
{
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit c4eac4b

Please sign in to comment.