luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Modifications to enable building of Qt-less canvas in setup.py

This commit is contained in:
Matthias Koefferlein 2022-05-12 01:53:16 +02:00
parent f57f1cc228
commit b2b5e5ad55
197 changed files with 1123 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

188
setup.py
View File

@ -28,6 +28,7 @@ The standalone libraries are basically extension modules.
Build requirements are:
* curl library
* expat library
* png library
The main challenge is to map KLayout's shared object architecture.
The structure consists of the Python extension libraries and a bunch
@ -269,6 +270,7 @@ class Config(object):
if bits:
return [quote_path("-I" + os.path.join(bits, "zlib", "include")),
quote_path("-I" + os.path.join(bits, "ptw", "include")),
quote_path("-I" + os.path.join(bits, "png", "include")),
quote_path("-I" + os.path.join(bits, "expat", "include")),
quote_path("-I" + os.path.join(bits, "curl", "include"))]
else:
@ -285,9 +287,13 @@ class Config(object):
if platform.system() == "Windows":
if mod == "_tl":
return [ "libcurl", "expat", "pthreadVCE2", "zlib", "wsock32" ]
elif mod == "_lay":
return [ "libpng" ]
else:
if mod == "_tl":
return ['curl', 'expat']
elif mod == "_lay":
return [ 'png' ]
return []
def link_args(self, mod):
@ -300,6 +306,7 @@ class Config(object):
if bits:
args += [quote_path("/LIBPATH:" + os.path.join(bits, "zlib", "libraries")),
quote_path("/LIBPATH:" + os.path.join(bits, "ptw", "libraries")),
quote_path("/LIBPATH:" + os.path.join(bits, "png", "libraries")),
quote_path("/LIBPATH:" + os.path.join(bits, "expat", "libraries")),
quote_path("/LIBPATH:" + os.path.join(bits, "curl", "libraries"))]
return args
@ -334,7 +341,7 @@ class Config(object):
"""
Returns the macros to use for building
"""
return [('HAVE_CURL', 1), ('HAVE_EXPAT', 1), ('KLAYOUT_MAJOR_VERSION', self.major_version()), ('KLAYOUT_MINOR_VERSION', self.minor_version())]
return [('HAVE_PNG', 1), ('HAVE_CURL', 1), ('HAVE_EXPAT', 1), ('KLAYOUT_MAJOR_VERSION', self.major_version()), ('KLAYOUT_MINOR_VERSION', self.minor_version())]
def minor_version(self):
"""
@ -425,6 +432,7 @@ _gsi = Library(config.root + '._gsi',
include_dirs=[_tl_path],
extra_objects=[config.path_of('_tl', _tl_path)],
language='c++',
libraries=config.libraries('_gsi'),
extra_link_args=config.link_args('_gsi'),
extra_compile_args=config.compile_args('_gsi'),
sources=list(_gsi_sources))
@ -441,11 +449,29 @@ _pya = Library(config.root + '._pya',
include_dirs=[_tl_path, _gsi_path],
extra_objects=[config.path_of('_tl', _tl_path), config.path_of('_gsi', _gsi_path)],
language='c++',
libraries=config.libraries('_pya'),
extra_link_args=config.link_args('_pya'),
extra_compile_args=config.compile_args('_pya'),
sources=list(_pya_sources))
config.add_extension(_pya)
# ------------------------------------------------------------------
# _rba dependency library (dummy)
_rba_path = os.path.join("src", "rbastub")
_rba_sources = set(glob.glob(os.path.join(_rba_path, "*.cc")))
_rba = Library(config.root + '._rba',
define_macros=config.macros() + [('MAKE_RBA_LIBRARY', 1)],
include_dirs=[_tl_path, _gsi_path],
extra_objects=[config.path_of('_tl', _tl_path), config.path_of('_gsi', _gsi_path)],
language='c++',
libraries=config.libraries('_rba'),
extra_link_args=config.link_args('_rba'),
extra_compile_args=config.compile_args('_rba'),
sources=list(_rba_sources))
config.add_extension(_rba)
# ------------------------------------------------------------------
# _db dependency library
@ -457,6 +483,7 @@ _db = Library(config.root + '._db',
include_dirs=[_tl_path, _gsi_path, _db_path],
extra_objects=[config.path_of('_tl', _tl_path), config.path_of('_gsi', _gsi_path)],
language='c++',
libraries=config.libraries('_db'),
extra_link_args=config.link_args('_db'),
extra_compile_args=config.compile_args('_db'),
sources=list(_db_sources))
@ -473,6 +500,7 @@ _lib = Library(config.root + '._lib',
include_dirs=[_tl_path, _gsi_path, _db_path, _lib_path],
extra_objects=[config.path_of('_tl', _tl_path), config.path_of('_gsi', _gsi_path), config.path_of('_db', _db_path)],
language='c++',
libraries=config.libraries('_lib'),
extra_link_args=config.link_args('_lib'),
extra_compile_args=config.compile_args('_lib'),
sources=list(_lib_sources))
@ -489,11 +517,97 @@ _rdb = Library(config.root + '._rdb',
include_dirs=[_db_path, _tl_path, _gsi_path],
extra_objects=[config.path_of('_tl', _tl_path), config.path_of('_gsi', _gsi_path), config.path_of('_db', _db_path)],
language='c++',
libraries=config.libraries('_rdb'),
extra_link_args=config.link_args('_rdb'),
extra_compile_args=config.compile_args('_rdb'),
sources=list(_rdb_sources))
config.add_extension(_rdb)
# ------------------------------------------------------------------
# _lym dependency library
_lym_path = os.path.join("src", "lym", "lym")
_lym_sources = set(glob.glob(os.path.join(_lym_path, "*.cc")))
_lym = Library(config.root + '._lym',
define_macros=config.macros() + [('MAKE_LYM_LIBRARY', 1)],
include_dirs=[_pya_path, _rba_path, _tl_path, _gsi_path],
extra_objects=[config.path_of('_rba', _rba_path), config.path_of('_pya', _pya_path), config.path_of('_tl', _tl_path), config.path_of('_gsi', _gsi_path)],
language='c++',
libraries=config.libraries('_lym'),
extra_link_args=config.link_args('_lym'),
extra_compile_args=config.compile_args('_lym'),
sources=list(_lym_sources))
config.add_extension(_lym)
# ------------------------------------------------------------------
# _lay dependency library
_lay_path = os.path.join("src", "laybasic", "laybasic")
_lay_sources = set(glob.glob(os.path.join(_lay_path, "*.cc")))
_lay = Library(config.root + '._lay',
define_macros=config.macros() + [('MAKE_LAYBASIC_LIBRARY', 1)],
include_dirs=[_lym_path, _rdb_path, _db_path, _tl_path, _gsi_path],
extra_objects=[config.path_of('_lym', _lym_path), config.path_of('_rdb', _rdb_path), config.path_of('_tl', _tl_path), config.path_of('_gsi', _gsi_path), config.path_of('_db', _db_path)],
language='c++',
libraries=config.libraries('_lay'),
extra_link_args=config.link_args('_lay'),
extra_compile_args=config.compile_args('_lay'),
sources=list(_lay_sources))
config.add_extension(_lay)
# ------------------------------------------------------------------
# _ant dependency library
_ant_path = os.path.join("src", "ant", "ant")
_ant_sources = set(glob.glob(os.path.join(_ant_path, "*.cc")))
_ant = Library(config.root + '._ant',
define_macros=config.macros() + [('MAKE_ANT_LIBRARY', 1)],
include_dirs=[_lay_path, _rdb_path, _db_path, _tl_path, _gsi_path],
extra_objects=[config.path_of('_lay', _lay_path), config.path_of('_rdb', _rdb_path), config.path_of('_tl', _tl_path), config.path_of('_gsi', _gsi_path), config.path_of('_db', _db_path)],
language='c++',
libraries=config.libraries('_ant'),
extra_link_args=config.link_args('_ant'),
extra_compile_args=config.compile_args('_ant'),
sources=list(_ant_sources))
config.add_extension(_ant)
# ------------------------------------------------------------------
# _img dependency library
_img_path = os.path.join("src", "img", "img")
_img_sources = set(glob.glob(os.path.join(_img_path, "*.cc")))
_img = Library(config.root + '._img',
define_macros=config.macros() + [('MAKE_ANT_LIBRARY', 1)],
include_dirs=[_lay_path, _rdb_path, _db_path, _tl_path, _gsi_path],
extra_objects=[config.path_of('_lay', _lay_path), config.path_of('_rdb', _rdb_path), config.path_of('_tl', _tl_path), config.path_of('_gsi', _gsi_path), config.path_of('_db', _db_path)],
language='c++',
libraries=config.libraries('_img'),
extra_link_args=config.link_args('_img'),
extra_compile_args=config.compile_args('_img'),
sources=list(_img_sources))
config.add_extension(_img)
# ------------------------------------------------------------------
# _edt dependency library
_edt_path = os.path.join("src", "edt", "edt")
_edt_sources = set(glob.glob(os.path.join(_edt_path, "*.cc")))
_edt = Library(config.root + '._edt',
define_macros=config.macros() + [('MAKE_ANT_LIBRARY', 1)],
include_dirs=[_lay_path, _rdb_path, _db_path, _tl_path, _gsi_path],
extra_objects=[config.path_of('_lay', _lay_path), config.path_of('_rdb', _rdb_path), config.path_of('_tl', _tl_path), config.path_of('_gsi', _gsi_path), config.path_of('_db', _db_path)],
language='c++',
libraries=config.libraries('_edt'),
extra_link_args=config.link_args('_edt'),
extra_compile_args=config.compile_args('_edt'),
sources=list(_edt_sources))
config.add_extension(_edt)
# ------------------------------------------------------------------
# dependency libraries from db_plugins
@ -577,6 +691,76 @@ rdb = Extension(config.root + '.rdbcore',
extra_compile_args=config.compile_args('rdbcore'),
sources=list(rdb_sources))
# ------------------------------------------------------------------
# lay extension library
lay_path = os.path.join("src", "pymod", "lay")
lay_sources = set(glob.glob(os.path.join(lay_path, "*.cc")))
lay = Extension(config.root + '.laycore',
define_macros=config.macros(),
include_dirs=[_lay_path, _tl_path, _gsi_path, _pya_path],
extra_objects=[config.path_of('_lay', _lay_path), config.path_of('_tl', _tl_path), config.path_of('_gsi', _gsi_path), config.path_of('_pya', _pya_path)],
extra_link_args=config.link_args('laycore'),
extra_compile_args=config.compile_args('laycore'),
sources=list(lay_sources))
# ------------------------------------------------------------------
# ant extension library
ant_path = os.path.join("src", "pymod", "ant")
ant_sources = set(glob.glob(os.path.join(ant_path, "*.cc")))
ant = Extension(config.root + '.antcore',
define_macros=config.macros(),
include_dirs=[_ant_path, _tl_path, _gsi_path, _pya_path],
extra_objects=[config.path_of('_ant', _ant_path), config.path_of('_tl', _tl_path), config.path_of('_gsi', _gsi_path), config.path_of('_pya', _pya_path)],
extra_link_args=config.link_args('antcore'),
extra_compile_args=config.compile_args('antcore'),
sources=list(ant_sources))
# ------------------------------------------------------------------
# edt extension library
edt_path = os.path.join("src", "pymod", "edt")
edt_sources = set(glob.glob(os.path.join(edt_path, "*.cc")))
edt = Extension(config.root + '.edtcore',
define_macros=config.macros(),
include_dirs=[_edt_path, _tl_path, _gsi_path, _pya_path],
extra_objects=[config.path_of('_edt', _edt_path), config.path_of('_tl', _tl_path), config.path_of('_gsi', _gsi_path), config.path_of('_pya', _pya_path)],
extra_link_args=config.link_args('edtcore'),
extra_compile_args=config.compile_args('edtcore'),
sources=list(edt_sources))
# ------------------------------------------------------------------
# img extension library
img_path = os.path.join("src", "pymod", "img")
img_sources = set(glob.glob(os.path.join(img_path, "*.cc")))
img = Extension(config.root + '.imgcore',
define_macros=config.macros(),
include_dirs=[_img_path, _tl_path, _gsi_path, _pya_path],
extra_objects=[config.path_of('_img', _img_path), config.path_of('_tl', _tl_path), config.path_of('_gsi', _gsi_path), config.path_of('_pya', _pya_path)],
extra_link_args=config.link_args('imgcore'),
extra_compile_args=config.compile_args('imgcore'),
sources=list(img_sources))
# ------------------------------------------------------------------
# lym extension library
lym_path = os.path.join("src", "pymod", "lym")
lym_sources = set(glob.glob(os.path.join(lym_path, "*.cc")))
lym = Extension(config.root + '.lymcore',
define_macros=config.macros(),
include_dirs=[_lym_path, _tl_path, _gsi_path, _pya_path],
extra_objects=[config.path_of('_lym', _lym_path), config.path_of('_tl', _tl_path), config.path_of('_gsi', _gsi_path), config.path_of('_pya', _pya_path)],
extra_link_args=config.link_args('lymcore'),
extra_compile_args=config.compile_args('lymcore'),
sources=list(lym_sources))
# ------------------------------------------------------------------
# Core setup function
@ -602,4 +786,4 @@ if __name__ == '__main__':
url='https://github.com/klayout/klayout',
packages=find_packages('src/pymod/distutils_src'),
package_dir={'': 'src/pymod/distutils_src'}, # https://github.com/pypa/setuptools/issues/230
ext_modules=[_tl, _gsi, _pya, _db, _lib, _rdb] + db_plugins + [tl, db, lib, rdb])
ext_modules=[_tl, _gsi, _pya, _rba, _db, _lib, _rdb, _lym, _lay, _ant, _edt, _img] + db_plugins + [tl, db, lib, rdb, lay, ant, edt, img, lym])

6
src/ant/ant/ant.pro
View File

@ -15,6 +15,10 @@ FORMS = \
RulerConfigPage4.ui \
RulerPropertiesPage.ui \
}
# Disabled without Qt:
HEADERS = \
antConfigPage.h \
antPropertiesPage.h \
@ -23,7 +27,7 @@ SOURCES = \
antConfigPage.cc \
antPropertiesPage.cc \
}
# Enabled without Qt:
HEADERS += \
antConfig.h \

3
src/ant/ant/antConfigPage.cc
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#include "antConfigPage.h"
#include "ui_RulerConfigPage.h"
@ -417,3 +418,5 @@ ConfigPage4::commit ()
}
} // namespace ant
#endif

4
src/ant/ant/antConfigPage.h
View File

@ -20,7 +20,7 @@
*/
#if defined(HAVE_QT)
#ifndef HDR_antConfigPage
#define HDR_antConfigPage
@ -134,3 +134,5 @@ private:
#endif
#endif

1
src/ant/ant/antForceLink.cc
View File

@ -20,7 +20,6 @@
*/
#include "antForceLink.h"
namespace ant

2
src/ant/ant/antForceLink.h
View File

@ -33,7 +33,7 @@
namespace ant
{
ANT_PUBLIC int _force_link_f ();
int _force_link_target = _force_link_f ();
static int _force_link_target = _force_link_f ();
}
#endif

2
src/ant/ant/antPropertiesPage.cc
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#include "antPropertiesPage.h"
#include "layLayoutView.h"
@ -365,3 +366,4 @@ PropertiesPage::apply ()
}
#endif

3
src/ant/ant/antPropertiesPage.h
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#ifndef HDR_antPropertiesPage
#define HDR_antPropertiesPage
@ -70,3 +71,5 @@ private:
}
#endif
#endif

26
src/edt/edt/edt.pro
View File

@ -8,15 +8,6 @@ DEFINES += MAKE_EDT_LIBRARY
!equals(HAVE_QT, "0") {
HEADERS = \
edtDialogs.h \
edtEditorOptionsPages.h \
edtInstPropertiesPage.h \
edtPCellParametersPage.h \
edtPropertiesPages.h \
edtPropertiesPageUtils.h \
edtRecentConfigurationPage.h
FORMS = \
AlignOptionsDialog.ui \
BoxPropertiesPage.ui \
@ -38,7 +29,20 @@ DEFINES += MAKE_EDT_LIBRARY
DistributeOptionsDialog.ui \
EditorOptionsInstPCellParam.ui
SOURCES = \
}
# Disabled without Qt:
HEADERS = \
edtDialogs.h \
edtEditorOptionsPages.h \
edtInstPropertiesPage.h \
edtPCellParametersPage.h \
edtPropertiesPages.h \
edtPropertiesPageUtils.h \
edtRecentConfigurationPage.h
SOURCES = \
edtDialogs.cc \
edtEditorOptionsPages.cc \
edtInstPropertiesPage.cc \
@ -47,7 +51,7 @@ DEFINES += MAKE_EDT_LIBRARY
edtPropertiesPageUtils.cc \
edtRecentConfigurationPage.cc
}
# Enabled without Qt:
HEADERS += \
edtConfig.h \

4
src/edt/edt/edtDialogs.cc
View File

@ -20,6 +20,8 @@
*/
#if defined(HAVE_QT)
#include "dbBox.h"
#include "dbLayout.h"
@ -683,3 +685,5 @@ END_PROTECTED;
}
#endif

3
src/edt/edt/edtDialogs.h
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#ifndef HDR_edtDialogs
@ -208,3 +209,5 @@ private:
#endif
#endif

2
src/edt/edt/edtEditorOptionsPages.cc
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#include "tlInternational.h"
#include "dbLibrary.h"
@ -890,3 +891,4 @@ EditorOptionsInstPCellParam::update_pcell_parameters (const std::vector <tl::Var
}
#endif

2
src/edt/edt/edtEditorOptionsPages.h
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#ifndef HDR_edtEditorOptionsPages
#define HDR_edtEditorOptionsPages
@ -195,3 +196,4 @@ private:
#endif
#endif

32
src/edt/edt/edtForceLink.cc Normal file
View File

@ -0,0 +1,32 @@
/*
KLayout Layout Viewer
Copyright (C) 2006-2022 Matthias Koefferlein
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warredty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "edtForceLink.h"
namespace edt
{
int _force_link_f ()
{
return 0;
}
}

40
src/edt/edt/edtForceLink.h Normal file
View File

@ -0,0 +1,40 @@
/*
KLayout Layout Viewer
Copyright (C) 2006-2022 Matthias Koefferlein
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warredty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef HDR_edtForceLink
#define HDR_edtForceLink
#include "edtCommon.h"
/**
* @file Include this function to force linking of the edt module
*/
namespace edt
{
EDT_PUBLIC int _force_link_f ();
static int _force_link_target = _force_link_f ();
}
#endif

2
src/edt/edt/edtInstPropertiesPage.cc
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#include "dbLibrary.h"
#include "dbPCellHeader.h"
@ -940,3 +941,4 @@ InstPropertiesPage::update_pcell_parameters ()
}
#endif

2
src/edt/edt/edtInstPropertiesPage.h
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#ifndef HDR_edtInstPropertiesPage
@ -88,3 +89,4 @@ protected slots:
#endif
#endif

3
src/edt/edt/edtPCellParametersPage.cc
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#include "edtPCellParametersPage.h"
#include "edtPropertiesPageUtils.h"
@ -732,4 +733,4 @@ PCellParametersPage::set_parameters_internal (const std::vector<tl::Variant> &pa
}
#endif

3
src/edt/edt/edtPCellParametersPage.h
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#ifndef HDR_edtPCellParametersPage
#define HDR_edtPCellParametersPage
@ -157,3 +158,5 @@ private:
}
#endif
#endif

2
src/edt/edt/edtPropertiesPageUtils.cc
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#include "edtPropertiesPageUtils.h"
@ -870,3 +871,4 @@ coords_to_string (const db::DPoint &dp, double dbu, bool du, const char *sep)
}
#endif

2
src/edt/edt/edtPropertiesPageUtils.h
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#ifndef HDR_edtPropertiesPageUtils
#define HDR_edtPropertiesPageUtils
@ -522,3 +523,4 @@ db::Coord coord_from_string (const char *txt, double dbu, bool du, const db::VCp
#endif
#endif

2
src/edt/edt/edtPropertiesPages.cc
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#include "edtPropertiesPages.h"
#include "edtPropertiesPageUtils.h"
@ -1183,3 +1184,4 @@ EditablePathPropertiesPage::type_selected (int t)
}
#endif

3
src/edt/edt/edtPropertiesPages.h
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#ifndef HDR_edtPropertiesPages
@ -207,3 +208,5 @@ private:
}
#endif
#endif

4
src/edt/edt/edtRecentConfigurationPage.cc
View File

@ -20,6 +20,8 @@
*/
#if defined(HAVE_QT)
#include "edtRecentConfigurationPage.h"
#include "edtUtils.h"
#include "layDispatcher.h"
@ -428,3 +430,5 @@ RecentConfigurationPage::commit_recent (lay::Dispatcher *root)
}
}
#endif

2
src/edt/edt/edtRecentConfigurationPage.h
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#ifndef HDR_edtRecentConfigurationPage
#define HDR_edtRecentConfigurationPage
@ -112,3 +113,4 @@ private:
#endif
#endif

6
src/img/img/img.pro
View File

@ -13,6 +13,10 @@ FORMS = \
ImageLandmarksDialog.ui \
ImagePropertiesPage.ui \
}
# Disabled without Qt:
HEADERS = \
imgLandmarksDialog.h \
imgNavigator.h \
@ -25,7 +29,7 @@ SOURCES = \
imgPropertiesPage.cc \
imgWidgets.cc \
}
# Enabled without Qt:
HEADERS += \
imgObject.h \

3
src/img/img/imgForceLink.cc
View File

@ -10,7 +10,7 @@
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
but WITHOUT ANY WARRANTY; without even the implied warrimgy of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
@ -20,7 +20,6 @@
*/
#include "imgForceLink.h"
namespace img

4
src/img/img/imgForceLink.h
View File

@ -10,7 +10,7 @@
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
but WITHOUT ANY WARRANTY; without even the implied warrimgy of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
@ -33,7 +33,7 @@
namespace img
{
IMG_PUBLIC int _force_link_f ();
int _force_link_target = _force_link_f ();
static int _force_link_target = _force_link_f ();
}
#endif

2
src/img/img/imgLandmarksDialog.cc
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#include "imgLandmarksDialog.h"
#include "imgService.h"
@ -499,3 +500,4 @@ LandmarksDialog::landmarks_updated ()
}
#endif

3
src/img/img/imgLandmarksDialog.h
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#ifndef HDR_imgLandmarksDialog
#define HDR_imgLandmarksDialog
@ -65,3 +66,5 @@ private:
}
#endif
#endif

2
src/img/img/imgNavigator.cc
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#include "laybasicConfig.h"
#include "layMarker.h"
@ -113,3 +114,4 @@ Navigator::background_color (QColor c)
}
#endif

2
src/img/img/imgNavigator.h
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#ifndef HDR_imgNavigator
#define HDR_imgNavigator
@ -70,3 +71,4 @@ private:
#endif
#endif

2
src/img/img/imgPropertiesPage.cc
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#include "imgPropertiesPage.h"
#include "imgLandmarksDialog.h"
@ -1003,3 +1004,4 @@ PropertiesPage::define_landmarks_pressed ()
}
#endif

3
src/img/img/imgPropertiesPage.h
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#ifndef HDR_imgPropertiesPage
#define HDR_imgPropertiesPage
@ -105,3 +106,5 @@ private:
}
#endif
#endif

3
src/img/img/imgWidgets.cc
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#include "imgWidgets.h"
@ -452,3 +453,5 @@ ColorBar::paintEvent (QPaintEvent *)
}
#endif

3
src/img/img/imgWidgets.h
View File

@ -20,6 +20,8 @@
*/
#if defined(HAVE_QT)
#ifndef HDR_imgWidgets
#define HDR_imgWidgets
@ -138,3 +140,4 @@ private:
#endif
#endif

4
src/laybasic/laybasic/gsiDeclLayDialogs.cc
View File

@ -20,6 +20,8 @@
*/
#if defined(HAVE_QT)
#include "gsiDecl.h"
#include "gsiDeclBasic.h"
#include "layBrowserDialog.h"
@ -1186,3 +1188,5 @@ Class<MessageBox> decl_MessageBox (QT_EXTERNAL_BASE (QMainWindow) "lay", "Messag
);
}
#endif

3
src/laybasic/laybasic/gsiDeclLayMenu.cc
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#include "gsiDecl.h"
#include "gsiSignals.h"
@ -410,3 +411,5 @@ Class<ActionStub> decl_Action (decl_ActionBase, "lay", "Action",
);
}
#endif

5
src/laybasic/laybasic/gsiDeclLayNetlistBrowserDialog.cc
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#include "gsiDecl.h"
#include "gsiDeclBasic.h"
@ -219,7 +220,7 @@ gsi::ClassExt<lay::LayoutView> decl_ext_layout_view (
)
);
}
#endif

3
src/laybasic/laybasic/gsiDeclLayStream.cc
View File

@ -20,6 +20,8 @@
*/
#if defined(HAVE_QT)
#include "gsiDecl.h"
#include "dbReader.h"
#include "layTechnology.h"
@ -46,4 +48,5 @@ gsi::ClassExt<db::LoadLayoutOptions> layout_reader_decl (
}
#endif

2
src/laybasic/laybasic/gtf.cc
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#include "gtf.h"
#include "tlException.h"
@ -1928,4 +1929,5 @@ GtfXmlHandler::warning (const QXmlParseException &ex)
}
#endif

4
src/laybasic/laybasic/gtf.h
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#ifndef HDR_gtf
#define HDR_gtf
@ -569,5 +570,4 @@ LAYBASIC_PUBLIC tl::Variant image_to_variant (const QImage &image);
#endif
#endif // defined(HAVE_QT)

2
src/laybasic/laybasic/gtfdummy.cc
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#include "gtf.h"
@ -35,4 +36,5 @@ void Recorder::errlog_puts (const char *s) { }
}
#endif

3
src/laybasic/laybasic/layAbstractMenu.cc
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#include "layAbstractMenu.h"
#include "layDispatcher.h"
@ -1702,3 +1703,5 @@ AbstractMenu::get_shortcuts (const std::string &root, std::map<std::string, std:
}
}
#endif

3
src/laybasic/laybasic/layAbstractMenu.h
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#ifndef HDR_layAbstractMenu
#define HDR_layAbstractMenu
@ -824,4 +825,4 @@ private:
#endif
#endif // defined(HAVE_QT)

5
src/laybasic/laybasic/layBackgroundAwareTreeStyle.cc
View File

@ -20,6 +20,8 @@
*/
#if defined(HAVE_QT)
#include "layBackgroundAwareTreeStyle.h"
#include <QPainter>
@ -108,3 +110,6 @@ BackgroundAwareTreeStyle::drawPrimitive (QStyle::PrimitiveElement pe, const QSty
}
}
#endif

2
src/laybasic/laybasic/layBackgroundAwareTreeStyle.h
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#ifndef HDR_layBackgroundAwareTreeStyle
#define HDR_layBackgroundAwareTreeStyle
@ -50,3 +51,4 @@ public:
#endif
#endif // defined(HAVE_QT)

3
src/laybasic/laybasic/layBitmap.h
View File

@ -20,8 +20,6 @@
*/
#ifndef HDR_layBitmap
#define HDR_layBitmap
@ -396,4 +394,3 @@ Bitmap::scanline (unsigned n) const
} // namespace lay
#endif

3
src/laybasic/laybasic/layBookmarkList.cc
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#include "layBookmarkList.h"
#include "tlXMLParser.h"
@ -118,3 +119,5 @@ BookmarkList::propose_new_bookmark_name () const
}
#endif

2
src/laybasic/laybasic/layBookmarkList.h
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#ifndef HDR_layBookmarkList
#define HDR_layBookmarkList
@ -208,3 +209,4 @@ private:
#endif
#endif // defined(HAVE_QT)

3
src/laybasic/laybasic/layBookmarkManagementForm.cc
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#include "layBookmarkManagementForm.h"
#include "dbCellInst.h"
@ -109,5 +110,5 @@ BookmarkManagementForm::accept ()
}
#endif

2
src/laybasic/laybasic/layBookmarkManagementForm.h
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#ifndef HDR_layBookmarkManagementForm
#define HDR_layBookmarkManagementForm
@ -63,3 +64,4 @@ private:
#endif
#endif // defined(HAVE_QT)

3
src/laybasic/laybasic/layBookmarksView.cc
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#include "layBookmarksView.h"
#include "layLayoutView.h"
@ -211,3 +212,5 @@ static tl::RegisteredClass<lay::PluginDeclaration> config_decl (new BookmarksVie
}
#endif

2
src/laybasic/laybasic/layBookmarksView.h
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#ifndef HDR_layBookmarksView
#define HDR_layBookmarksView
@ -75,3 +76,4 @@ private:
#endif
#endif // defined(HAVE_QT)

3
src/laybasic/laybasic/layBrowseInstancesForm.cc
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#include <vector>
#include <string>
@ -912,3 +913,5 @@ BrowseInstancesForm::prev_inst ()
}
#endif

2
src/laybasic/laybasic/layBrowseInstancesForm.h
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#ifndef HDR_layBrowseInstancesForm
#define HDR_layBrowseInstancesForm
@ -132,3 +133,4 @@ private:
#endif
#endif // defined(HAVE_QT)

3
src/laybasic/laybasic/layBrowseShapesForm.cc
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#include <vector>
#include <string>
@ -1179,3 +1180,5 @@ BrowseShapesForm::prev_inst ()
}
#endif

2
src/laybasic/laybasic/layBrowseShapesForm.h
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#ifndef HDR_layBrowseShapesForm
#define HDR_layBrowseShapesForm
@ -134,3 +135,4 @@ private:
#endif
#endif // defined(HAVE_QT)

3
src/laybasic/laybasic/layBrowser.cc
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#include <QDialog>
@ -95,3 +96,5 @@ Browser::accept ()
}
#endif

2
src/laybasic/laybasic/layBrowser.h
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#ifndef HDR_layBrowser
#define HDR_layBrowser
@ -143,3 +144,4 @@ private:
#endif
#endif // defined(HAVE_QT)

3
src/laybasic/laybasic/layBrowserDialog.cc
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#include "layBrowserPanel.h"
#include "layBrowserDialog.h"
@ -128,3 +129,5 @@ BrowserDialog::accept ()
}
#endif

2
src/laybasic/laybasic/layBrowserDialog.h
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#ifndef HDR_layBrowserDialog
#define HDR_layBrowserDialog
@ -132,3 +133,4 @@ private:
#endif
#endif // defined(HAVE_QT)

2
src/laybasic/laybasic/layBrowserPanel.cc
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#include "layBrowserPanel.h"
#include "layDispatcher.h"
@ -831,4 +832,5 @@ BrowserSource::attach (lay::BrowserPanel *d)
}
#endif

2
src/laybasic/laybasic/layBrowserPanel.h
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#ifndef HDR_layBrowserPanel
#define HDR_layBrowserPanel
@ -487,3 +488,4 @@ private:
#endif
#endif // defined(HAVE_QT)

4
src/laybasic/laybasic/layBusy.cc
View File

@ -20,6 +20,8 @@
*/
#if defined(HAVE_QT)
#include "layBusy.h"
#include "tlThreads.h"
@ -80,3 +82,5 @@ BusySection::is_busy ()
// ----------------------------------------------------------------------------------------------------------
}
#endif

3
src/laybasic/laybasic/layBusy.h
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#ifndef HDR_layBusy
#define HDR_layBusy
@ -63,3 +64,5 @@ private:
}
#endif
#endif // defined(HAVE_QT)

3
src/laybasic/laybasic/layCellSelectionForm.cc
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#include <algorithm>
#include <string>
@ -876,4 +877,4 @@ LibraryCellSelectionForm::name_changed (const QString &s)
}
#endif

2
src/laybasic/laybasic/layCellSelectionForm.h
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#ifndef HDR_layCellSelectionForm
#define HDR_layCellSelectionForm
@ -201,3 +202,4 @@ private:
#endif
#endif // defined(HAVE_QT)

4
src/laybasic/laybasic/layCellTreeModel.cc
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#include "layCellTreeModel.h"
#include "layLayoutView.h"
@ -1296,3 +1297,6 @@ CellTreeModel::locate (const char *name, bool glob_pattern, bool case_sensitive,
}
} // namespace lay
#endif

2
src/laybasic/laybasic/layCellTreeModel.h
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#ifndef HDR_layCellTreeModel
#define HDR_layCellTreeModel
@ -349,3 +350,4 @@ private:
#endif
#endif // defined(HAVE_QT)

1
src/laybasic/laybasic/layColor.h
View File

@ -20,7 +20,6 @@
*/
#ifndef HDR_layColor
#define HDR_layColor

2
src/laybasic/laybasic/layConfigurationDialog.cc
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#include <QDialog>
#include <QVBoxLayout>
@ -144,3 +145,4 @@ ConfigurationDialog::ok_clicked ()
}
#endif

2
src/laybasic/laybasic/layConfigurationDialog.h
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#ifndef HDR_layConfigurationDialog
#define HDR_layConfigurationDialog
@ -69,3 +70,4 @@ private:
#endif
#endif // defined(HAVE_QT)

2
src/laybasic/laybasic/layCursor.cc
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#include "layCursor.h"
@ -77,3 +78,4 @@ Cursor::qcursor (cursor_shape cursor)
}
#endif

7
src/laybasic/laybasic/layCursor.h
View File

@ -20,13 +20,14 @@
*/
#ifndef HDR_layCursor
#define HDR_layCursor
#include "laybasicCommon.h"
#if defined(HAVE_QT)
class QCursor;
#endif
namespace lay
{
@ -64,13 +65,15 @@ struct LAYBASIC_PUBLIC Cursor
closed_hand = 18
};
#if defined(HAVE_QT)
/**
* @brief Get the QCursor from the lay::cursor_shape enum
*/
static QCursor qcursor (cursor_shape cursor);
#endif
};
}
#endif

2
src/laybasic/laybasic/layDialogs.cc
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#include "layDialogs.h"
@ -1411,3 +1412,4 @@ END_PROTECTED
}
#endif

3
src/laybasic/laybasic/layDialogs.h
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#ifndef HDR_layDialogs
#define HDR_layDialogs
@ -468,4 +469,4 @@ public:
#endif
#endif // defined(HAVE_QT)

4
src/laybasic/laybasic/layDragDropData.cc
View File

@ -20,6 +20,8 @@
*/
#if defined(HAVE_QT)
#include "layDragDropData.h"
#include <QDataStream>
@ -106,3 +108,5 @@ CellDragDropData::deserialize (const QByteArray &ba)
}
}
#endif

3
src/laybasic/laybasic/layDragDropData.h
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#ifndef HDR_layDragDropData
#define HDR_layDragDropData
@ -169,3 +170,5 @@ private:
}
#endif
#endif // defined(HAVE_QT)

2
src/laybasic/laybasic/layEditLineStyleWidget.cc
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#include "layEditLineStyleWidget.h"
@ -422,3 +423,4 @@ EditLineStyleWidget::redo (db::Op *op)
}
#endif

3
src/laybasic/laybasic/layEditLineStyleWidget.h
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#ifndef HDR_layEditLineStyleWidget
#define HDR_layEditLineStyleWidget
@ -100,3 +101,5 @@ private:
}
#endif
#endif // defined(HAVE_QT)

3
src/laybasic/laybasic/layEditLineStylesForm.cc
View File

@ -20,7 +20,7 @@
*/
#if defined(HAVE_QT)
#include "layEditLineStylesForm.h"
#include "ui_EditLineStylesForm.h"
@ -556,3 +556,4 @@ EditLineStylesForm::redo (db::Op *op)
}
#endif

2
src/laybasic/laybasic/layEditLineStylesForm.h
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#ifndef HDR_layEditLineStylesForm
#define HDR_layEditLineStylesForm
@ -107,3 +108,4 @@ private:
#endif
#endif // defined(HAVE_QT)

2
src/laybasic/laybasic/layEditStippleWidget.cc
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#include "layEditStippleWidget.h"
@ -529,3 +530,4 @@ EditStippleWidget::redo (db::Op *op)
}
#endif

2
src/laybasic/laybasic/layEditStippleWidget.h
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#ifndef HDR_layEditStippleWidget
#define HDR_layEditStippleWidget
@ -109,3 +110,4 @@ private:
#endif
#endif // defined(HAVE_QT)

3
src/laybasic/laybasic/layEditStipplesForm.cc
View File

@ -20,7 +20,7 @@
*/
#if defined(HAVE_QT)
#include "layEditStipplesForm.h"
#include "ui_EditStipplesForm.h"
@ -623,3 +623,4 @@ EditStipplesForm::redo (db::Op *op)
}
#endif

2
src/laybasic/laybasic/layEditStipplesForm.h
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#ifndef HDR_layEditStipplesForm
#define HDR_layEditStipplesForm
@ -111,3 +112,4 @@ private:
#endif
#endif // defined(HAVE_QT)

4
src/laybasic/laybasic/layEditorOptionsFrame.cc
View File

@ -20,6 +20,8 @@
*/
#if defined(HAVE_QT)
#include "layEditorOptionsFrame.h"
#include "layEditorOptionsPage.h"
#include "layEditorOptionsPages.h"
@ -68,3 +70,5 @@ EditorOptionsFrame::populate (LayoutView *view)
}
}
#endif

4
src/laybasic/laybasic/layEditorOptionsFrame.h
View File

@ -20,6 +20,8 @@
*/
#if defined(HAVE_QT)
#ifndef HDR_layEditorOptionsFrame
#define HDR_layEditorOptionsFrame
@ -53,3 +55,5 @@ public:
}
#endif
#endif // defined(HAVE_QT)

3
src/laybasic/laybasic/layEditorOptionsPage.cc
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#include "tlInternational.h"
#include "layEditorOptionsPage.h"
@ -88,3 +89,5 @@ EditorOptionsPage::activate (bool active)
}
}
#endif

4
src/laybasic/laybasic/layEditorOptionsPage.h
View File

@ -20,6 +20,8 @@
*/
#if defined(HAVE_QT)
#ifndef HDR_layEditorOptionsPage
#define HDR_layEditorOptionsPage
@ -99,3 +101,5 @@ private:
}
#endif
#endif // defined(HAVE_QT)

2
src/laybasic/laybasic/layEditorOptionsPages.cc
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#include "tlInternational.h"
#include "layEditorOptionsPages.h"
@ -214,3 +215,4 @@ static void configure_from_line_edit (lay::Dispatcher *dispatcher, QLineEdit *le
}
#endif

2
src/laybasic/laybasic/layEditorOptionsPages.h
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#ifndef HDR_layEditorOptionsPages
#define HDR_layEditorOptionsPages
@ -83,3 +84,4 @@ private:
#endif
#endif // defined(HAVE_QT)

2
src/laybasic/laybasic/layFileDialog.cc
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#include <QFileDialog>
#include <QApplication>
@ -303,3 +304,4 @@ FileDialog::get_save (std::string &fp, const std::string &title)
} // namespace lay
#endif

2
src/laybasic/laybasic/layFileDialog.h
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#ifndef HDR_layFileDialog
#define HDR_layFileDialog
@ -98,3 +99,4 @@ private:
#endif
#endif // defined(HAVE_QT)

3
src/laybasic/laybasic/layGenericSyntaxHighlighter.cc
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#include "layGenericSyntaxHighlighter.h"
@ -1726,4 +1727,4 @@ GenericSyntaxHighlighter::highlightBlock(const QString &text)
}
#endif

2
src/laybasic/laybasic/layGenericSyntaxHighlighter.h
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#ifndef HDR_layGenericSyntaxHighlighter
#define HDR_layGenericSyntaxHighlighter
@ -735,3 +736,4 @@ private:
#endif
#endif // defined(HAVE_QT)

2
src/laybasic/laybasic/layGridNetConfigPage.cc
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#include "laybasicConfig.h"
#include "layGridNetConfigPage.h"
@ -111,3 +112,4 @@ GridNetConfigPage::commit (lay::Dispatcher *root)
} // namespace lay
#endif

2
src/laybasic/laybasic/layGridNetConfigPage.h
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#ifndef HDR_layGridNetConfigPage
#define HDR_layGridNetConfigPage
@ -58,3 +59,4 @@ private:
#endif
#endif // defined(HAVE_QT)

3
src/laybasic/laybasic/layHierarchyControlPanel.cc
View File

@ -20,6 +20,7 @@
*/
#if defined(HAVE_QT)
#include <string>
@ -1243,3 +1244,5 @@ public:
static tl::RegisteredClass<lay::PluginDeclaration> config_decl (new HierarchyControlPanelPluginDeclaration (), -8, "HierarchyControlPanelPlugin");
} // namespace lay
#endif

Some files were not shown because too many files have changed in this diff Show More