diff options
| author | /dev/humancontroller <devhc@example.com> | 2015-06-18 14:16:53 +0200 |
|---|---|---|
| committer | /dev/humancontroller <devhc@example.com> | 2017-02-06 18:00:03 +0100 |
| commit | 79670de4d78c6b6cd1e449aad985ac8dc4438b4e (patch) | |
| tree | 2347c5bce300546c9065518bd1a83805ed094fa5 /src/client | |
| parent | 0a18fe245ad759b6a7b1f64d2cf2a775c081421c (diff) | |
use system libraries more properly; introduce a dependency on Minizip
remove the USE_LOCAL_HEADERS option (it was broken anyway)
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/cl_curl.h | 6 | ||||
| -rw-r--r-- | src/client/qal.h | 15 |
2 files changed, 3 insertions, 18 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 |