Fix FTBFS with a bit of a hack around gpsim

(cherry picked from commit 6c8db442b5)
v3.5.13-sru
Timothy Pearson 13 years ago committed by Slávek Banko
parent 522839f942
commit 42992ffe42

@ -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) -I$(top_srcdir)/src/languages -I$(top_srcdir)/src/mechanics -I$(top_srcdir)/src/micro $(all_includes)
# the library search path. # 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. # the libraries to link against.
ktechlab_LDADD = $(top_builddir)/src/gui/libgui.la \ 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/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/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/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 # which sources should be compiled for ktechlab
ktechlab_SOURCES = ktechlab.cpp node.cpp connector.cpp itemlibrary.cpp \ ktechlab_SOURCES = ktechlab.cpp node.cpp connector.cpp itemlibrary.cpp \

@ -56,3 +56,9 @@ int main(int argc, char **argv)
args->clear(); // Free up some memory args->clear(); // Free up some memory
return app.exec(); return app.exec();
} }
void exit_gpsim(int ret)
{
printf("gpsim attempted to call exit_gpsim(%d), ***IGNORING***\n", ret);
// exit(ret);
}

Loading…
Cancel
Save