Merge pull request #2 from Zegeri/clean

Partially port xrGame

.travis.yml

@@ -4,7 +4,7 @@ sudo: required
 dist: xenial
 compiler:
 - g++
-install: export CXX="g++-5"
+install: export CXX="g++-7"
 os:
 - linux
 before_script:
@@ -19,9 +19,9 @@ script:
 addons:
  apt:
  sources:
- - ubuntu-toolchain-r-test
+ - sourceline: 'ppa:ubuntu-toolchain-r/test'
  packages:
- - g++-5
+ - g++-7
 #branches:
 # only:
 # - linux

Externals/cximage/ximadef.h

@@ -94,14 +94,15 @@ typedef struct tagcomplex {
 #include <string.h>
 #include <ctype.h>
 
+#ifndef CXIMAGE_NO_WIN32_DEFINES
 typedef unsigned char BYTE;
 typedef unsigned short WORD;
 typedef unsigned long DWORD;
 typedef unsigned int UINT;
 typedef const char* LPCTSTR;
-
-typedef DWORD COLORREF;
 typedef unsigned int HANDLE;
+#endif
+typedef DWORD COLORREF;
 typedef void* HRGN;
 typedef void* HDC;
 
@@ -125,7 +126,7 @@ typedef int boolean;
 #define TCHAR char
 #define _T
 #endif
-
+#ifndef CXIMAGE_NO_WIN32_DEFINES
 typedef struct tagRECT
 {
  long left;
@@ -139,7 +140,7 @@ typedef struct tagPOINT
  long x;
  long y;
 } POINT;
-
+#endif
 typedef struct tagRGBQUAD {
  BYTE rgbBlue;
  BYTE rgbGreen;