From 79670de4d78c6b6cd1e449aad985ac8dc4438b4e Mon Sep 17 00:00:00 2001
From: /dev/humancontroller <devhc@example.com>
Date: Thu, 18 Jun 2015 14:16:53 +0200
Subject: use system libraries more properly; introduce a dependency on Minizip

remove the USE_LOCAL_HEADERS option (it was broken anyway)
---
 src/renderercommon/qgl.h          | 6 +-----
 src/renderercommon/tr_image_jpg.c | 4 ----
 2 files changed, 1 insertion(+), 9 deletions(-)

(limited to 'src/renderercommon')

diff --git a/src/renderercommon/qgl.h b/src/renderercommon/qgl.h
index bf48cc62..bf4761e2 100644
--- a/src/renderercommon/qgl.h
+++ b/src/renderercommon/qgl.h
@@ -27,11 +27,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #ifndef __QGL_H__
 #define __QGL_H__
 
-#ifdef USE_LOCAL_HEADERS
-#	include "SDL_opengl.h"
-#else
-#	include <SDL_opengl.h>
-#endif
+#include <SDL_opengl.h>
 
 extern void (APIENTRYP qglActiveTextureARB) (GLenum texture);
 extern void (APIENTRYP qglClientActiveTextureARB) (GLenum texture);
diff --git a/src/renderercommon/tr_image_jpg.c b/src/renderercommon/tr_image_jpg.c
index 3e369c20..41d9d52e 100644
--- a/src/renderercommon/tr_image_jpg.c
+++ b/src/renderercommon/tr_image_jpg.c
@@ -33,10 +33,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  * You may also wish to include "jerror.h".
  */
 
-#ifdef USE_INTERNAL_JPEG
-#  define JPEG_INTERNALS
-#endif
-
 #include <jpeglib.h>
 
 #ifndef USE_INTERNAL_JPEG
-- 
cgit