Commit e03c705f authored by Sebastien Gara's avatar Sebastien Gara Committed by Sebastien Petitdemange

Correction for Windows Compilation and the basler plugin under Windows

Use Pylon environ variables
parent be112c52
Subproject commit c791fe4dd44b628ac750cbc38b86f7178a258b43
Subproject commit 68b99a46681651cc623a67136cc045673961ed4f
......@@ -144,8 +144,13 @@ def main():
extraIncludes += [espia_incl]
if(modName == 'basler') :
extraIncludes += ['/opt/pylon/include','/opt/pylon/include/genicam','/opt/pylon/genicam/library/CPP/include']
extra_cxxflags += ['-DUSE_GIGE']
if platform.system() != 'Windows':
extraIncludes += ['/opt/pylon/include','/opt/pylon/include/genicam','/opt/pylon/genicam/library/CPP/include']
extra_cxxflags += ['-DUSE_GIGE']
else:
extraIncludes += ['%s\library\cpp\include' % os.environ['PYLON_GENICAM_ROOT']]
extraIncludes += ['%s\include' % os.environ['PYLON_ROOT']]
extra_cxxflags += ['-DUSE_GIGE']
elif(modName == 'ueye') and platform.system() != 'Windows':
extra_cxxflags += ['-D__LINUX__']
elif(modName == 'andor') :
......@@ -248,12 +253,15 @@ def main():
makefile.extra_lib_dirs += glob.glob(os.path.join(rootName(''),libpath))
makefile.extra_lib_dirs += glob.glob(os.path.join(rootName('third-party\Processlib'), libpath))
makefile.extra_lib_dirs += glob.glob(os.path.join(rootName('camera'),modName, libpath))
if(modName == 'basler') :
makefile.extra_lib_dirs += ['%s\library\cpp\lib\win32_i86' % os.environ['PYLON_GENICAM_ROOT']]
makefile.extra_lib_dirs += ['%s\lib\Win32' % os.environ['PYLON_ROOT']]
else:
makefile.extra_libs = ['pthread','lima%s' % modName]
makefile.extra_cxxflags = ['-pthread', '-g','-DWITH_SPS_IMAGE'] + extra_cxxflags
makefile.extra_lib_dirs = [rootName('build')]
makefile.extra_cxxflags.extend(['-I' + x for x in extraIncludes])
makefile.extra_cxxflags.extend(['-I"%s"' % x for x in extraIncludes])
# Add the library we are wrapping. The name doesn't include any
# platform specific prefixes or extensions (e.g. the "lib" prefix on
......
......@@ -27,6 +27,9 @@ module2Installfiles = {
'simulator' : [('camera/simulator/python/Simulator.py','Lima'),
('build/msvc/9.0/LibSimulator/Release/liblimasimulator.dll','Lima'),
('sip/simulator/limasimulator.pyd','Lima')],
'basler' : [('camera/basler/python/Basler.py','Lima'),
('camera/basler/build/msvc/9.0/LibBasler/Release/liblimabasler.dll','Lima'),
('sip/basler/limabasler.pyd','Lima')],
'tango-core' : [('applications/tango/LimaCCDs.py',''),
('applications/tango/AttrHelper.py',''),
('applications/tango/EnvHelper.py',''),
......
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