Leak_Technologies/HULL
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace USE_LOCAL_HEADERS with USE_INTERNAL_*

Browse Source
This commit is contained in:
Pan7 2022-03-02 16:47:48 +01:00 committed by Tim Angus
parent 7962686d2d
commit 96fefcb7c9
14 changed files with 41 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Makefile
View File

@ -207,10 +207,18 @@ ifndef USE_INTERNAL_LIBS
USE_INTERNAL_LIBS=1 USE_INTERNAL_LIBS=1
endif endif
ifndef USE_INTERNAL_CURL_HEADERS
USE_INTERNAL_CURL_HEADERS=$(USE_INTERNAL_LIBS)
endif
ifndef USE_INTERNAL_OGG ifndef USE_INTERNAL_OGG
USE_INTERNAL_OGG=$(USE_INTERNAL_LIBS) USE_INTERNAL_OGG=$(USE_INTERNAL_LIBS)
endif endif
ifndef USE_INTERNAL_OPENAL_HEADERS
USE_INTERNAL_OPENAL_HEADERS=$(USE_INTERNAL_LIBS)
endif
ifndef USE_INTERNAL_VORBIS ifndef USE_INTERNAL_VORBIS
USE_INTERNAL_VORBIS=$(USE_INTERNAL_LIBS) USE_INTERNAL_VORBIS=$(USE_INTERNAL_LIBS)
endif endif
@ -219,6 +227,10 @@ ifndef USE_INTERNAL_OPUS
USE_INTERNAL_OPUS=$(USE_INTERNAL_LIBS) USE_INTERNAL_OPUS=$(USE_INTERNAL_LIBS)
endif endif
ifndef USE_INTERNAL_SDL
USE_INTERNAL_SDL=$(USE_INTERNAL_LIBS)
endif
ifndef USE_INTERNAL_ZLIB ifndef USE_INTERNAL_ZLIB
USE_INTERNAL_ZLIB=$(USE_INTERNAL_LIBS) USE_INTERNAL_ZLIB=$(USE_INTERNAL_LIBS)
endif endif
@ -540,7 +552,7 @@ ifeq ($(PLATFORM),darwin)
CLIENT_LIBS += -framework IOKit CLIENT_LIBS += -framework IOKit
RENDERER_LIBS += -framework OpenGL RENDERER_LIBS += -framework OpenGL
ifeq ($(USE_LOCAL_HEADERS),1) ifeq ($(USE_INTERNAL_SDL),1)
BASE_CFLAGS += -I$(SDLHDIR)/include BASE_CFLAGS += -I$(SDLHDIR)/include
# We copy sdlmain before ranlib'ing it so that subversion doesn't think # We copy sdlmain before ranlib'ing it so that subversion doesn't think
@ -697,7 +709,7 @@ ifdef MINGW
CLIENT_LIBS += -lmingw32 CLIENT_LIBS += -lmingw32
RENDERER_LIBS += -lmingw32 RENDERER_LIBS += -lmingw32
ifeq ($(USE_LOCAL_HEADERS),1) ifeq ($(USE_INTERNAL_SDL),1)
CLIENT_CFLAGS += -I$(SDLHDIR)/include CLIENT_CFLAGS += -I$(SDLHDIR)/include
ifeq ($(ARCH),x86) ifeq ($(ARCH),x86)
CLIENT_LIBS += $(LIBSDIR)/win32/libSDL2main.a \ CLIENT_LIBS += $(LIBSDIR)/win32/libSDL2main.a \
@ -1277,8 +1289,20 @@ ifdef DEFAULT_BASEDIR
BASE_CFLAGS += -DDEFAULT_BASEDIR=\\\"$(DEFAULT_BASEDIR)\\\" BASE_CFLAGS += -DDEFAULT_BASEDIR=\\\"$(DEFAULT_BASEDIR)\\\"
endif endif
ifeq ($(USE_LOCAL_HEADERS),1) ifeq ($(USE_INTERNAL_OPENAL_HEADERS),1)
BASE_CFLAGS += -DUSE_LOCAL_HEADERS BASE_CFLAGS += -DUSE_INTERNAL_OPENAL_HEADERS
endif
ifeq ($(USE_INTERNAL_CURL_HEADERS),1)
BASE_CFLAGS += -DUSE_INTERNAL_CURL_HEADERS
endif
ifeq ($(USE_INTERNAL_SDL),1)
BASE_CFLAGS += -DUSE_INTERNAL_SDL_HEADERS
endif
ifeq ($(USE_INTERNAL_ZLIB),1)
BASE_CFLAGS += -DUSE_INTERNAL_ZLIB
endif endif
ifeq ($(BUILD_STANDALONE),1) ifeq ($(BUILD_STANDALONE),1)

