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

WIP: further refactoring

This commit is contained in:
Matthias Koefferlein 2018-05-30 22:46:10 +02:00
parent f1f9132d48
commit 80d00378d3
17 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/mkqtdecl_common/produce.rb
View File

@ -3058,7 +3058,7 @@ END
src.puts("")
src.puts("#include \"tlDefs.h\"")
src.puts("")
src.puts("#define FORCE_LINK_GSI_#{modn.upcase} static void force_link_gsi#{modn}_f () { extern int force_link_gsi#{modn}; force_link_gsi#{modn} = 0; }")
src.puts("#define FORCE_LINK_GSI_#{modn.upcase} void force_link_gsi#{modn}_f () { extern int force_link_gsi#{modn}; force_link_gsi#{modn} = 0; }")
src.puts("")
src.puts("#if !defined(HDR_gsi#{modn}Common_h)")
src.puts("# define HDR_gsi#{modn}Common_h")
@ -3096,7 +3096,9 @@ END
src.puts(" */")
src.puts("")
src.puts("int force_link_gsi#{modn} = 0;")
src.puts("#include \"gsi#{modn}Common.h\"")
src.puts("")
src.puts("GSI_#{modn.upcase}_PUBLIC int force_link_gsi#{modn} = 0;")
src.puts("")
puts("#{src_name} written.")

2
src/gsiqt/qt4/QtCore/gsiQtCoreCommon.h
View File

@ -7,7 +7,7 @@
#include "tlDefs.h"
#define FORCE_LINK_GSI_QTCORE static void force_link_gsiQtCore_f () { extern int force_link_gsiQtCore; force_link_gsiQtCore = 0; }
#define FORCE_LINK_GSI_QTCORE void force_link_gsiQtCore_f () { extern int force_link_gsiQtCore; force_link_gsiQtCore = 0; }
#if !defined(HDR_gsiQtCoreCommon_h)
# define HDR_gsiQtCoreCommon_h

4
src/gsiqt/qt4/QtCore/gsiQtCoreMain.cc
View File

@ -5,5 +5,7 @@
* This file has been created automatically
*/
int force_link_gsiQtCore = 0;
#include "gsiQtCoreCommon.h"
GSI_QTCORE_PUBLIC int force_link_gsiQtCore = 0;

2
src/gsiqt/qt4/QtDesigner/gsiQtDesignerCommon.h
View File

@ -7,7 +7,7 @@
#include "tlDefs.h"
#define FORCE_LINK_GSI_QTDESIGNER static void force_link_gsiQtDesigner_f () { extern int force_link_gsiQtDesigner; force_link_gsiQtDesigner = 0; }
#define FORCE_LINK_GSI_QTDESIGNER void force_link_gsiQtDesigner_f () { extern int force_link_gsiQtDesigner; force_link_gsiQtDesigner = 0; }
#if !defined(HDR_gsiQtDesignerCommon_h)
# define HDR_gsiQtDesignerCommon_h

4
src/gsiqt/qt4/QtDesigner/gsiQtDesignerMain.cc
View File

@ -5,5 +5,7 @@
* This file has been created automatically
*/
int force_link_gsiQtDesigner = 0;
#include "gsiQtDesignerCommon.h"
GSI_QTDESIGNER_PUBLIC int force_link_gsiQtDesigner = 0;

2
src/gsiqt/qt4/QtGui/gsiQtGuiCommon.h
View File

@ -7,7 +7,7 @@
#include "tlDefs.h"
#define FORCE_LINK_GSI_QTGUI static void force_link_gsiQtGui_f () { extern int force_link_gsiQtGui; force_link_gsiQtGui = 0; }
#define FORCE_LINK_GSI_QTGUI void force_link_gsiQtGui_f () { extern int force_link_gsiQtGui; force_link_gsiQtGui = 0; }
#if !defined(HDR_gsiQtGuiCommon_h)
# define HDR_gsiQtGuiCommon_h

4
src/gsiqt/qt4/QtGui/gsiQtGuiMain.cc
View File

@ -5,5 +5,7 @@
* This file has been created automatically
*/
int force_link_gsiQtGui = 0;
#include "gsiQtGuiCommon.h"
GSI_QTGUI_PUBLIC int force_link_gsiQtGui = 0;

2
src/gsiqt/qt4/QtNetwork/gsiQtNetworkCommon.h
View File

