Add abstract frontend to HTTP support and stop using curl on Windows
This commit is contained in:
1 parent
bc30e0186b
commit
1cbba07fc3
12 files changed
+187
-299
No files matched your search
@@ -4,7 +4,7 @@ set -e
|
||||
|
||||
export BUILD_CLIENT="${BUILD_CLIENT:-0}"
|
||||
export BUILD_SERVER="${BUILD_SERVER:-1}"
|
||||
export USE_CURL="${USE_CURL:-1}"
|
||||
export USE_HTTP="${USE_HTTP:-1}"
|
||||
export USE_CODEC_OPUS="${USE_CODEC_OPUS:-1}"
|
||||
export USE_VOIP="${USE_VOIP:-1}"
|
||||
export COPYDIR="${COPYDIR:-~/ioquake3}"
|
||||
|
||||
@@ -19,9 +19,6 @@ endif
|
||||
ifndef USE_OPENAL_DLOPEN
|
||||
USE_OPENAL_DLOPEN=1
|
||||
endif
|
||||
ifndef USE_CURL_DLOPEN
|
||||
USE_CURL_DLOPEN=0
|
||||
endif
|
||||
ifndef USE_INTERNAL_ZLIB
|
||||
USE_INTERNAL_ZLIB=1
|
||||
endif
|
||||
@@ -50,9 +47,6 @@ endif
|
||||
ifeq ($(USE_OPENAL_DLOPEN),1)
|
||||
DEFINES+= -DUSE_OPENAL_DLOPEN
|
||||
endif
|
||||
ifeq ($(USE_CURL_DLOPEN),1)
|
||||
DEFINES+= -DUSE_CURL_DLOPEN
|
||||
endif
|
||||
ifeq ($(USE_INTERNAL_ZLIB),1)
|
||||
DEFINES+= -DUSE_INTERNAL_ZLIB
|
||||
endif
|
||||
|
||||
@@ -155,16 +155,6 @@ Section "OpenAL-Soft library" OpenAL
|
||||
SectionEnd
|
||||
!endif
|
||||
|
||||
!ifdef USE_CURL_DLOPEN
|
||||
Section "libcurl" libcurl
|
||||
|
||||
SetOutPath $INSTDIR
|
||||
|
||||
File "libcurl-4.dll"
|
||||
|
||||
SectionEnd
|
||||
!endif
|
||||
|
||||
;--------------------------------
|
||||
|
||||
; Uninstaller
|
||||
@@ -210,9 +200,6 @@ Section "Uninstall"
|
||||
!ifdef USE_OPENAL_DLOPEN
|
||||
Delete $INSTDIR\OpenAL32.dll
|
||||
!endif
|
||||
!ifdef USE_CURL_DLOPEN
|
||||
Delete $INSTDIR\libcurl-4.dll
|
||||
!endif
|
||||
|
||||
Delete $INSTDIR\uninstall.exe
|
||||
|
||||
@@ -235,7 +222,4 @@ SectionEnd
|
||||
!ifdef USE_OPENAL_DLOPEN
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${OpenAL} "Advanced audio mixer that supports surround sound."
|
||||
!endif
|
||||
!ifdef USE_CURL_DLOPEN
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${libcurl} "Used for HTTP file downloads."
|
||||
!endif
|
||||
!insertmacro MUI_FUNCTION_DESCRIPTION_END
|
||||
Reference in new issue
Block a user