<commit_before>diff -rupN gzdoom.orig/src/CMakeLists.txt gzdoom/src/CMakeLists.txt
--- gzdoom.orig/src/CMakeLists.txt	2016-02-14 17:04:29.174997337 -0800
+++ gzdoom/src/CMakeLists.txt	2016-02-14 16:56:06.047997750 -0800
@@ -498,7 +498,7 @@ if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIB
 		set( CMAKE_CXX_FLAGS "-Wno-unused-result ${CMAKE_CXX_FLAGS}" )
 	endif()
 	set( CMAKE_C_FLAGS "-Wall -Wextra -Wno-unused -Wno-unused-parameter -Wno-missing-field-initializers ${CMAKE_C_FLAGS}" )
-	set( CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-unused -Wno-unused-parameter -Wno-missing-field-initializers ${CMAKE_CXX_FLAGS}" )
+	set( CMAKE_CXX_FLAGS "-DNDEBUG -std=c++11 -Wall -Wextra -Wno-unused -Wno-unused-parameter -Wno-missing-field-initializers ${CMAKE_CXX_FLAGS}" )
 
 	# Remove extra warnings when using the official DirectX headers.
 	# Also, TDM-GCC 4.4.0 no longer accepts glibc-style printf formats as valid,
@@ -818,6 +818,7 @@ file( GLOB HEADER_FILES
 	gl/data/*.h
 	gl/dynlights/*.h
 	gl/hqnx/*.h
+	gl/xBRZ/*.h
 	gl/hqnx_asm/*.h
 	gl/models/*.h
 	gl/renderer/*.h
@@ -1026,6 +1027,7 @@ set( FASTMATH_SOURCES
 	gl/hqnx/hq2x.cpp
 	gl/hqnx/hq3x.cpp
 	gl/hqnx/hq4x.cpp
+	gl/xBRZ/xbrz.cpp
 	gl/textures/gl_hwtexture.cpp
 	gl/textures/gl_texture.cpp
 	gl/textures/gl_material.cpp
diff -rupN gzdoom.orig/src/gitinfo.h gzdoom/src/gitinfo.h
--- gzdoom.orig/src/gitinfo.h	1969-12-31 16:00:00.000000000 -0800
+++ gzdoom/src/gitinfo.h	2016-02-14 17:02:53.527997416 -0800
@@ -0,0 +1,8 @@
+// ca4d9f04fbc5e0b27a0b5f1982e8fa3070455338
+//
+// This file was automatically generated by the
+// updaterevision tool. Do not edit by hand.
+
+#define GIT_DESCRIPTION "g2.2pre-495-gca4d9f0"
+#define GIT_HASH "ca4d9f04fbc5e0b27a0b5f1982e8fa3070455338"
+#define GIT_TIME "2016-02-14 17:01:56 -0800"
diff -rupN gzdoom.orig/src/gl/textures/gl_hqresize.cpp gzdoom/src/gl/textures/gl_hqresize.cpp
--- gzdoom.orig/src/gl/textures/gl_hqresize.cpp	2016-02-14 17:04:29.210997337 -0800
+++ gzdoom/src/gl/textures/gl_hqresize.cpp	2016-02-14 17:01:35.397997480 -0800
@@ -40,6 +40,7 @@
 #include "gl/textures/gl_texture.h"
 #include "c_cvars.h"
 #include "gl/hqnx/hqx.h"
+#include "gl/xBRZ/xbrz.h"<commit_msg>extraneous file removed from xbrz diff<commit_after>diff -rupN gzdoom.orig/src/CMakeLists.txt gzdoom/src/CMakeLists.txt
--- gzdoom.orig/src/CMakeLists.txt	2016-02-14 17:04:29.174997337 -0800
+++ gzdoom/src/CMakeLists.txt	2016-02-14 16:56:06.047997750 -0800
@@ -498,7 +498,7 @@ if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIB
 		set( CMAKE_CXX_FLAGS "-Wno-unused-result ${CMAKE_CXX_FLAGS}" )
 	endif()
 	set( CMAKE_C_FLAGS "-Wall -Wextra -Wno-unused -Wno-unused-parameter -Wno-missing-field-initializers ${CMAKE_C_FLAGS}" )
-	set( CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-unused -Wno-unused-parameter -Wno-missing-field-initializers ${CMAKE_CXX_FLAGS}" )
+	set( CMAKE_CXX_FLAGS "-DNDEBUG -std=c++11 -Wall -Wextra -Wno-unused -Wno-unused-parameter -Wno-missing-field-initializers ${CMAKE_CXX_FLAGS}" )
 
 	# Remove extra warnings when using the official DirectX headers.
 	# Also, TDM-GCC 4.4.0 no longer accepts glibc-style printf formats as valid,
@@ -818,6 +818,7 @@ file( GLOB HEADER_FILES
 	gl/data/*.h
 	gl/dynlights/*.h
 	gl/hqnx/*.h
+	gl/xBRZ/*.h
 	gl/hqnx_asm/*.h
 	gl/models/*.h
 	gl/renderer/*.h
@@ -1026,6 +1027,7 @@ set( FASTMATH_SOURCES
 	gl/hqnx/hq2x.cpp
 	gl/hqnx/hq3x.cpp
 	gl/hqnx/hq4x.cpp
+	gl/xBRZ/xbrz.cpp
 	gl/textures/gl_hwtexture.cpp
 	gl/textures/gl_texture.cpp
 	gl/textures/gl_material.cpp
diff -rupN gzdoom.orig/src/gl/textures/gl_hqresize.cpp gzdoom/src/gl/textures/gl_hqresize.cpp
--- gzdoom.orig/src/gl/textures/gl_hqresize.cpp	2016-02-14 17:04:29.210997337 -0800
+++ gzdoom/src/gl/textures/gl_hqresize.cpp	2016-02-14 17:01:35.397997480 -0800
@@ -40,6 +40,7 @@
 #include "gl/textures/gl_texture.h"
 #include "c_cvars.h"
 #include "gl/hqnx/hqx.h"
+#include "gl/xBRZ/xbrz.h"
{'fraction_non_alphanumeric': 0.15875486381322956, 'fraction_numerical': 0.11154345006485085, 'mean_word_length': 4.047120418848167, 'pattern_counts': {'":': 0, '<': 3, '<?xml version=': 0, '>': 3, 'https://': 0, 'lorem ipsum': 0, 'www.': 0, 'xml': 0}, 'pii_count': 0, 'substrings_counts': 1, 'word_list_counts': {'cursed_substrings.json': 0, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '7300655', 'n_tokens_mistral': 2099, 'n_tokens_neox': 1790, 'n_words': 268}