@ -7,7 +7,7 @@
#include "tlDefs.h"
#define FORCE_LINK_GSI_QTNETWORK static void force_link_gsiQtNetwork_f () { extern int force_link_gsiQtNetwork; force_link_gsiQtNetwork = 0; }
#define FORCE_LINK_GSI_QTNETWORK void force_link_gsiQtNetwork_f () { extern int force_link_gsiQtNetwork; force_link_gsiQtNetwork = 0; }
#if !defined(HDR_gsiQtNetworkCommon_h)
# define HDR_gsiQtNetworkCommon_h

4
src/gsiqt/qt4/QtNetwork/gsiQtNetworkMain.cc
View File

@ -5,5 +5,7 @@
* This file has been created automatically
*/
int force_link_gsiQtNetwork = 0;
#include "gsiQtNetworkCommon.h"
GSI_QTNETWORK_PUBLIC int force_link_gsiQtNetwork = 0;

2
src/gsiqt/qt4/QtSql/gsiQtSqlCommon.h
View File

@ -7,7 +7,7 @@
#include "tlDefs.h"
#define FORCE_LINK_GSI_QTSQL static void force_link_gsiQtSql_f () { extern int force_link_gsiQtSql; force_link_gsiQtSql = 0; }
#define FORCE_LINK_GSI_QTSQL void force_link_gsiQtSql_f () { extern int force_link_gsiQtSql; force_link_gsiQtSql = 0; }
#if !defined(HDR_gsiQtSqlCommon_h)
# define HDR_gsiQtSqlCommon_h

4
src/gsiqt/qt4/QtSql/gsiQtSqlMain.cc
View File

@ -5,5 +5,7 @@
* This file has been created automatically
*/
int force_link_gsiQtSql = 0;
#include "gsiQtSqlCommon.h"
GSI_QTSQL_PUBLIC int force_link_gsiQtSql = 0;

2
src/gsiqt/qt4/QtXml/gsiQtXmlCommon.h
View File

@ -7,7 +7,7 @@
#include "tlDefs.h"
#define FORCE_LINK_GSI_QTXML static void force_link_gsiQtXml_f () { extern int force_link_gsiQtXml; force_link_gsiQtXml = 0; }
#define FORCE_LINK_GSI_QTXML void force_link_gsiQtXml_f () { extern int force_link_gsiQtXml; force_link_gsiQtXml = 0; }
#if !defined(HDR_gsiQtXmlCommon_h)
# define HDR_gsiQtXmlCommon_h

4
src/gsiqt/qt4/QtXml/gsiQtXmlMain.cc
View File

@ -5,5 +5,7 @@
* This file has been created automatically
*/
int force_link_gsiQtXml = 0;
#include "gsiQtXmlCommon.h"
GSI_QTXML_PUBLIC int force_link_gsiQtXml = 0;

6
src/lay/lay/gsiDeclLayApplication.cc
View File

@ -25,9 +25,15 @@
#include "laySignalHandler.h"
#include "gsiDecl.h"
#include "gsiQtGuiExternals.h"
#include "gsiQtCoreExternals.h"
#include "gsiQtXmlExternals.h"
#include "tlArch.h"
// this is here *once*
FORCE_LINK_GSI_QTCORE
FORCE_LINK_GSI_QTGUI
// required because the GSI bindings use QDomDocument
FORCE_LINK_GSI_QTXML
namespace gsi
{

2
src/lay/lay/gsiDeclLayHelpDialog.cc
View File

@ -28,8 +28,6 @@
#include "gsiDecl.h"
#include "gsiQtGuiExternals.h"
FORCE_LINK_GSI_QTGUI
namespace tl
{

3
src/lay/lay/gsiDeclLayMainWindow.cc
View File

@ -20,14 +20,11 @@
*/
#include "gsiDecl.h"
#include "gsiSignals.h"
#include "gsiQtGuiExternals.h"
#include "layMainWindow.h"
FORCE_LINK_GSI_QTGUI
namespace gsi
{

3
src/lay/lay/lay.pro
View File

@ -213,3 +213,6 @@ equals(HAVE_PYTHON, "1") {
LIBS += -lklayout_pyastub
}
equals(HAVE_QTBINDINGS, "1") {
LIBS += -lklayout_qtbasic -lklayout_QtGui -lklayout_QtCore -lklayout_QtXml
}