diff options
| author | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2013-03-18 20:47:29 +0100 |
|---|---|---|
| committer | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2013-03-18 20:47:29 +0100 |
| commit | efdea080a27d51b522f2414873e5c112201b71e6 (patch) | |
| tree | 1f1d9a12230dd356fd7e2bde17200e8abdf1d3b3 /src/Makefile.am | |
| parent | 79112159f8f87efb5aa6fc98def89f4cd50545e8 (diff) | |
| download | sciteco-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/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index edd09d1..50ef424 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -13,7 +13,7 @@ EXTRA_DIST = gtk-info-popup.gob \ symbols-extract.tes noinst_LIBRARIES = libsciteco-base.a -libsciteco_base_a_SOURCES = sciteco.h \ +libsciteco_base_a_SOURCES = main.cpp sciteco.h \ cmdline.cpp cmdline.h \ undo.cpp undo.h \ expressions.cpp expressions.h \ @@ -47,12 +47,11 @@ if BOOTSTRAP noinst_PROGRAMS = sciteco-minimal symbols-scintilla.cpp symbols-scilexer.cpp : sciteco-minimal$(EXEEXT) endif -sciteco_minimal_SOURCES = main.cpp +sciteco_minimal_SOURCES = symbols-minimal.cpp sciteco_minimal_LDADD = libsciteco-base.a \ @SCINTILLA_PATH@/bin/scintilla.a bin_PROGRAMS = sciteco -sciteco_SOURCES = $(sciteco_minimal_SOURCES) nodist_sciteco_SOURCES = $(nodist_sciteco_minimal_SOURCES) \ symbols-scintilla.cpp symbols-scilexer.cpp sciteco_LDADD = $(sciteco_minimal_LDADD) |