Solving merge

parent c9dd2de7
......@@ -3,11 +3,11 @@ from distutils.core import setup, Extension
module1 = Extension('va',
define_macros = [ ( 'VA_PYTHON_VERSION_MAJOR', '@ITA_VAPYTHON_VERSION_MAJOR@' ),
( 'VA_PYTHON_VERSION_MINOR', '@ITA_VAPYTHON_VERSION_MINOR@' ),
( 'VABASE_STATIC', 1 ),
( 'VANET_STATIC', 1 ),
( 'VISTABASE_STATIC', 1 ),
( 'VISTAINTERPROCCOMM_STATIC', 1 ),
( 'VISTAASPECTS_STATIC',1 ) ],
( 'VABASE_STATIC', 0 ),
( 'VANET_STATIC', 0 ),
( 'VISTABASE_STATIC', 0 ),
( 'VISTAINTERPROCCOMM_STATIC', 0 ),
( 'VISTAASPECTS_STATIC',0 ) ],
include_dirs = [ '../VABase/include', '../VANet/include' ],
libraries = [ 'VABase', 'VANet', 'VistaBase', 'VistaAspects', 'VistaInterProcComm', 'winmm', 'ws2_32' ],
library_dirs = [ '../build_win32-x64.vc14/lib','../../ViSTA/build_win32-x64.vc14/lib' ],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment