diff --git a/AI/FuzzyLite/Makefile.am b/AI/FuzzyLite/Makefile.am new file mode 100644 index 000000000..459a8f793 --- /dev/null +++ b/AI/FuzzyLite/Makefile.am @@ -0,0 +1,42 @@ +noinst_LTLIBRARIES = libfuzzylite.la +libfuzzylite_la_LDFLAGS = -static +libfuzzylite_la_SOURCES = \ + AreaCentroidAlgorithm.cpp \ + FuzzyOperation.cpp \ + OutputLVar.cpp \ + CompoundTerm.cpp \ + FuzzyOperator.cpp \ + RectangularTerm.cpp \ + DescriptiveAntecedent.cpp \ + FuzzyOr.cpp \ + RuleBlock.cpp \ + DiscreteTerm.cpp \ + FuzzyRule.cpp \ + ShoulderTerm.cpp \ + FunctionTerm.cpp \ + Hedge.cpp \ + SingletonTerm.cpp \ + FuzzyAnd.cpp \ + HedgeSet.cpp \ + StrOp.cpp \ + FuzzyAntecedent.cpp \ + InfixToPostfix.cpp \ + TakagiSugenoConsequent.cpp \ + FuzzyConsequent.cpp \ + InputLVar.cpp \ + TakagiSugenoRule.cpp \ + FuzzyDefuzzifier.cpp \ + LinguisticTerm.cpp \ + TakagiSugenoTerm.cpp \ + FuzzyEngine.cpp \ + LinguisticVariable.cpp \ + test.cpp \ + FuzzyException.cpp \ + main.cpp \ + TrapezoidalTerm.cpp \ + FuzzyExceptions.cpp \ + MamdaniConsequent.cpp \ + TriangularTerm.cpp \ + FuzzyModulation.cpp \ + MamdaniRule.cpp + diff --git a/AI/FuzzyLite/Makefile.in b/AI/FuzzyLite/Makefile.in new file mode 100644 index 000000000..64745b5cf --- /dev/null +++ b/AI/FuzzyLite/Makefile.in @@ -0,0 +1,608 @@ +# Makefile.in generated by automake 1.11.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = AI/FuzzyLite +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/aclocal/m4/ax_boost_base.m4 \ + $(top_srcdir)/aclocal/m4/ax_boost_filesystem.m4 \ + $(top_srcdir)/aclocal/m4/ax_boost_iostreams.m4 \ + $(top_srcdir)/aclocal/m4/ax_boost_program_options.m4 \ + $(top_srcdir)/aclocal/m4/ax_boost_system.m4 \ + $(top_srcdir)/aclocal/m4/ax_boost_thread.m4 \ + $(top_srcdir)/aclocal/m4/ax_compiler_vendor.m4 \ + $(top_srcdir)/aclocal/m4/libtool.m4 \ + $(top_srcdir)/aclocal/m4/ltoptions.m4 \ + $(top_srcdir)/aclocal/m4/ltsugar.m4 \ + $(top_srcdir)/aclocal/m4/ltversion.m4 \ + $(top_srcdir)/aclocal/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +LTLIBRARIES = $(noinst_LTLIBRARIES) +libfuzzylite_la_LIBADD = +am_libfuzzylite_la_OBJECTS = AreaCentroidAlgorithm.lo \ + FuzzyOperation.lo OutputLVar.lo CompoundTerm.lo \ + FuzzyOperator.lo RectangularTerm.lo DescriptiveAntecedent.lo \ + FuzzyOr.lo RuleBlock.lo DiscreteTerm.lo FuzzyRule.lo \ + ShoulderTerm.lo FunctionTerm.lo Hedge.lo SingletonTerm.lo \ + FuzzyAnd.lo HedgeSet.lo StrOp.lo FuzzyAntecedent.lo \ + InfixToPostfix.lo TakagiSugenoConsequent.lo FuzzyConsequent.lo \ + InputLVar.lo TakagiSugenoRule.lo FuzzyDefuzzifier.lo \ + LinguisticTerm.lo TakagiSugenoTerm.lo FuzzyEngine.lo \ + LinguisticVariable.lo test.lo FuzzyException.lo main.lo \ + TrapezoidalTerm.lo FuzzyExceptions.lo MamdaniConsequent.lo \ + TriangularTerm.lo FuzzyModulation.lo MamdaniRule.lo +libfuzzylite_la_OBJECTS = $(am_libfuzzylite_la_OBJECTS) +AM_V_lt = $(am__v_lt_$(V)) +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +am__v_lt_0 = --silent +libfuzzylite_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) $(libfuzzylite_la_LDFLAGS) \ + $(LDFLAGS) -o $@ +DEFAULT_INCLUDES = -I.@am__isrc@ +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_$(V)) +am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY)) +am__v_CXX_0 = @echo " CXX " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_$(V)) +am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY)) +am__v_CXXLD_0 = @echo " CXXLD " $@; +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +SOURCES = $(libfuzzylite_la_SOURCES) +DIST_SOURCES = $(libfuzzylite_la_SOURCES) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ +BOOST_FILESYSTEM_LIB = @BOOST_FILESYSTEM_LIB@ +BOOST_IOSTREAMS_LIB = @BOOST_IOSTREAMS_LIB@ +BOOST_LDFLAGS = @BOOST_LDFLAGS@ +BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@ +BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@ +BOOST_THREAD_LIB = @BOOST_THREAD_LIB@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FFMPEG_CXXFLAGS = @FFMPEG_CXXFLAGS@ +FFMPEG_LIBS = @FFMPEG_LIBS@ +FGREP = @FGREP@ +GREP = @GREP@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +RANLIB = @RANLIB@ +SDL_CFLAGS = @SDL_CFLAGS@ +SDL_CONFIG = @SDL_CONFIG@ +SDL_CXXFLAGS = @SDL_CXXFLAGS@ +SDL_LIBS = @SDL_LIBS@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VCMI_AI_LIBS_DIR = @VCMI_AI_LIBS_DIR@ +VCMI_SCRIPTING_LIBS_DIR = @VCMI_SCRIPTING_LIBS_DIR@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +noinst_LTLIBRARIES = libfuzzylite.la +libfuzzylite_la_LDFLAGS = -static +libfuzzylite_la_SOURCES = \ + AreaCentroidAlgorithm.cpp \ + FuzzyOperation.cpp \ + OutputLVar.cpp \ + CompoundTerm.cpp \ + FuzzyOperator.cpp \ + RectangularTerm.cpp \ + DescriptiveAntecedent.cpp \ + FuzzyOr.cpp \ + RuleBlock.cpp \ + DiscreteTerm.cpp \ + FuzzyRule.cpp \ + ShoulderTerm.cpp \ + FunctionTerm.cpp \ + Hedge.cpp \ + SingletonTerm.cpp \ + FuzzyAnd.cpp \ + HedgeSet.cpp \ + StrOp.cpp \ + FuzzyAntecedent.cpp \ + InfixToPostfix.cpp \ + TakagiSugenoConsequent.cpp \ + FuzzyConsequent.cpp \ + InputLVar.cpp \ + TakagiSugenoRule.cpp \ + FuzzyDefuzzifier.cpp \ + LinguisticTerm.cpp \ + TakagiSugenoTerm.cpp \ + FuzzyEngine.cpp \ + LinguisticVariable.cpp \ + test.cpp \ + FuzzyException.cpp \ + main.cpp \ + TrapezoidalTerm.cpp \ + FuzzyExceptions.cpp \ + MamdaniConsequent.cpp \ + TriangularTerm.cpp \ + FuzzyModulation.cpp \ + MamdaniRule.cpp + +all: all-am + +.SUFFIXES: +.SUFFIXES: .cpp .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu AI/FuzzyLite/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu AI/FuzzyLite/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libfuzzylite.la: $(libfuzzylite_la_OBJECTS) $(libfuzzylite_la_DEPENDENCIES) + $(AM_V_CXXLD)$(libfuzzylite_la_LINK) $(libfuzzylite_la_OBJECTS) $(libfuzzylite_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AreaCentroidAlgorithm.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CompoundTerm.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DescriptiveAntecedent.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DiscreteTerm.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FunctionTerm.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FuzzyAnd.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FuzzyAntecedent.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FuzzyConsequent.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FuzzyDefuzzifier.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FuzzyEngine.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FuzzyException.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FuzzyExceptions.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FuzzyModulation.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FuzzyOperation.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FuzzyOperator.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FuzzyOr.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FuzzyRule.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Hedge.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HedgeSet.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/InfixToPostfix.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/InputLVar.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LinguisticTerm.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LinguisticVariable.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MamdaniConsequent.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MamdaniRule.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/OutputLVar.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RectangularTerm.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RuleBlock.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ShoulderTerm.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SingletonTerm.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StrOp.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TakagiSugenoConsequent.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TakagiSugenoRule.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TakagiSugenoTerm.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TrapezoidalTerm.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TriangularTerm.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Plo@am__quote@ + +.cpp.o: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< + +.cpp.obj: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.cpp.lo: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags uninstall uninstall-am + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/AI/FuzzyLite/defs.h b/AI/FuzzyLite/defs.h index 68f2c7096..90a98dd07 100644 --- a/AI/FuzzyLite/defs.h +++ b/AI/FuzzyLite/defs.h @@ -22,12 +22,12 @@ #ifndef FL_DEFS_H #define FL_DEFS_H -#ifndef NAN +#ifdef _MSC_VER + #ifndef NAN static const unsigned long __nan[2] = {0xffffffff, 0x7fffffff}; #define NAN (*(const float *) __nan) -#endif + #endif -#ifdef _MSC_VER #ifndef INFINITY union MSVC_FL { diff --git a/AI/Makefile.am b/AI/Makefile.am index b51704ec5..79d312c8f 100644 --- a/AI/Makefile.am +++ b/AI/Makefile.am @@ -1 +1 @@ -SUBDIRS = StupidAI EmptyAI VCAI +SUBDIRS = FuzzyLite StupidAI EmptyAI VCAI diff --git a/AI/Makefile.in b/AI/Makefile.in index c4440c112..e9860c48c 100644 --- a/AI/Makefile.in +++ b/AI/Makefile.in @@ -237,7 +237,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = StupidAI EmptyAI VCAI +SUBDIRS = FuzzyLite StupidAI EmptyAI VCAI all: all-recursive .SUFFIXES: diff --git a/AI/VCAI/Fuzzy.cpp b/AI/VCAI/Fuzzy.cpp index 2a53959e7..53d746f7b 100644 --- a/AI/VCAI/Fuzzy.cpp +++ b/AI/VCAI/Fuzzy.cpp @@ -1,6 +1,7 @@ #include "StdInc.h" #include "Fuzzy.h" -#include "../../lib/CObjectHandler.h" +#include +//#include "../../lib/CObjectHandler.h" /* * Fuzzy.cpp, part of VCMI engine @@ -187,7 +188,7 @@ void FuzzyHelper::initTacticalAdvantage() ui64 FuzzyHelper::estimateBankDanger (int ID) { std::vector > & configs = VLC->objh->banksInfo[ID]; - ui64 val = INFINITY; + ui64 val = std::numeric_limits::max(); try { switch (configs.size()) diff --git a/AI/VCAI/Makefile.am b/AI/VCAI/Makefile.am index 14d5ee159..5b5cb94e2 100644 --- a/AI/VCAI/Makefile.am +++ b/AI/VCAI/Makefile.am @@ -4,10 +4,11 @@ StdInc.h.gch: StdInc.h $(CXXCOMPILE) -DVCMI_DLL -fPIC -c $< vcmiai_LTLIBRARIES = libVCAI.la -libVCAI_la_LIBADD = $(top_builddir)/lib/libvcmi.la +libVCAI_la_LIBADD = $(top_builddir)/lib/libvcmi.la $(top_builddir)/AI/FuzzyLite/libfuzzylite.la libVCAI_la_CXXFLAGS = -DVCMI_DLL libVCAI_la_LDFLAGS = -L$(top_builddir)/lib -module -avoid-version libVCAI_la_SOURCES = \ main.cpp \ + Fuzzy.cpp \ VCAI.cpp \ VCAI.h diff --git a/AI/VCAI/Makefile.in b/AI/VCAI/Makefile.in index f81b5af78..f978e1960 100644 --- a/AI/VCAI/Makefile.in +++ b/AI/VCAI/Makefile.in @@ -78,8 +78,10 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(vcmiaidir)" LTLIBRARIES = $(vcmiai_LTLIBRARIES) -libVCAI_la_DEPENDENCIES = $(top_builddir)/lib/libvcmi.la -am_libVCAI_la_OBJECTS = libVCAI_la-main.lo libVCAI_la-VCAI.lo +libVCAI_la_DEPENDENCIES = $(top_builddir)/lib/libvcmi.la \ + $(top_builddir)/AI/FuzzyLite/libfuzzylite.la +am_libVCAI_la_OBJECTS = libVCAI_la-main.lo libVCAI_la-Fuzzy.lo \ + libVCAI_la-VCAI.lo libVCAI_la_OBJECTS = $(am_libVCAI_la_OBJECTS) AM_V_lt = $(am__v_lt_$(V)) am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) @@ -271,11 +273,12 @@ top_srcdir = @top_srcdir@ vcmiaidir = $(VCMI_AI_LIBS_DIR) BUILT_SOURCES = StdInc.h.gch vcmiai_LTLIBRARIES = libVCAI.la -libVCAI_la_LIBADD = $(top_builddir)/lib/libvcmi.la +libVCAI_la_LIBADD = $(top_builddir)/lib/libvcmi.la $(top_builddir)/AI/FuzzyLite/libfuzzylite.la libVCAI_la_CXXFLAGS = -DVCMI_DLL libVCAI_la_LDFLAGS = -L$(top_builddir)/lib -module -avoid-version libVCAI_la_SOURCES = \ main.cpp \ + Fuzzy.cpp \ VCAI.cpp \ VCAI.h @@ -354,6 +357,7 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVCAI_la-Fuzzy.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVCAI_la-VCAI.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVCAI_la-main.Plo@am__quote@ @@ -389,6 +393,14 @@ libVCAI_la-main.lo: main.cpp @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libVCAI_la_CXXFLAGS) $(CXXFLAGS) -c -o libVCAI_la-main.lo `test -f 'main.cpp' || echo '$(srcdir)/'`main.cpp +libVCAI_la-Fuzzy.lo: Fuzzy.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libVCAI_la_CXXFLAGS) $(CXXFLAGS) -MT libVCAI_la-Fuzzy.lo -MD -MP -MF $(DEPDIR)/libVCAI_la-Fuzzy.Tpo -c -o libVCAI_la-Fuzzy.lo `test -f 'Fuzzy.cpp' || echo '$(srcdir)/'`Fuzzy.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libVCAI_la-Fuzzy.Tpo $(DEPDIR)/libVCAI_la-Fuzzy.Plo +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='Fuzzy.cpp' object='libVCAI_la-Fuzzy.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libVCAI_la_CXXFLAGS) $(CXXFLAGS) -c -o libVCAI_la-Fuzzy.lo `test -f 'Fuzzy.cpp' || echo '$(srcdir)/'`Fuzzy.cpp + libVCAI_la-VCAI.lo: VCAI.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libVCAI_la_CXXFLAGS) $(CXXFLAGS) -MT libVCAI_la-VCAI.lo -MD -MP -MF $(DEPDIR)/libVCAI_la-VCAI.Tpo -c -o libVCAI_la-VCAI.lo `test -f 'VCAI.cpp' || echo '$(srcdir)/'`VCAI.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libVCAI_la-VCAI.Tpo $(DEPDIR)/libVCAI_la-VCAI.Plo diff --git a/configure b/configure index deab64f27..70858e992 100755 --- a/configure +++ b/configure @@ -17540,7 +17540,7 @@ VCMI_AI_LIBS_DIR="$libdir/vcmi/AI" VCMI_SCRIPTING_LIBS_DIR="$libdir/vcmi/Scripting" -ac_config_files="$ac_config_files Makefile lib/Makefile client/Makefile server/Makefile AI/Makefile AI/StupidAI/Makefile AI/EmptyAI/Makefile AI/VCAI/Makefile Scripting/ERM/Makefile" +ac_config_files="$ac_config_files Makefile lib/Makefile client/Makefile server/Makefile AI/FuzzyLite/Makefile AI/Makefile AI/StupidAI/Makefile AI/EmptyAI/Makefile AI/VCAI/Makefile Scripting/ERM/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -18674,6 +18674,7 @@ do "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; "client/Makefile") CONFIG_FILES="$CONFIG_FILES client/Makefile" ;; "server/Makefile") CONFIG_FILES="$CONFIG_FILES server/Makefile" ;; + "AI/FuzzyLite/Makefile") CONFIG_FILES="$CONFIG_FILES AI/FuzzyLite/Makefile" ;; "AI/Makefile") CONFIG_FILES="$CONFIG_FILES AI/Makefile" ;; "AI/StupidAI/Makefile") CONFIG_FILES="$CONFIG_FILES AI/StupidAI/Makefile" ;; "AI/EmptyAI/Makefile") CONFIG_FILES="$CONFIG_FILES AI/EmptyAI/Makefile" ;; diff --git a/configure.ac b/configure.ac index 09df67d2e..fd165ce55 100644 --- a/configure.ac +++ b/configure.ac @@ -114,4 +114,4 @@ AC_SUBST(VCMI_AI_LIBS_DIR) VCMI_SCRIPTING_LIBS_DIR="$libdir/vcmi/Scripting" AC_SUBST(VCMI_SCRIPTING_LIBS_DIR) -AC_OUTPUT(Makefile lib/Makefile client/Makefile server/Makefile AI/Makefile AI/StupidAI/Makefile AI/EmptyAI/Makefile AI/VCAI/Makefile Scripting/ERM/Makefile) +AC_OUTPUT(Makefile lib/Makefile client/Makefile server/Makefile AI/FuzzyLite/Makefile AI/Makefile AI/StupidAI/Makefile AI/EmptyAI/Makefile AI/VCAI/Makefile Scripting/ERM/Makefile) diff --git a/lib/CGameInterface.cpp b/lib/CGameInterface.cpp index a558f8c29..39de48dec 100644 --- a/lib/CGameInterface.cpp +++ b/lib/CGameInterface.cpp @@ -43,6 +43,8 @@ rett * createAny(std::string dllname, std::string methodName) getName = (void(*)(char*))dlsym(dll,"GetAiName"); getAI = (rett*(*)())dlsym(dll,methodName.c_str()); } + else + tlog0 << "Error: " << dlerror() <<"\n"; #endif if (!dll) { diff --git a/lib/CTownHandler.cpp b/lib/CTownHandler.cpp index b256fbbf7..df061c93b 100644 --- a/lib/CTownHandler.cpp +++ b/lib/CTownHandler.cpp @@ -131,7 +131,7 @@ void CTownHandler::loadStructures() // Misc. towns[townID].mageLevel = town_node["mage_guild"].Float(); - towns[townID].primaryRes = town_node["primary_ressource"].Float(); + towns[townID].primaryRes = town_node["primary_resource"].Float(); towns[townID].warMachine = town_node["war_machine"].Float(); townID ++;