Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Support TLS in Webternet. #1856

Open
wants to merge 20 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 8 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,11 @@
path = sourcepawn
url = https://github.com/alliedmodders/sourcepawn
shallow = true
[submodule "extensions/curl/curl/lib"]
path = extensions/curl/curl/lib
url = https://github.com/alliedmodders/curl
shallow = true
[submodule "extensions/curl/mbedtls/lib"]
path = extensions/curl/mbedtls/lib
url = https://github.com/alliedmodders/mbedtls
shallow = true
3,506 changes: 3,506 additions & 0 deletions configs/ca-bundle.crt

Large diffs are not rendered by default.

16 changes: 10 additions & 6 deletions extensions/curl/AMBuilder
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python :
# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
import os

libcurl = builder.Build('curl-src/lib/AMBuilder')
libcurl = builder.Build('curl/AMBuilder')
mbedtls = builder.Build('mbedtls/AMBuilder')

for cxx in builder.targets:
binary = SM.ExtLibrary(builder, cxx, 'webternet.ext')
binary.compiler.includes += [
os.path.join(builder.sourcePath, 'extensions', 'curl', 'curl-src', 'include')
os.path.join(builder.sourcePath, 'extensions', 'curl', 'curl', 'lib', 'include')
]
binary.compiler.defines += ['CURL_STATICLIB']
if binary.compiler.family == 'gcc' or binary.compiler.family == 'clang':
binary.compiler.cxxflags += ['-fno-rtti']
elif binary.compiler.family == 'msvc':
binary.compiler.cxxflags += ['/GR-']
binary.compiler.postlink += [libcurl[binary.compiler.target.arch].binary]
binary.compiler.postlink += [
libcurl[binary.compiler.target.arch].binary,
mbedtls[binary.compiler.target.arch].binary
]
if binary.compiler.target.platform == 'linux':
binary.compiler.postlink += ['-lrt']
elif binary.compiler.target.platform == 'windows':
Expand All @@ -24,5 +29,4 @@ for cxx in builder.targets:
'../../public/smsdk_ext.cpp'
]

SM.extensions += [builder.Add(binary)]

SM.extensions += [builder.Add(binary)]
1,719 changes: 0 additions & 1,719 deletions extensions/curl/curl-src/CHANGES

This file was deleted.

21 changes: 0 additions & 21 deletions extensions/curl/curl-src/COPYING

This file was deleted.

Loading