A few changes to the previous commit. Basic features should work now everywhere (MUD only 32bit)
This commit is contained in:
parent
ed7a15f025
commit
74fd4d8538
@ -132,6 +132,8 @@ PLUGIN_VERSION=$PLUGIN_MAJOR_VERSION.$PLUGIN_MINOR_VERSION.$PLUGIN_MICRO_VERSION
|
|||||||
PLUGIN_RELEASE=$PLUGIN_MAJOR_VERSION.$PLUGIN_MINOR_VERSION
|
PLUGIN_RELEASE=$PLUGIN_MAJOR_VERSION.$PLUGIN_MINOR_VERSION
|
||||||
AC_SUBST(PLUGIN_RELEASE)
|
AC_SUBST(PLUGIN_RELEASE)
|
||||||
AC_SUBST(PLUGIN_VERSION)
|
AC_SUBST(PLUGIN_VERSION)
|
||||||
|
AC_SUBST(PLUGIN_MAJOR_VERSION)
|
||||||
|
AC_SUBST(PLUGIN_MINOR_VERSION)
|
||||||
|
|
||||||
CUBA_VERSION=$CUBA_MAJOR_VERSION.$CUBA_MINOR_VERSION.$CUBA_MICRO_VERSION
|
CUBA_VERSION=$CUBA_MAJOR_VERSION.$CUBA_MINOR_VERSION.$CUBA_MICRO_VERSION
|
||||||
CUBA_RELEASE=$CUBA_MAJOR_VERSION.$CUBA_MINOR_VERSION
|
CUBA_RELEASE=$CUBA_MAJOR_VERSION.$CUBA_MINOR_VERSION
|
||||||
@ -512,9 +514,11 @@ case "$host" in
|
|||||||
;;
|
;;
|
||||||
*-*-darwin*)
|
*-*-darwin*)
|
||||||
ARCH=DARWIN
|
ARCH=DARWIN
|
||||||
|
LOCAL_PSIBIN_LIB_CXXFLAGS="${LOCAL_LIB_CXXFLAGS} -D__linux__"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
ARCH=OTHERUNIX
|
ARCH=OTHERUNIX
|
||||||
|
LOCAL_PSIBIN_LIB_CXXFLAGS="${LOCAL_LIB_CXXFLAGS} -D__linux__"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
2
src/external/Nonlocal/Makefile.am
vendored
2
src/external/Nonlocal/Makefile.am
vendored
@ -58,7 +58,7 @@ endif
|
|||||||
|
|
||||||
if IS_CYGWIN
|
if IS_CYGWIN
|
||||||
install-exec-hook:
|
install-exec-hook:
|
||||||
$(LN_S) $(libdir)/libPNL_PippardFitter.dll.a $(libdir)/libPNL_PippardFitter.so
|
$(LN_S) $(bindir)/cygPNL_PippardFitter-$(PLUGIN_MAJOR_VERSION)-$(PLUGIN_MINOR_VERSION)-$(PLUGIN_MAJOR_VERSION).dll $(libdir)/libPNL_PippardFitter.so
|
||||||
uninstall-hook:
|
uninstall-hook:
|
||||||
rm -f $(libdir)/libPNL_PippardFitter.so
|
rm -f $(libdir)/libPNL_PippardFitter.so
|
||||||
endif
|
endif
|
||||||
|
@ -75,7 +75,7 @@ endif
|
|||||||
|
|
||||||
if IS_CYGWIN
|
if IS_CYGWIN
|
||||||
install-exec-hook:
|
install-exec-hook:
|
||||||
$(LN_S) $(libdir)/libTFitPofB.dll.a $(libdir)/libTFitPofB.so
|
$(LN_S) $(bindir)/cygTFitPofB-$(PLUGIN_MAJOR_VERSION)-$(PLUGIN_MINOR_VERSION)-$(PLUGIN_MAJOR_VERSION).dll $(libdir)/libTFitPofB.so
|
||||||
uninstall-hook:
|
uninstall-hook:
|
||||||
rm -f $(libdir)/libTFitPofB.so
|
rm -f $(libdir)/libTFitPofB.so
|
||||||
endif
|
endif
|
||||||
|
@ -50,7 +50,7 @@ endif
|
|||||||
|
|
||||||
if IS_CYGWIN
|
if IS_CYGWIN
|
||||||
install-exec-hook:
|
install-exec-hook:
|
||||||
$(LN_S) $(libdir)/libCalcMeanFieldsLEM.dll.a $(libdir)/libCalcMeanFieldsLEM.so
|
$(LN_S) $(bindir)/cygCalcMeanFieldsLEM-$(PLUGIN_MAJOR_VERSION)-$(PLUGIN_MINOR_VERSION)-$(PLUGIN_MAJOR_VERSION).dll $(libdir)/libCalcMeanFieldsLEM.so
|
||||||
uninstall-hook:
|
uninstall-hook:
|
||||||
rm -f $(libdir)/libCalcMeanFieldsLEM.so
|
rm -f $(libdir)/libCalcMeanFieldsLEM.so
|
||||||
endif
|
endif
|
||||||
|
2
src/external/libGapIntegrals/Makefile.am
vendored
2
src/external/libGapIntegrals/Makefile.am
vendored
@ -52,7 +52,7 @@ endif
|
|||||||
|
|
||||||
if IS_CYGWIN
|
if IS_CYGWIN
|
||||||
install-exec-hook:
|
install-exec-hook:
|
||||||
$(LN_S) $(libdir)/libGapIntegrals.dll.a $(libdir)/libGapIntegrals.so
|
$(LN_S) $(bindir)/cygGapIntegrals-$(PLUGIN_MAJOR_VERSION)-$(PLUGIN_MINOR_VERSION)-$(PLUGIN_MAJOR_VERSION).dll $(libdir)/libGapIntegrals.so
|
||||||
uninstall-hook:
|
uninstall-hook:
|
||||||
rm -f $(libdir)/libGapIntegrals.so
|
rm -f $(libdir)/libGapIntegrals.so
|
||||||
endif
|
endif
|
||||||
|
2
src/external/libLFRelaxation/Makefile.am
vendored
2
src/external/libLFRelaxation/Makefile.am
vendored
@ -52,7 +52,7 @@ endif
|
|||||||
|
|
||||||
if IS_CYGWIN
|
if IS_CYGWIN
|
||||||
install-exec-hook:
|
install-exec-hook:
|
||||||
$(LN_S) $(libdir)/libLFRelaxation.dll.a $(libdir)/libLFRelaxation.so
|
$(LN_S) $(bindir)/cygLFRelaxation-$(PLUGIN_MAJOR_VERSION)-$(PLUGIN_MINOR_VERSION)-$(PLUGIN_MAJOR_VERSION).dll $(libdir)/libLFRelaxation.so
|
||||||
uninstall-hook:
|
uninstall-hook:
|
||||||
rm -f $(libdir)/libLFRelaxation.so
|
rm -f $(libdir)/libLFRelaxation.so
|
||||||
endif
|
endif
|
Loading…
x
Reference in New Issue
Block a user