aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/symbols-extract.tes
diff options
context:
space:
mode:
authorRobin Haberkorn <robin.haberkorn@googlemail.com>2013-03-18 20:47:29 +0100
committerRobin Haberkorn <robin.haberkorn@googlemail.com>2013-03-18 20:47:29 +0100
commitefdea080a27d51b522f2414873e5c112201b71e6 (patch)
tree1f1d9a12230dd356fd7e2bde17200e8abdf1d3b3 /src/symbols-extract.tes
parent79112159f8f87efb5aa6fc98def89f4cd50545e8 (diff)
downloadsciteco-efdea080a27d51b522f2414873e5c112201b71e6.tar.gz
declare all global inter-dependant objects in main.cpp and get rid of init_priority attribute
* we cannot use weak symbols in MinGW, so we avoid init_priority for symbol initialization by compiling the empty definitions into sciteco-minimal but the real ones into sciteco (had to add new file symbols-minimal.cpp) * this fixes compilation/linking on LLVM Clang AND Dragonegg since their init_priority attribute is broken! this will likely be fixed in the near future but broken versions will be around for some time
Diffstat (limited to 'src/symbols-extract.tes')
-rwxr-xr-xsrc/symbols-extract.tes20
1 files changed, 3 insertions, 17 deletions
diff --git a/src/symbols-extract.tes b/src/symbols-extract.tes
index 8a47ede..2fe270c 100755
--- a/src/symbols-extract.tes
+++ b/src/symbols-extract.tes
@@ -27,29 +27,15 @@ I/*
#include "sciteco.h"
#include "symbols.h"
-static class SymbolListInitializer_Q#na {
- static const SymbolList::Entry entries[];
-
-public:
- SymbolListInitializer_Q#na();
-} initializer INIT_PRIO(PRIO_SYMBOLS);
-
-const SymbolList::Entry SymbolListInitializer_Q#na::entries[] = {
+static const SymbolList::Entry entries[] = {

<
.,W.Xa 0KK
- I#ifdef Qa
- {"Qa", Qa},
-#endif
-
+ I#ifdef Qa^J^I{"Qa", Qa},^J#endif^J
.-Z;>
I};
-SymbolListInitializer_Q#na::SymbolListInitializer_Q#na()
-{
- Symbols::Q#na.entries = entries;
- Symbols::Q#na.size = G_N_ELEMENTS(entries);
-}
+SymbolList Symbols::Q#na(entries, G_N_ELEMENTS(entries));

! write output file !