diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-01 20:12:17 -0600 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-08-01 04:34:44 +0200 |
| commit | 42992ffe42347618c9f590e7caad0b2118f61cfa (patch) | |
| tree | e66a3614075ce2bcc0a5d7035918a9ac0fe435c0 /src | |
| parent | 522839f942a2d2ffc54b4c9c7e3cb9683f00d0e3 (diff) | |
| download | ktechlab-42992ffe42347618c9f590e7caad0b2118f61cfa.tar.gz ktechlab-42992ffe42347618c9f590e7caad0b2118f61cfa.zip | |
Fix FTBFS with a bit of a hack around gpsim
(cherry picked from commit 6c8db442b5f2560f8851bf774965d9ba0939da8f)
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/core/main.cpp | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index d3d7851..0515170 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,7 +11,7 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/drawparts \ -I$(top_srcdir)/src/languages -I$(top_srcdir)/src/mechanics -I$(top_srcdir)/src/micro $(all_includes) # the library search path. -ktechlab_LDFLAGS = -module $(all_libraries) $(KDE_RPATH) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lDCOP $(LIB_KPARTS) +ktechlab_LDFLAGS = -module $(all_libraries) $(KDE_RPATH) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lDCOP $(LIB_KPARTS) $(LIB_GPSIM) # the libraries to link against. ktechlab_LDADD = $(top_builddir)/src/gui/libgui.la \ @@ -19,7 +19,7 @@ ktechlab_LDADD = $(top_builddir)/src/gui/libgui.la \ $(top_builddir)/src/mechanics/libmechanics.la $(top_builddir)/src/electronics/libelectronics.la \ $(top_builddir)/src/electronics/simulation/libelements.la $(top_builddir)/src/electronics/components/libcomponents.la \ $(top_builddir)/src/languages/liblanguages.la $(top_builddir)/src/drawparts/libdrawparts.la \ - $(top_builddir)/src/core/libcore.la -lkutils $(LIB_GPSIM) -lktexteditor $(LIB_KFILE) $(LIB_KDEPRINT) + $(top_builddir)/src/core/libcore.la -lkutils -lktexteditor $(LIB_KFILE) $(LIB_KDEPRINT) $(LIB_GPSIM) -lgpsimgui # which sources should be compiled for ktechlab ktechlab_SOURCES = ktechlab.cpp node.cpp connector.cpp itemlibrary.cpp \ diff --git a/src/core/main.cpp b/src/core/main.cpp index 0c43a35..e8431ce 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -56,3 +56,9 @@ int main(int argc, char **argv) args->clear(); // Free up some memory return app.exec(); } + +void exit_gpsim(int ret) +{ + printf("gpsim attempted to call exit_gpsim(%d), ***IGNORING***\n", ret); +// exit(ret); +} |