use system libraries more properly; introduce a dependency on Minizip

remove the USE_LOCAL_HEADERS option (it was broken anyway)

12 files changed, 14 insertions, 67 deletions

diff --git a/src/client/cl_curl.h b/src/client/cl_curl.h
index 1b3856fc..a66b97e0 100644
--- a/src/client/cl_curl.h
+++ b/src/client/cl_curl.h
@@ -28,11 +28,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../qcommon/q_shared.h"
 #include "../qcommon/qcommon.h"
 
-#ifdef USE_LOCAL_HEADERS
-  #include "../libcurl-7.35.0/curl/curl.h"
-#else
-  #include <curl/curl.h>
-#endif
+#include <curl/curl.h>
 
 #ifdef USE_CURL_DLOPEN
 #ifdef WIN32
diff --git a/src/client/qal.h b/src/client/qal.h
index a2b5d247..d5ffd9ab 100644
--- a/src/client/qal.h
+++ b/src/client/qal.h
@@ -34,19 +34,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define ALC_NO_PROTOTYPES
 #endif
 
-#ifdef USE_LOCAL_HEADERS
-#include "../AL/al.h"
-#include "../AL/alc.h"
-#else
-#ifdef _MSC_VER
-  // MSVC users must install the OpenAL SDK which doesn't use the AL/*.h scheme.
-  #include <al.h>
-  #include <alc.h>
-#else
-  #include <AL/al.h>
-  #include <AL/alc.h>
-#endif
-#endif
+#include <AL/al.h>
+#include <AL/alc.h>
 
 /* Hack to enable compiling both on OpenAL SDK and OpenAL-soft. */
 #ifndef ALC_ENUMERATE_ALL_EXT
diff --git a/src/qcommon/files.c b/src/qcommon/files.c
index c4c07242..4edf0318 100644
--- a/src/qcommon/files.c
+++ b/src/qcommon/files.c
@@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "q_shared.h"
 #include "qcommon.h"
-#include "unzip.h"
+#include <unzip.h>
 
 /*
 =============================================================================
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
diff --git a/src/renderergl2/tr_extensions.c b/src/renderergl2/tr_extensions.c
index 2972aaef..cbfd3138 100644
--- a/src/renderergl2/tr_extensions.c
+++ b/src/renderergl2/tr_extensions.c
@@ -21,11 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 // tr_extensions.c - extensions needed by the renderer not in sdl_glimp.c
 
-#ifdef USE_LOCAL_HEADERS
-#	include "SDL.h"
-#else
-#	include <SDL.h>
-#endif
+#include <SDL.h>
 
 #include "tr_local.h"
 #include "tr_dsa.h"
diff --git a/src/sdl/sdl_gamma.c b/src/sdl/sdl_gamma.c
index 7e030683..0998f93a 100644
--- a/src/sdl/sdl_gamma.c
+++ b/src/sdl/sdl_gamma.c
@@ -21,11 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifdef USE_LOCAL_HEADERS
-#	include "SDL.h"
-#else
-#	include <SDL.h>
-#endif
+#include <SDL.h>
 
 #include "../renderercommon/tr_common.h"
 #include "../qcommon/qcommon.h"
diff --git a/src/sdl/sdl_glimp.c b/src/sdl/sdl_glimp.c
index fed3fc5b..cc3e6378 100644
--- a/src/sdl/sdl_glimp.c
+++ b/src/sdl/sdl_glimp.c
@@ -21,11 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifdef USE_LOCAL_HEADERS
-#	include "SDL.h"
-#else
-#	include <SDL.h>
-#endif
+#include <SDL.h>
 
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/src/sdl/sdl_input.c b/src/sdl/sdl_input.c
index 700834c2..bb6403de 100644
--- a/src/sdl/sdl_input.c
+++ b/src/sdl/sdl_input.c
@@ -21,11 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifdef USE_LOCAL_HEADERS
-#	include "SDL.h"
-#else
-#	include <SDL.h>
-#endif
+#include <SDL.h>
 
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/src/sdl/sdl_snd.c b/src/sdl/sdl_snd.c
index 9420f0ba..018675d1 100644
--- a/src/sdl/sdl_snd.c
+++ b/src/sdl/sdl_snd.c
@@ -24,11 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <stdlib.h>
 #include <stdio.h>
 
-#ifdef USE_LOCAL_HEADERS
-#	include "SDL.h"
-#else
-#	include <SDL.h>
-#endif
+#include <SDL.h>
 
 #include "../qcommon/q_shared.h"
 #include "../client/snd_local.h"
diff --git a/src/sys/sys_loadlib.h b/src/sys/sys_loadlib.h
index 98d96935..c6b63419 100644
--- a/src/sys/sys_loadlib.h
+++ b/src/sys/sys_loadlib.h
@@ -36,13 +36,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #		define Sys_LibraryError() dlerror()
 #	endif
 #else
-#	ifdef USE_LOCAL_HEADERS
-#		include "SDL.h"
-#		include "SDL_loadso.h"
-#	else
-#		include <SDL.h>
-#		include <SDL_loadso.h>
-#	endif
+#	include <SDL.h>
+#	include <SDL_loadso.h>
 #	define Sys_LoadLibrary(f) SDL_LoadObject(f)
 #	define Sys_UnloadLibrary(h) SDL_UnloadObject(h)
 #	define Sys_LoadFunction(h,fn) SDL_LoadFunction(h,fn)
diff --git a/src/sys/sys_main.c b/src/sys/sys_main.c
index 34367ce4..fbb0c5b4 100644
--- a/src/sys/sys_main.c
+++ b/src/sys/sys_main.c
@@ -33,13 +33,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <errno.h>
 
 #ifndef DEDICATED
-#ifdef USE_LOCAL_HEADERS
-#	include "SDL.h"
-#	include "SDL_cpuinfo.h"
-#else
-#	include <SDL.h>
-#	include <SDL_cpuinfo.h>
-#endif
+#include <SDL.h>
+#include <SDL_cpuinfo.h>
 #endif
 
 #include "sys_local.h"