Fixed compilation with MSVC.
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
|
||||
import os
|
||||
import re
|
||||
from SCons.Script import *
|
||||
|
||||
@@ -6,6 +7,18 @@ _REPO_NAME = 'zlib'
|
||||
_REPO_URL = 'https://github.com/madler/zlib.git'
|
||||
_TAG_PATTERN = re.compile(r'^v([0-9]+)\.([0-9]+)(?:\.([0-9]+))?$')
|
||||
|
||||
def _build_lib_name(env: Environment) -> str:
|
||||
if os.name == 'posix':
|
||||
return {
|
||||
'debug': 'zd'
|
||||
}.get(env['BUILD_TYPE'], 'z')
|
||||
elif os.name == 'nt':
|
||||
return {
|
||||
'debug': 'zlibstaticd'
|
||||
}.get(env['BUILD_TYPE'], 'zlibstatic')
|
||||
else:
|
||||
raise Exception('libpng is not supported yet on this OS')
|
||||
|
||||
def versions(env: Environment, update: bool = False):
|
||||
tags = env.GitTags(repo_name = _REPO_NAME, remote_url = _REPO_URL, force_fetch=update)
|
||||
result = []
|
||||
@@ -25,7 +38,14 @@ def cook(env: Environment, version) -> dict:
|
||||
repo = env.GitBranch(repo_name = _REPO_NAME, remote_url = _REPO_URL, git_ref = git_ref)
|
||||
checkout_root = repo['checkout_root']
|
||||
build_result = env.CMakeProject(project_root=checkout_root)
|
||||
include_dir = os.path.join(build_result['install_dir'], 'include')
|
||||
lib_name = _build_lib_name(env)
|
||||
lib_file = env.FindLib(lib_name, paths=build_result['LIBPATH'])
|
||||
return {
|
||||
'CPPPATH': [os.path.join(build_result['install_dir'], 'include')],
|
||||
'LIBS': [env.FindLib('z', paths=build_result['LIBPATH'])]
|
||||
'CPPPATH': [include_dir],
|
||||
'LIBS': [lib_file],
|
||||
'CMAKE_VARS': {
|
||||
'ZLIB_LIBRARY': lib_file,
|
||||
'ZLIB_INCLUDE_DIR': include_dir
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user