From d0e8f3bb552a2da6e9dfc7ef5aa6f8eff12c275c Mon Sep 17 00:00:00 2001
From: Daniel Gibson <metalcaedes@gmail.com>
Date: Sun, 27 Sep 2015 03:08:30 +0200
Subject: [PATCH] Prepare for 1.4.0 release, make SDL2 default, update README

The version will be 1.4.0 because it's not compatible with
Doom3 1.3.1 mod DLLs.

(Note that this commit doesn't mean 1.4.0 is done, I might do some
 minor changes before tagging the Release!)
---
 README.md                | 39 ++++-----------------------------------
 neo/CMakeLists.txt       |  2 +-
 neo/framework/Licensee.h |  2 +-
 3 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/README.md b/README.md
index 46e9394f..e31ea10f 100644
--- a/README.md
+++ b/README.md
@@ -49,12 +49,12 @@ The build system is based on CMake: http://cmake.org/
 Required libraries are not part of the tree. These are:
 
 - zlib
-- libjpeg (minimum v6, v8 recommended)
+- libjpeg (v8)
 - libogg
 - libvorbis
 - libvorbisfile (may be part of libvorbis)
 - OpenAL (OpenAL Soft required, Creative's and Apple's versions are made of fail)
-- SDL v1.2
+- SDL v1.2 or 2.0 (2.0 recommended)
 - libcurl (optional, required for server downloads)
 
 For UNIX-like systems these libraries need to be installed (including the
@@ -98,7 +98,7 @@ For cross compiling a CMake Toolchain file is required.
 
 For the mingw-w64 toolchain "i686-w64-mingw32" on Ubuntu precise it looks like:
 
-<pre>
+```
 set(CMAKE_SYSTEM_NAME Windows)
 set(CMAKE_SYSTEM_PROCESSOR i686)
 
@@ -111,7 +111,7 @@ set(CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32)
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-</pre>
+```
 
 Then point CMake at your Toolchain file:
 `cmake -DCMAKE_TOOLCHAIN_FILE=/path/to/Toolchain.cmake -DDHEWM3LIBS=/path/to/dhewm3-libs/i686-w64-mingw32 /path/to/repository/neo`
@@ -262,37 +262,6 @@ neo/idlib/hashing/CRC32.cpp
 
 Copyright (C) 1995-1998 Mark Adler
 
-## OpenGL headers
-
-neo/renderer/wglext.h
-
-License Applicability. Except to the extent portions of this file are
-made subject to an alternative license as permitted in the SGI Free
-Software License B, Version 1.1 (the "License"), the contents of this
-file are subject only to the provisions of the License. You may not use
-this file except in compliance with the License. You may obtain a copy
-of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-
-http://oss.sgi.com/projects/FreeB
-
-Note that, as provided in the License, the Software is distributed on an
-"AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-
-Original Code. The Original Code is: OpenGL Sample Implementation,
-Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-Inc. The Original Code is Copyright (c) 1991-2002 Silicon Graphics, Inc.
-Copyright in any portions created by third parties is as indicated
-elsewhere herein. All Rights Reserved.
-
-Additional Notice Provisions: This software was created using the
-OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has
-not been independently verified as being compliant with the OpenGL(R)
-version 1.2.1 Specification.
-
 ## Brandelf utility
 
 neo/sys/linux/setup/brandelf.c
diff --git a/neo/CMakeLists.txt b/neo/CMakeLists.txt
index 6e92d0c9..3f1fab84 100644
--- a/neo/CMakeLists.txt
+++ b/neo/CMakeLists.txt
@@ -29,7 +29,7 @@ option(BASE			"Build the base game code" ON)
 option(D3XP			"Build the d3xp game code" ON)
 option(DEDICATED	"Build the dedicated server" OFF)
 option(ONATIVE		"Optimize for the host CPU" OFF)
-option(SDL2			"Use SDL2 instead of SDL1.2" OFF)
+option(SDL2			"Use SDL2 instead of SDL1.2" ON)
 
 if(NOT CMAKE_SYSTEM_PROCESSOR)
 	message(FATAL_ERROR "No target CPU architecture set")
diff --git a/neo/framework/Licensee.h b/neo/framework/Licensee.h
index 9cc20fb1..cdb01f4d 100644
--- a/neo/framework/Licensee.h
+++ b/neo/framework/Licensee.h
@@ -36,7 +36,7 @@ If you have questions concerning this license or the applicable additional terms
 
 #define GAME_NAME						"dhewm 3"		// appears on window titles and errors
 
-#define ENGINE_VERSION					"dhewm 1.3.1"	// printed in console
+#define ENGINE_VERSION					"dhewm 1.4.0"	// printed in console
 
 // paths
 #define	BASE_GAMEDIR					"base"