Fix a couple kdeedu build problems on armel

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1259743 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 6d21a23228
commit b7851ae5e3

@ -45,11 +45,14 @@ if test "x$with_ocamlsolver" != xno; then
EQCHEM_SUB=
OCAMLLIB=
OCAMLLIB_FLAGS=
EQCHEM_LDADD=
if test "$eqchem_enabled" = "yes"; then
EQCHEM_SUB=solver
OCAMLLIB=`ocamlc -where`
OCAMLLIB_FLAGS=-L$(OCAMLLIB)
FACILELIB=`ocamlc -where`/facile
FACILELIB_FLAGS=-L$(FACILELIB)
EQCHEM_LDADD="-lasmrun -lnums -lm -ldl solver.o modwrap.o"
AC_DEFINE(HAVE_FACILE, 1)
@ -58,6 +61,8 @@ if test "x$with_ocamlsolver" != xno; then
AC_SUBST(EQCHEM_SUB)
AC_SUBST(OCAMLLIB)
AC_SUBST(FACILELIB)
AC_SUBST(OCAMLLIB_FLAGS)
AC_SUBST(FACILELIB_FLAGS)
AC_SUBST(EQCHEM_LDADD)
if test "$eqchem_enabled" = "yes"; then

@ -35,7 +35,7 @@ kalzium_SOURCES = eqresult.cpp eqchemview.cpp kalzium.cpp \
moleculeparser.cpp \
tempunit.cpp
kalzium_LDADD = ../../libkdeedu/kdeeduplot/libkdeeduplot.la ../../libkdeedu/kdeeduui/libkdeeduui.la $(LIB_KIO) $(LIB_KDEUI) $(LIB_KHTML) -L$(OCAMLLIB) -L$(FACILELIB) $(EQCHEM_LDADD)
kalzium_LDADD = ../../libkdeedu/kdeeduplot/libkdeeduplot.la ../../libkdeedu/kdeeduui/libkdeeduui.la $(LIB_KIO) $(LIB_KDEUI) $(LIB_KHTML) $(OCAMLLIB_FLAGS) $(FACILELIB_FLAGS) $(EQCHEM_LDADD)
KDE_CXXFLAGS = -D_ISOC99_SOURCE
SUBDIRS = icons elementpics data $(EQCHEM_SUB)

@ -25,10 +25,9 @@
#ifndef EXTDATETIMEEDIT_H
#define EXTDATETIMEEDIT_H
#ifndef TQT_H
#include <tqwidget.h>
#include <tqstring.h>
#endif // TQT_H
#include <tqrangecontrol.h>
#include "extdatetime.h"

Loading…
Cancel
Save