|
|
@ -331,13 +331,13 @@ if GetOption("clazy"): |
|
|
|
Export('env', 'qt_env', 'arch', 'real_arch', 'SHARED', 'USE_WEBCAM') |
|
|
|
Export('env', 'qt_env', 'arch', 'real_arch', 'SHARED', 'USE_WEBCAM') |
|
|
|
|
|
|
|
|
|
|
|
SConscript(['common/SConscript']) |
|
|
|
SConscript(['common/SConscript']) |
|
|
|
Import('_common', '_gpucommon', '_gpu_libs') |
|
|
|
Import('_common', '_gpucommon') |
|
|
|
|
|
|
|
|
|
|
|
if SHARED: |
|
|
|
if SHARED: |
|
|
|
common, gpucommon = abspath(common), abspath(gpucommon) |
|
|
|
common, gpucommon = abspath(common), abspath(gpucommon) |
|
|
|
else: |
|
|
|
else: |
|
|
|
common = [_common, 'json11'] |
|
|
|
common = [_common, 'json11'] |
|
|
|
gpucommon = [_gpucommon] + _gpu_libs |
|
|
|
gpucommon = [_gpucommon] |
|
|
|
|
|
|
|
|
|
|
|
Export('common', 'gpucommon') |
|
|
|
Export('common', 'gpucommon') |
|
|
|
|
|
|
|
|
|
|
|