From 2a697adba6e0df2b0cbd558d68eded24f546f994 Mon Sep 17 00:00:00 2001 From: "Dipl.-Ing. Jonas Stienen" Date: Wed, 6 Dec 2017 17:11:34 +0100 Subject: [PATCH] Solving merge --- setup.py.proto | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/setup.py.proto b/setup.py.proto index 610f9e9..898c7d1 100644 --- a/setup.py.proto +++ b/setup.py.proto @@ -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' ], -- GitLab