2
code/client/cl_http_curl.c
View File

@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "client.h" #include "client.h"
#ifdef USE_LOCAL_HEADERS #ifdef USE_INTERNAL_CURL_HEADERS
#include "curl/curl.h" #include "curl/curl.h"
#else #else
#include <curl/curl.h> #include <curl/curl.h>

2
code/client/qal.h
View File

@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define ALC_NO_PROTOTYPES #define ALC_NO_PROTOTYPES
#endif #endif
#ifdef USE_LOCAL_HEADERS #ifdef USE_INTERNAL_OPENAL_HEADERS
#include "AL/al.h" #include "AL/al.h"
#include "AL/alc.h" #include "AL/alc.h"
#else #else

2
code/qcommon/ioapi.c
View File

@ -10,7 +10,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#ifdef USE_LOCAL_HEADERS #ifdef USE_INTERNAL_ZLIB
#include "zlib.h" #include "zlib.h"
#else #else
#include <zlib.h> #include <zlib.h>

2
code/qcommon/unzip.h
View File

@ -49,7 +49,7 @@
extern "C" { extern "C" {
#endif #endif
#ifdef USE_LOCAL_HEADERS #ifdef USE_INTERNAL_ZLIB
#include "zlib.h" #include "zlib.h"
#else #else
#include <zlib.h> #include <zlib.h>

2
code/renderercommon/qgl.h
View File

@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#ifndef __QGL_H__ #ifndef __QGL_H__
#define __QGL_H__ #define __QGL_H__
#ifdef USE_LOCAL_HEADERS #ifdef USE_INTERNAL_SDL_HEADERS
# include "SDL_opengl.h" # include "SDL_opengl.h"
#else #else
# include <SDL_opengl.h> # include <SDL_opengl.h>

2
code/renderergl2/tr_extensions.c
View File

@ -21,7 +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 // tr_extensions.c - extensions needed by the renderer not in sdl_glimp.c
#ifdef USE_LOCAL_HEADERS #ifdef USE_INTERNAL_SDL_HEADERS
# include "SDL.h" # include "SDL.h"
#else #else
# include <SDL.h> # include <SDL.h>

2
code/sdl/sdl_gamma.c
View File

@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
=========================================================================== ===========================================================================
*/ */
#ifdef USE_LOCAL_HEADERS #ifdef USE_INTERNAL_SDL_HEADERS
# include "SDL.h" # include "SDL.h"
#else #else
# include <SDL.h> # include <SDL.h>

2
code/sdl/sdl_glimp.c
View File

@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
=========================================================================== ===========================================================================
*/ */
#ifdef USE_LOCAL_HEADERS #ifdef USE_INTERNAL_SDL_HEADERS
# include "SDL.h" # include "SDL.h"
#else #else
# include <SDL.h> # include <SDL.h>

2
code/sdl/sdl_input.c
View File

@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
=========================================================================== ===========================================================================
*/ */
#ifdef USE_LOCAL_HEADERS #ifdef USE_INTERNAL_SDL_HEADERS
# include "SDL.h" # include "SDL.h"
#else #else
# include <SDL.h> # include <SDL.h>

2
code/sdl/sdl_snd.c
View File

@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#ifdef USE_LOCAL_HEADERS #ifdef USE_INTERNAL_SDL_HEADERS
# include "SDL.h" # include "SDL.h"
#else #else
# include <SDL.h> # include <SDL.h>

2
code/sys/sys_loadlib.h
View File

@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# define Sys_LibraryError() dlerror() # define Sys_LibraryError() dlerror()
# endif # endif
#else #else
# ifdef USE_LOCAL_HEADERS # ifdef USE_INTERNAL_SDL_HEADERS
# include "SDL.h" # include "SDL.h"
# include "SDL_loadso.h" # include "SDL_loadso.h"
# else # else

2
code/sys/sys_local.h
View File

@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "../qcommon/qcommon.h" #include "../qcommon/qcommon.h"
#ifndef DEDICATED #ifndef DEDICATED
#ifdef USE_LOCAL_HEADERS #ifdef USE_INTERNAL_SDL_HEADERS
# include "SDL_version.h" # include "SDL_version.h"
#else #else
# include <SDL_version.h> # include <SDL_version.h>

2
code/sys/sys_main.c
View File

@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#endif #endif
#ifndef DEDICATED #ifndef DEDICATED
#ifdef USE_LOCAL_HEADERS #ifdef USE_INTERNAL_SDL_HEADERS
# include "SDL.h" # include "SDL.h"
# include "SDL_cpuinfo.h" # include "SDL_cpuinfo.h"
#else #else