Index: lib/info-c.cpp =================================================================== --- lib/info-c.cpp (revision 97) +++ lib/info-c.cpp (working copy) @@ -4,6 +4,7 @@ * LGPL license along with this library if you did not you can find it * at http://www.gnu.org/. */ +#include "settings.h" #include "info.hpp" namespace acommon { @@ -16,92 +17,92 @@ class ModuleInfoEnumeration; class ModuleInfoList; -extern "C" ModuleInfoList * get_aspell_module_info_list(Config * config) +extern "C" ASPELL_API ModuleInfoList * get_aspell_module_info_list(Config * config) { return const_cast(get_module_info_list(config)); } -extern "C" int aspell_module_info_list_empty(const ModuleInfoList * ths) +extern "C" ASPELL_API int aspell_module_info_list_empty(const ModuleInfoList * ths) { return ths->empty(); } -extern "C" unsigned int aspell_module_info_list_size(const ModuleInfoList * ths) +extern "C" ASPELL_API unsigned int aspell_module_info_list_size(const ModuleInfoList * ths) { return ths->size(); } -extern "C" ModuleInfoEnumeration * aspell_module_info_list_elements(const ModuleInfoList * ths) +extern "C" ASPELL_API ModuleInfoEnumeration * aspell_module_info_list_elements(const ModuleInfoList * ths) { return ths->elements(); } -extern "C" DictInfoList * get_aspell_dict_info_list(Config * config) +extern "C" ASPELL_API DictInfoList * get_aspell_dict_info_list(Config * config) { return const_cast(get_dict_info_list(config)); } -extern "C" int aspell_dict_info_list_empty(const DictInfoList * ths) +extern "C" ASPELL_API int aspell_dict_info_list_empty(const DictInfoList * ths) { return ths->empty(); } -extern "C" unsigned int aspell_dict_info_list_size(const DictInfoList * ths) +extern "C" ASPELL_API unsigned int aspell_dict_info_list_size(const DictInfoList * ths) { return ths->size(); } -extern "C" DictInfoEnumeration * aspell_dict_info_list_elements(const DictInfoList * ths) +extern "C" ASPELL_API DictInfoEnumeration * aspell_dict_info_list_elements(const DictInfoList * ths) { return ths->elements(); } -extern "C" int aspell_module_info_enumeration_at_end(const ModuleInfoEnumeration * ths) +extern "C" ASPELL_API int aspell_module_info_enumeration_at_end(const ModuleInfoEnumeration * ths) { return ths->at_end(); } -extern "C" const ModuleInfo * aspell_module_info_enumeration_next(ModuleInfoEnumeration * ths) +extern "C" ASPELL_API const ModuleInfo * aspell_module_info_enumeration_next(ModuleInfoEnumeration * ths) { return ths->next(); } -extern "C" void delete_aspell_module_info_enumeration(ModuleInfoEnumeration * ths) +extern "C" ASPELL_API void delete_aspell_module_info_enumeration(ModuleInfoEnumeration * ths) { delete ths; } -extern "C" ModuleInfoEnumeration * aspell_module_info_enumeration_clone(const ModuleInfoEnumeration * ths) +extern "C" ASPELL_API ModuleInfoEnumeration * aspell_module_info_enumeration_clone(const ModuleInfoEnumeration * ths) { return ths->clone(); } -extern "C" void aspell_module_info_enumeration_assign(ModuleInfoEnumeration * ths, const ModuleInfoEnumeration * other) +extern "C" ASPELL_API void aspell_module_info_enumeration_assign(ModuleInfoEnumeration * ths, const ModuleInfoEnumeration * other) { ths->assign(other); } -extern "C" int aspell_dict_info_enumeration_at_end(const DictInfoEnumeration * ths) +extern "C" ASPELL_API int aspell_dict_info_enumeration_at_end(const DictInfoEnumeration * ths) { return ths->at_end(); } -extern "C" const DictInfo * aspell_dict_info_enumeration_next(DictInfoEnumeration * ths) +extern "C" ASPELL_API const DictInfo * aspell_dict_info_enumeration_next(DictInfoEnumeration * ths) { return ths->next(); } -extern "C" void delete_aspell_dict_info_enumeration(DictInfoEnumeration * ths) +extern "C" ASPELL_API void delete_aspell_dict_info_enumeration(DictInfoEnumeration * ths) { delete ths; } -extern "C" DictInfoEnumeration * aspell_dict_info_enumeration_clone(const DictInfoEnumeration * ths) +extern "C" ASPELL_API DictInfoEnumeration * aspell_dict_info_enumeration_clone(const DictInfoEnumeration * ths) { return ths->clone(); } -extern "C" void aspell_dict_info_enumeration_assign(DictInfoEnumeration * ths, const DictInfoEnumeration * other) +extern "C" ASPELL_API void aspell_dict_info_enumeration_assign(DictInfoEnumeration * ths, const DictInfoEnumeration * other) { ths->assign(other); } Index: auto/MkSrc/CcHelper.pm =================================================================== --- auto/MkSrc/CcHelper.pm (revision 97) +++ auto/MkSrc/CcHelper.pm (working copy) @@ -303,7 +303,7 @@ { my @ret = &form_c_method(@_); return undef unless @ret > 0; - return &make_func(@ret); + return "ASPELL_API " . &make_func(@ret); } sub call_c_method ($ $ $ ; \%) Index: auto/MkSrc/ProcCc.pm =================================================================== --- auto/MkSrc/ProcCc.pm (revision 97) +++ auto/MkSrc/ProcCc.pm (working copy) @@ -92,7 +92,7 @@ my ($level, $data) = @_; return unless defined $data; foreach my $d (@$data) { - $ret .= "extern const struct AspellErrorInfo * const "; + $ret .= "ASPELL_API extern const struct AspellErrorInfo * const "; $ret .= ' 'x$level; $ret .= "aerror_"; $ret .= to_lower($d->{type}); Index: auto/MkSrc/ProcNative.pm =================================================================== --- auto/MkSrc/ProcNative.pm (revision 97) +++ auto/MkSrc/ProcNative.pm (working copy) @@ -72,7 +72,7 @@ my ($level, $data) = @_; return unless defined $data; foreach my $d (@$data) { - $ret .= "extern \"C\" const ErrorInfo * const "; + $ret .= "extern \"C\" ASPELL_API const ErrorInfo * const "; $ret .= ' 'x$level; $ret .= "aerror_"; $ret .= to_lower($d->{type}); Index: auto/MkSrc/ProcNativeImpl.pm =================================================================== --- auto/MkSrc/ProcNativeImpl.pm (revision 97) +++ auto/MkSrc/ProcNativeImpl.pm (working copy) @@ -80,7 +80,7 @@ $ret .= " ".scalar @parms.", // num_parms\n"; $ret .= " {".(join ', ', map {"\"$_\""} (@parms ? @parms : ("")))."} // parms\n"; $ret .= "};\n"; - $ret .= "extern \"C\" const ErrorInfo * const $name = &$name\_obj;\n"; + $ret .= "extern \"C\" ASPELL_API const ErrorInfo * const $name = &$name\_obj;\n"; $ret .= "\n"; foreach my $d (@{$data->{data}}) { $ret .= $p->($name, \@parms, $d); Index: auto/MkSrc/Create.pm =================================================================== --- auto/MkSrc/Create.pm (revision 97) +++ auto/MkSrc/Create.pm (working copy) @@ -73,7 +73,7 @@ my $hm = "ASPELL_". to_upper($p{name})."__".to_upper($p{ext}); $file .= "#ifndef $hm\n#define $hm\n\n" if $p{header}; $file .= "#include \"aspell.h\"\n" if $p{type} eq 'cxx'; - $file .= "#include \"settings.h\"\n" if $p{type} eq 'native_impl' && $p{name} eq 'errors'; + $file .= "#include \"settings.h\"\n"; $file .= "#include \"gettext.h\"\n" if $p{type} eq 'native_impl' && $p{name} eq 'errors'; $file .= cmap {"#include \"".to_lower($_).".hpp\"\n"} sort keys %{$accum{headers}}; $file .= "#ifdef __cplusplus\nextern \"C\" {\n#endif\n" if $p{header} && !$p{cxx}; Index: common/file_util.cpp =================================================================== --- common/file_util.cpp (revision 97) +++ common/file_util.cpp (working copy) @@ -28,6 +28,7 @@ # include # define ACCESS _access +# define F_OK 0 # include # include @@ -46,7 +47,7 @@ bool need_dir(ParmString file) { if (file[0] == '/' || (file[0] == '.' && file[1] == '/') #ifdef WIN32 - || (asc_isalpha(file[0]) && file[1] == ':') + || (isalpha(file[0]) && file[1] == ':') || file[0] == '\\' || (file[0] == '.' && file[1] == '\\') #endif ) Index: common/errors.hpp =================================================================== --- common/errors.hpp (revision 97) +++ common/errors.hpp (working copy) @@ -9,96 +9,97 @@ #ifndef ASPELL_ERRORS__HPP #define ASPELL_ERRORS__HPP +#include "settings.h" namespace acommon { struct ErrorInfo; -extern "C" const ErrorInfo * const aerror_other; -extern "C" const ErrorInfo * const aerror_operation_not_supported; -extern "C" const ErrorInfo * const aerror_cant_copy; -extern "C" const ErrorInfo * const aerror_unimplemented_method; -extern "C" const ErrorInfo * const aerror_file; -extern "C" const ErrorInfo * const aerror_cant_open_file; -extern "C" const ErrorInfo * const aerror_cant_read_file; -extern "C" const ErrorInfo * const aerror_cant_write_file; -extern "C" const ErrorInfo * const aerror_invalid_name; -extern "C" const ErrorInfo * const aerror_bad_file_format; -extern "C" const ErrorInfo * const aerror_dir; -extern "C" const ErrorInfo * const aerror_cant_read_dir; -extern "C" const ErrorInfo * const aerror_config; -extern "C" const ErrorInfo * const aerror_unknown_key; -extern "C" const ErrorInfo * const aerror_cant_change_value; -extern "C" const ErrorInfo * const aerror_bad_key; -extern "C" const ErrorInfo * const aerror_bad_value; -extern "C" const ErrorInfo * const aerror_duplicate; -extern "C" const ErrorInfo * const aerror_key_not_string; -extern "C" const ErrorInfo * const aerror_key_not_int; -extern "C" const ErrorInfo * const aerror_key_not_bool; -extern "C" const ErrorInfo * const aerror_key_not_list; -extern "C" const ErrorInfo * const aerror_no_value_reset; -extern "C" const ErrorInfo * const aerror_no_value_enable; -extern "C" const ErrorInfo * const aerror_no_value_disable; -extern "C" const ErrorInfo * const aerror_no_value_clear; -extern "C" const ErrorInfo * const aerror_language_related; -extern "C" const ErrorInfo * const aerror_unknown_language; -extern "C" const ErrorInfo * const aerror_unknown_soundslike; -extern "C" const ErrorInfo * const aerror_language_not_supported; -extern "C" const ErrorInfo * const aerror_no_wordlist_for_lang; -extern "C" const ErrorInfo * const aerror_mismatched_language; -extern "C" const ErrorInfo * const aerror_affix; -extern "C" const ErrorInfo * const aerror_corrupt_affix; -extern "C" const ErrorInfo * const aerror_invalid_cond; -extern "C" const ErrorInfo * const aerror_invalid_cond_strip; -extern "C" const ErrorInfo * const aerror_incorrect_encoding; -extern "C" const ErrorInfo * const aerror_encoding; -extern "C" const ErrorInfo * const aerror_unknown_encoding; -extern "C" const ErrorInfo * const aerror_encoding_not_supported; -extern "C" const ErrorInfo * const aerror_conversion_not_supported; -extern "C" const ErrorInfo * const aerror_pipe; -extern "C" const ErrorInfo * const aerror_cant_create_pipe; -extern "C" const ErrorInfo * const aerror_process_died; -extern "C" const ErrorInfo * const aerror_bad_input; -extern "C" const ErrorInfo * const aerror_invalid_string; -extern "C" const ErrorInfo * const aerror_invalid_word; -extern "C" const ErrorInfo * const aerror_invalid_affix; -extern "C" const ErrorInfo * const aerror_inapplicable_affix; -extern "C" const ErrorInfo * const aerror_unknown_unichar; -extern "C" const ErrorInfo * const aerror_word_list_flags; -extern "C" const ErrorInfo * const aerror_invalid_flag; -extern "C" const ErrorInfo * const aerror_conflicting_flags; -extern "C" const ErrorInfo * const aerror_version_control; -extern "C" const ErrorInfo * const aerror_bad_version_string; -extern "C" const ErrorInfo * const aerror_filter; -extern "C" const ErrorInfo * const aerror_cant_dlopen_file; -extern "C" const ErrorInfo * const aerror_empty_filter; -extern "C" const ErrorInfo * const aerror_no_such_filter; -extern "C" const ErrorInfo * const aerror_confusing_version; -extern "C" const ErrorInfo * const aerror_bad_version; -extern "C" const ErrorInfo * const aerror_identical_option; -extern "C" const ErrorInfo * const aerror_options_only; -extern "C" const ErrorInfo * const aerror_invalid_option_modifier; -extern "C" const ErrorInfo * const aerror_cant_describe_filter; -extern "C" const ErrorInfo * const aerror_filter_mode_file; -extern "C" const ErrorInfo * const aerror_mode_option_name; -extern "C" const ErrorInfo * const aerror_no_filter_to_option; -extern "C" const ErrorInfo * const aerror_bad_mode_key; -extern "C" const ErrorInfo * const aerror_expect_mode_key; -extern "C" const ErrorInfo * const aerror_mode_version_requirement; -extern "C" const ErrorInfo * const aerror_confusing_mode_version; -extern "C" const ErrorInfo * const aerror_bad_mode_version; -extern "C" const ErrorInfo * const aerror_missing_magic_expression; -extern "C" const ErrorInfo * const aerror_empty_file_ext; -extern "C" const ErrorInfo * const aerror_filter_mode_expand; -extern "C" const ErrorInfo * const aerror_unknown_mode; -extern "C" const ErrorInfo * const aerror_mode_extend_expand; -extern "C" const ErrorInfo * const aerror_filter_mode_magic; -extern "C" const ErrorInfo * const aerror_file_magic_pos; -extern "C" const ErrorInfo * const aerror_file_magic_range; -extern "C" const ErrorInfo * const aerror_missing_magic; -extern "C" const ErrorInfo * const aerror_bad_magic; -extern "C" const ErrorInfo * const aerror_expression; -extern "C" const ErrorInfo * const aerror_invalid_expression; +extern "C" ASPELL_API const ErrorInfo * const aerror_other; +extern "C" ASPELL_API const ErrorInfo * const aerror_operation_not_supported; +extern "C" ASPELL_API const ErrorInfo * const aerror_cant_copy; +extern "C" ASPELL_API const ErrorInfo * const aerror_unimplemented_method; +extern "C" ASPELL_API const ErrorInfo * const aerror_file; +extern "C" ASPELL_API const ErrorInfo * const aerror_cant_open_file; +extern "C" ASPELL_API const ErrorInfo * const aerror_cant_read_file; +extern "C" ASPELL_API const ErrorInfo * const aerror_cant_write_file; +extern "C" ASPELL_API const ErrorInfo * const aerror_invalid_name; +extern "C" ASPELL_API const ErrorInfo * const aerror_bad_file_format; +extern "C" ASPELL_API const ErrorInfo * const aerror_dir; +extern "C" ASPELL_API const ErrorInfo * const aerror_cant_read_dir; +extern "C" ASPELL_API const ErrorInfo * const aerror_config; +extern "C" ASPELL_API const ErrorInfo * const aerror_unknown_key; +extern "C" ASPELL_API const ErrorInfo * const aerror_cant_change_value; +extern "C" ASPELL_API const ErrorInfo * const aerror_bad_key; +extern "C" ASPELL_API const ErrorInfo * const aerror_bad_value; +extern "C" ASPELL_API const ErrorInfo * const aerror_duplicate; +extern "C" ASPELL_API const ErrorInfo * const aerror_key_not_string; +extern "C" ASPELL_API const ErrorInfo * const aerror_key_not_int; +extern "C" ASPELL_API const ErrorInfo * const aerror_key_not_bool; +extern "C" ASPELL_API const ErrorInfo * const aerror_key_not_list; +extern "C" ASPELL_API const ErrorInfo * const aerror_no_value_reset; +extern "C" ASPELL_API const ErrorInfo * const aerror_no_value_enable; +extern "C" ASPELL_API const ErrorInfo * const aerror_no_value_disable; +extern "C" ASPELL_API const ErrorInfo * const aerror_no_value_clear; +extern "C" ASPELL_API const ErrorInfo * const aerror_language_related; +extern "C" ASPELL_API const ErrorInfo * const aerror_unknown_language; +extern "C" ASPELL_API const ErrorInfo * const aerror_unknown_soundslike; +extern "C" ASPELL_API const ErrorInfo * const aerror_language_not_supported; +extern "C" ASPELL_API const ErrorInfo * const aerror_no_wordlist_for_lang; +extern "C" ASPELL_API const ErrorInfo * const aerror_mismatched_language; +extern "C" ASPELL_API const ErrorInfo * const aerror_affix; +extern "C" ASPELL_API const ErrorInfo * const aerror_corrupt_affix; +extern "C" ASPELL_API const ErrorInfo * const aerror_invalid_cond; +extern "C" ASPELL_API const ErrorInfo * const aerror_invalid_cond_strip; +extern "C" ASPELL_API const ErrorInfo * const aerror_incorrect_encoding; +extern "C" ASPELL_API const ErrorInfo * const aerror_encoding; +extern "C" ASPELL_API const ErrorInfo * const aerror_unknown_encoding; +extern "C" ASPELL_API const ErrorInfo * const aerror_encoding_not_supported; +extern "C" ASPELL_API const ErrorInfo * const aerror_conversion_not_supported; +extern "C" ASPELL_API const ErrorInfo * const aerror_pipe; +extern "C" ASPELL_API const ErrorInfo * const aerror_cant_create_pipe; +extern "C" ASPELL_API const ErrorInfo * const aerror_process_died; +extern "C" ASPELL_API const ErrorInfo * const aerror_bad_input; +extern "C" ASPELL_API const ErrorInfo * const aerror_invalid_string; +extern "C" ASPELL_API const ErrorInfo * const aerror_invalid_word; +extern "C" ASPELL_API const ErrorInfo * const aerror_invalid_affix; +extern "C" ASPELL_API const ErrorInfo * const aerror_inapplicable_affix; +extern "C" ASPELL_API const ErrorInfo * const aerror_unknown_unichar; +extern "C" ASPELL_API const ErrorInfo * const aerror_word_list_flags; +extern "C" ASPELL_API const ErrorInfo * const aerror_invalid_flag; +extern "C" ASPELL_API const ErrorInfo * const aerror_conflicting_flags; +extern "C" ASPELL_API const ErrorInfo * const aerror_version_control; +extern "C" ASPELL_API const ErrorInfo * const aerror_bad_version_string; +extern "C" ASPELL_API const ErrorInfo * const aerror_filter; +extern "C" ASPELL_API const ErrorInfo * const aerror_cant_dlopen_file; +extern "C" ASPELL_API const ErrorInfo * const aerror_empty_filter; +extern "C" ASPELL_API const ErrorInfo * const aerror_no_such_filter; +extern "C" ASPELL_API const ErrorInfo * const aerror_confusing_version; +extern "C" ASPELL_API const ErrorInfo * const aerror_bad_version; +extern "C" ASPELL_API const ErrorInfo * const aerror_identical_option; +extern "C" ASPELL_API const ErrorInfo * const aerror_options_only; +extern "C" ASPELL_API const ErrorInfo * const aerror_invalid_option_modifier; +extern "C" ASPELL_API const ErrorInfo * const aerror_cant_describe_filter; +extern "C" ASPELL_API const ErrorInfo * const aerror_filter_mode_file; +extern "C" ASPELL_API const ErrorInfo * const aerror_mode_option_name; +extern "C" ASPELL_API const ErrorInfo * const aerror_no_filter_to_option; +extern "C" ASPELL_API const ErrorInfo * const aerror_bad_mode_key; +extern "C" ASPELL_API const ErrorInfo * const aerror_expect_mode_key; +extern "C" ASPELL_API const ErrorInfo * const aerror_mode_version_requirement; +extern "C" ASPELL_API const ErrorInfo * const aerror_confusing_mode_version; +extern "C" ASPELL_API const ErrorInfo * const aerror_bad_mode_version; +extern "C" ASPELL_API const ErrorInfo * const aerror_missing_magic_expression; +extern "C" ASPELL_API const ErrorInfo * const aerror_empty_file_ext; +extern "C" ASPELL_API const ErrorInfo * const aerror_filter_mode_expand; +extern "C" ASPELL_API const ErrorInfo * const aerror_unknown_mode; +extern "C" ASPELL_API const ErrorInfo * const aerror_mode_extend_expand; +extern "C" ASPELL_API const ErrorInfo * const aerror_filter_mode_magic; +extern "C" ASPELL_API const ErrorInfo * const aerror_file_magic_pos; +extern "C" ASPELL_API const ErrorInfo * const aerror_file_magic_range; +extern "C" ASPELL_API const ErrorInfo * const aerror_missing_magic; +extern "C" ASPELL_API const ErrorInfo * const aerror_bad_magic; +extern "C" ASPELL_API const ErrorInfo * const aerror_expression; +extern "C" ASPELL_API const ErrorInfo * const aerror_invalid_expression; static const ErrorInfo * const other_error = aerror_other; Index: common/objstack.cpp =================================================================== --- common/objstack.cpp (revision 97) +++ common/objstack.cpp (working copy) @@ -3,8 +3,6 @@ namespace acommon { -using namespace std; - void ObjStack::setup_chunk() { bottom = first_free->data; Index: common/posib_err.cpp =================================================================== --- common/posib_err.cpp (revision 97) +++ common/posib_err.cpp (working copy) @@ -8,6 +8,8 @@ #include #include +#include "settings.h" + //#include "iostream.hpp" #include "posib_err.hpp" Index: win32/settings.h =================================================================== --- win32/settings.h (revision 97) +++ win32/settings.h (working copy) @@ -1,92 +0,0 @@ -/* common/settings.h. Generated by configure. */ -/* common/settings.h.in. Generated from configure.ac by autoheader. */ - -/* Defined if no special Workarounds are needed for Curses headers */ -/* #undef CURSES_INCLUDE_STANDARD */ - -/* Defined if special Wordaround I is need for Curses headers */ -/* #undef CURSES_INCLUDE_WORKAROUND_1 */ - -/* Defined if curses like POSIX Functions should be used */ -/* #undef CURSES_ONLY */ - -/* Defined if win32 relocation should be used */ -/* #undef ENABLE_WIN32_RELOCATABLE */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_DLFCN_H */ - -/* Defined if msdos getch is supported */ -/* #undef HAVE_GETCH */ - -/* Define to 1 if you have the header file. */ -#define HAVE_INTTYPES_H 1 - -/* Defined if the curses library is available */ -/* #undef HAVE_LIBCURSES */ - -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Defined if mmap and friends is supported */ -/* #undef HAVE_MMAP */ - -/* Define to 1 if you have the header file. */ -#define HAVE_STDINT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRINGS_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_UNISTD_H 1 - -/* Name of package */ -#define PACKAGE "aspell" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "" - -/* Defined if Posix Termios is Supported */ -/* #undef POSIX_TERMIOS */ - -/* Defined if STL rel_ops polute the global namespace */ -/* #undef REL_OPS_POLLUTION */ - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Defined if file ino is supported */ -/* #undef USE_FILE_INO */ - -/* Defined if file locking and truncating is supported */ -/* #undef USE_FILE_LOCKS */ - -/* Defined if Posix locales are supported */ -/* #undef USE_LOCALE */ - -/* Version number of package */ -#define VERSION "0.50.3" Index: win32/Makefile =================================================================== --- win32/Makefile (revision 97) +++ win32/Makefile (working copy) @@ -1,507 +0,0 @@ -# aspell-0.50.2/win32/Makefile / 02-06-10 vim600:fdm=marker -# Author : Thorsten Maerz vim:ts=32 -# -# Standalone makefile for building GNU Aspell-0.50 using MinGW / GCC3.2 -# -################################################################################ -# -# DEBUGVERSION=1: uncomment to include debugging symbols -#DEBUGVERSION=1 - -# CURSESDIR=: (optional) location of pdcurses headers and libs -#CURSESDIR=../../pdcurses - -# MSVCLIB=LIB.EXE: (optional) build import .lib for MS VC++ (needs ms lib.exe) -#MSVCLIB=LIB.EXE - -# TARGET=: (optional) prefix for cross compilation -#TARGET=i586-mingw32msvc- - -# USE_GCC_2X=1: use gcc2.x (not working) -#USE_GCC_2X=1 - -# WIN32_RELOCATABLE=1: uncomment to have user files in -WIN32_RELOCATABLE=1 - -################################################################################ - -prefix=c:/aspell -pkglibdir=$(prefix)/dict -pkgdatadir=$(prefix)/data -sysconfdir=$(prefix) - -top_srcdir=.. -installdir=$(prefix) - -################################################################################ -# {{{1 compiler settings - -ifdef DEBUGVERSION - DEBUGFLAG=-g -else - OPTIMIZATION=-O3 -endif - -ifdef CURSESDIR - CURSES_INCLUDE=-I$(CURSESDIR) - CURSES_LIB=$(CURSESDIR)/panel.a $(CURSESDIR)/pdcurses.a - CURSES_DEFINES=-DHAVE_LIBCURSES -DCURSES_NON_POSIX -endif - -ifdef USE_GCC_2X - # gcc-2.x: -fnative-struct - BITFIELD=-fnative-struct - GCC2LIBS=-lmingwex -liberty -else - # gcc-3.x: -mms-bitfields - BITFIELD=-mms-bitfields -endif - -ifdef WIN32_RELOCATABLE - WIN32RELOC=-DENABLE_WIN32_RELOCATABLE -endif - -# cygwin: built native w32 code -NOCYGWIN=-mno-cygwin - -################################################################################ - -LIBVERSION=15 -ASPELLVERSION=0-50-3 - -CCOMPILER=gcc -CPPCOMPILER=g++ -CC=$(TARGET)$(CCOMPILER) -CXX=$(TARGET)$(CPPCOMPILER) -AR=$(TARGET)ar -ARFLAGS=rcv -DEFINES=$(CURSES_DEFINES) $(WIN32RELOC) -EXTRALIBS= -RESOURCE= -RESCOMP=$(TARGET)windres -STRIP=$(TARGET)strip -NATIVE_CC=$(NATIVE)$(CCOMPILER) -NATIVE_CXX=$(NATIVE)$(CPPCOMPILER) - -VPATH= $(top_srcdir)/common:\ - $(top_srcdir)/modules/filter:\ - $(top_srcdir)/modules/speller/default:\ - $(top_srcdir)/modules/tokenizer:\ - $(top_srcdir)/lib:\ - $(top_srcdir)/prog -INCLUDES = \ - -I. \ - -I${top_srcdir}/common \ - -I$(top_srcdir)/interfaces/cc \ - -I$(top_srcdir)/modules/filter \ - -I$(top_srcdir)/modules/speller/default \ - -I$(top_srcdir)/modules/tokenizer \ - $(CURSES_INCLUDE) - -FLAGS=$(DEBUGFLAG) $(BITFIELD) $(NOCYGWIN) $(OPTIMIZATION) -CFLAGS=$(FLAGS) $(DEFINES) $(INCLUDES) -CXXFLAGS=$(CFLAGS) -SUPPORTLIBS= -LIBS=-lstdc++ $(GCC2LIBS) - -################################################################################ -# {{{1 targets -# -ifndef DEBUGVERSION -all_strip: all strip -endif - -all: \ - aspell_common_a \ - aspell_filter_standard_a \ - aspell_speller_default_a \ - aspell_tokenizer_a \ - aspell_dll \ - pspell_dll \ - aspell_exe \ - word_list_compress_exe \ - msvc_lib -clean: \ - aspell_common_clean \ - aspell_filter_standard_clean \ - aspell_speller_default_clean \ - aspell_tokenizer_clean \ - aspell_dll_clean \ - pspell_dll_clean \ - aspell_exe_clean \ - word_list_compress_clean \ - msvc_lib_clean \ - regfile_clean - -################################################################################ -# {{{1 aspell-common -# -ASPELL_COMMON_A_NAME=aspell-common-$(ASPELLVERSION).a - -aspell_common_OBJECTS = \ - string.o \ - getdata.o \ - itemize.o \ - file_util.o \ - string_buffer.o \ - string_map.o \ - string_list.o \ - config.o \ - posib_err.o \ - errors.o \ - error.o \ - fstream.o \ - iostream.o \ - info.o \ - can_have_error.o \ - convert.o \ - tokenizer.o \ - speller.o \ - document_checker.o \ - filter.o \ - strtonum.o - -string.o: string.cpp -getdata.o: getdata.cpp -itemize.o: itemize.cpp -file_util.o: file_util.cpp -string_buffer.o: string_buffer.cpp -string_map.o: string_map.cpp -string_list.o: string_list.cpp -config.o: config.cpp -posib_err.o: posib_err.cpp -errors.o: errors.cpp -error.o: error.cpp -fstream.o: fstream.cpp -iostream.o: iostream.cpp -info.o: info.cpp -can_have_error.o: can_have_error.cpp -convert.o: convert.cpp -tokenizer.o: tokenizer.cpp -speller.o: speller.cpp -document_checker.o: document_checker.cpp -filter.o: filter.cpp -strtonum.o: strtonum.cpp - -dirs.h: mk-dirs_h - echo '#define PREFIX "${prefix}"' > dirs.h - ./mk-dirs_h ${prefix} DICT_DIR ${pkglibdir} >> dirs.h - ./mk-dirs_h ${prefix} DATA_DIR ${pkgdatadir} >> dirs.h - ./mk-dirs_h ${prefix} CONF_DIR ${sysconfdir} >> dirs.h - -mk-dirs_h: mk-dirs_h.cpp - $(NATIVE_CXX) $< $(LIBS) -o $@ - -config.cpp: dirs.h - -aspell_common_a: $(ASPELL_COMMON_A_NAME) -$(ASPELL_COMMON_A_NAME): dirs.h $(aspell_common_OBJECTS) - $(AR) $(ARFLAGS) \ - $@ \ - $(aspell_common_OBJECTS) -aspell_common_clean: - -rm $(aspell_common_OBJECTS) \ - $(ASPELL_COMMON_A_NAME) \ - mk-dirs_h.exe mk-dirs_h \ - dirs.h - -####################################################################### -# {{{1 aspell-filter-standard -# -ASPELL_FILTER_STANDARD_A_NAME=aspell-filter-standard.a -aspell_filter_standard_EXTRALIBS = \ - $(ASPELL_COMMON_A_NAME) - -aspell_filter_standard_OBJECTS = \ - email.o \ - url.o \ - tex.o \ - sgml.o \ - -email.o: email.cpp -url.o: url.cpp -tex.o: tex.cpp -sgml.o: sgml.cpp - -aspell_filter_standard_a: $(ASPELL_FILTER_STANDARD_A_NAME) -$(ASPELL_FILTER_STANDARD_A_NAME): $(aspell_filter_standard_OBJECTS) - $(AR) $(ARFLAGS) \ - $@ \ - $+ -aspell_filter_standard_clean: - -rm $(aspell_filter_standard_OBJECTS) \ - $(ASPELL_FILTER_STANDARD_A_NAME) - -####################################################################### -# {{{1 aspell-speller-default -# -ASPELL_SPELLER_DEFAULT_A_NAME=aspell-speller-default.a -aspell_speller_default_EXTRALIBS = \ - $(ASPELL_COMMON_A_NAME) - -aspell_speller_default_OBJECTS = \ - data.o \ - leditdist.o \ - primes.o \ - writable_base.o \ - editdist.o \ - speller_impl.o \ - readonly_ws.o \ - writable_repl.o \ - file_data_util.o \ - multi_ws.o \ - split.o \ - writable_ws.o \ - l2editdist.o \ - phonet.o \ - suggest.o \ - language.o \ - phonetic.o \ - typo_editdist.o \ - -data.o: data.cpp -leditdist.o: leditdist.cpp -primes.o: primes.cpp -writable_base.o: writable_base.cpp -editdist.o: editdist.cpp -speller_impl.o: speller_impl.cpp -readonly_ws.o: readonly_ws.cpp -writable_repl.o: writable_repl.cpp -file_data_util.o: file_data_util.cpp -multi_ws.o: multi_ws.cpp -split.o: split.cpp -writable_ws.o: writable_ws.cpp -l2editdist.o: l2editdist.cpp -phonet.o: phonet.cpp -suggest.o: suggest.cpp -language.o: language.cpp -phonetic.o: phonetic.cpp -typo_editdist.o: typo_editdist.cpp - -aspell_speller_default_a: $(ASPELL_SPELLER_DEFAULT_A_NAME) -$(ASPELL_SPELLER_DEFAULT_A_NAME): $(aspell_speller_default_OBJECTS) - $(AR) $(ARFLAGS) \ - $@ \ - $+ -aspell_speller_default_clean: - -rm $(aspell_speller_default_OBJECTS) \ - $(ASPELL_SPELLER_DEFAULT_A_NAME) - -################################################################################ -# {{{1 aspell-tokenizer -# -ASPELL_TOKENIZER_A_NAME=aspell-tokenizer.a -aspell_tokenizer_EXTRALIBS = \ - $(ASPELL_COMMON_A_NAME) - -aspell_tokenizer_OBJECTS = \ - basic.o \ - -basic.o: basic.cpp - -aspell_tokenizer_a: $(ASPELL_TOKENIZER_A_NAME) -$(ASPELL_TOKENIZER_A_NAME): $(aspell_tokenizer_OBJECTS) - $(AR) $(ARFLAGS) \ - $@ \ - $+ -aspell_tokenizer_clean: - -rm $(aspell_tokenizer_OBJECTS) \ - $(ASPELL_TOKENIZER_A_NAME) - -################################################################################ -# {{{1 aspell-dll -# -ASPELL_DLL_NAME=aspell-$(LIBVERSION).dll -ASPELL_DLL_LIB_NAME=libaspell-$(LIBVERSION)-dll.lib -ASPELL_DLL_DEF_NAME=aspell-$(LIBVERSION).def - -aspell_dll_EXTRALIBS = \ - $(ASPELL_FILTER_STANDARD_A_NAME) \ - $(ASPELL_SPELLER_DEFAULT_A_NAME) \ - $(ASPELL_TOKENIZER_A_NAME) \ - $(ASPELL_COMMON_A_NAME) -aspell_dll_LDFLAGS = \ - -Wl,--export-all-symbols \ - -Wl,--compat-implib \ - -Wl,--out-implib=$(ASPELL_DLL_LIB_NAME) \ - -Wl,--output-def=$(ASPELL_DLL_DEF_NAME) - -aspell_dll_OBJECTS = \ - can_have_error-c.o \ - info-c.o \ - string_list-c.o \ - config-c.o \ - speller-c.o \ - string_map-c.o \ - error-c.o \ - mutable_container-c.o \ - string_pair_enumeration-c.o \ - find_speller.o \ - new_checker.o \ - new_filter.o \ - new_config.o \ - string_enumeration-c.o \ - word_list-c.o \ - filter-c.o \ - document_checker-c.o \ - -can_have_error-c.o: can_have_error-c.cpp -info-c.o: info-c.cpp -string_list-c.o: string_list-c.cpp -config-c.o: config-c.cpp -speller-c.o: speller-c.cpp -string_map-c.o: string_map-c.cpp -error-c.o: error-c.cpp -mutable_container-c.o: mutable_container-c.cpp -string_pair_enumeration-c.o: string_pair_enumeration-c.cpp -find_speller.o: find_speller.cpp -new_checker.o: new_checker.cpp -new_filter.o: new_filter.cpp -new_config.o: new_config.cpp -string_enumeration-c.o: string_enumeration-c.cpp -word_list-c.o: word_list-c.cpp -filter-c.o: filter-c.cpp -document_checker-c.o: document_checker-c.cpp - -aspell_dll: $(ASPELL_DLL_NAME) -$(ASPELL_DLL_NAME): $(aspell_dll_OBJECTS) - $(CC) $(FLAGS) \ - -shared \ - $(aspell_dll_LDFLAGS) \ - $+ \ - $(aspell_dll_EXTRALIBS) \ - $(LIBS) -o $@ -aspell_dll_clean: - -rm $(aspell_dll_OBJECTS) \ - $(ASPELL_DLL_NAME) \ - $(ASPELL_DLL_LIB_NAME) \ - $(ASPELL_DLL_DEF_NAME) - -################################################################################ -# {{{1 pspell-dll -# -PSPELL_DLL_NAME=pspell-$(LIBVERSION).dll -PSPELL_DLL_LIB_NAME=libpspell-$(LIBVERSION)-dll.lib -PSPELL_DLL_DEF_NAME=pspell-$(LIBVERSION).def - -pspell_dll_LDFLAGS = \ - -Wl,--compat-implib \ - -Wl,--out-implib=$(PSPELL_DLL_LIB_NAME) \ - -Wl,--output-def=$(PSPELL_DLL_DEF_NAME) -pspell_dll_OBJECTS = \ - dummy.o \ - -dummy.o: dummy.cpp - -pspell_dll: $(PSPELL_DLL_NAME) -$(PSPELL_DLL_NAME): $(pspell_dll_OBJECTS) - $(CC) $(FLAGS) \ - -shared \ - $(pspell_dll_LDFLAGS) \ - $+ \ - $(LIBS) -o $@ -pspell_dll_clean: - -rm $(pspell_dll_OBJECTS) \ - $(PSPELL_DLL_NAME) \ - $(PSPELL_DLL_LIB_NAME) \ - $(PSPELL_DLL_DEF_NAME) - -################################################################################ -# {{{1 aspell-exe -# -ASPELL_EXE_NAME=aspell.exe -aspell_exe_EXTRALIBS = \ - $(ASPELL_COMMON_A_NAME) \ - $(ASPELL_DLL_LIB_NAME) \ - $(PSPELL_DLL_LIB_NAME) \ - -aspell_exe_OBJECTS = \ - aspell.o \ - check_funs.o \ - checker_string.o \ - -aspell.o: aspell.cpp -check_funs.o: check_funs.cpp -checker_string.o: checker_string.cpp - -aspell_exe: $(ASPELL_EXE_NAME) -$(ASPELL_EXE_NAME): $(aspell_exe_OBJECTS) - $(CC) $(FLAGS) \ - $+ \ - $(aspell_exe_EXTRALIBS) \ - $(CURSES_LIB) \ - $(LIBS) -o $@ -aspell_exe_clean: - -rm $(aspell_exe_OBJECTS) $(ASPELL_EXE_NAME) - -################################################################################ -# {{{1 word-list-compress -# -WORD_LIST_COMPRESS_EXE_NAME=word-list-compress.exe - -word_list_compress_OBJECTS = \ - compress.o \ - -compress.o: compress.c - -word_list_compress_exe: $(WORD_LIST_COMPRESS_EXE_NAME) -$(WORD_LIST_COMPRESS_EXE_NAME): $(word_list_compress_OBJECTS) - $(CC) $(FLAGS) \ - $+ \ - $(LIBS) -o $@ -word_list_compress_clean: - -rm $(word_list_compress_OBJECTS) $(WORD_LIST_COMPRESS_EXE_NAME) - -################################################################################ -# {{{1 strip -# -strip: - $(STRIP) -g \ - $(ASPELL_DLL_NAME) \ - $(PSPELL_DLL_NAME) \ - $(ASPELL_EXE_NAME) \ - $(WORD_LIST_COMPRESS_EXE_NAME) - -################################################################################ -# {{{1 msvc-lib -# -msvc_lib: -ifdef MSVCLIB - -$(MSVCLIB) -machine:ix86 -def:$(ASPELL_DLL_DEF_NAME) - -$(MSVCLIB) -machine:ix86 -def:$(PSPELL_DLL_DEF_NAME) -else - @echo "msvc .lib skipped" -endif -msvc_lib_clean: - -rm aspell-$(LIBVERSION).lib pspell-$(LIBVERSION).lib aspell-common-$(ASPELLVERSION).lib - -rm aspell-$(LIBVERSION).exp pspell-$(LIBVERSION).exp aspell-common-$(ASPELLVERSION).exp - -################################################################################ -# {{{1 install, regfile -# -REGFILE_NAME=aspell.reg - -$(REGFILE_NAME): - echo REGEDIT4 > aspell.reg - echo >> aspell.reg - echo [HKEY_CURRENT_USER\\Environment] >> aspell.reg - echo \"ASPELL_CONF\"=\"prefix $(prefix)\" >> aspell.reg - -regfile: $(REGFILE_NAME) -regfile_clean: - -rm $(REGFILE_NAME) -install: regfile - -mkdir $(installdir) - -mkdir $(installdir)/$(pkglibdir) - -mkdir $(installdir)/$(pkgdatadir) - -cp $(WORD_LIST_COMPRESS_EXE_NAME) \ - $(ASPELL_EXE_NAME) \ - $(PSPELL_DLL_NAME) \ - $(ASPELL_DLL_NAME) \ - $(installdir) - -cp $(top_srcdir)/data/*.dat $(installdir)/$(pkgdatadir) - -cp $(top_srcdir)/data/*.kbd $(installdir)/$(pkgdatadir) - -cp $(REGFILE_NAME) $(installdir) - - -