diff options
| author | Tony Theodore <tonyt@logyst.com> | 2012-04-16 13:38:26 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2012-04-16 13:38:26 (GMT) |
| commit | 09856b3ec5a71facd1c2f894f6f299337c37fb05 (patch) | |
| tree | f0187748cb3c9505c26e8c6648326c1176333a06 | |
| parent | 6171bcb8e714b9d938627998262966868f992ea8 (diff) | |
| parent | df196b55ec95a23beb5083425982af36e35da2b9 (diff) | |
| download | mxe-09856b3ec5a71facd1c2f894f6f299337c37fb05.zip mxe-09856b3ec5a71facd1c2f894f6f299337c37fb05.tar.gz mxe-09856b3ec5a71facd1c2f894f6f299337c37fb05.tar.bz2 | |
Merge branch 'master' of github.com:mxe/mxe
| -rw-r--r-- | .gitignore | 9 | ||||
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | src/hunspell-test.cpp (renamed from src/hunspell-test.cxx) | 6 | ||||
| -rw-r--r-- | src/hunspell.mk | 2 |
4 files changed, 8 insertions, 10 deletions
@@ -1,5 +1,4 @@ -usr/ -log/ -pkg -dist/ -wip/ +/usr/ +/log/ +/pkg +/wip/ @@ -23,7 +23,6 @@ PREFIX := $(PWD)/usr LOG_DIR := $(PWD)/log TIMESTAMP := $(shell date +%Y%m%d_%H%M%S) PKG_DIR := $(PWD)/pkg -DIST_DIR := $(PWD)/dist TMP_DIR = $(PWD)/tmp-$(1) MAKEFILE := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)) TOP_DIR := $(patsubst %/,%,$(dir $(MAKEFILE))) diff --git a/src/hunspell-test.cxx b/src/hunspell-test.cpp index a66b434..67393d5 100644 --- a/src/hunspell-test.cxx +++ b/src/hunspell-test.cpp @@ -17,7 +17,7 @@ int main(int argc, char *argv[]) dic.close(); std::ofstream aff ("hunspell-test.aff"); aff << "SET UTF-8\nTRY loredWH\nMAXDIFF 1"; - aff.close(); + aff.close(); Hunspell h("hunspell-test.aff", "hunspell-test.dic"); if (h.spell("Hello") == 0) @@ -28,10 +28,10 @@ int main(int argc, char *argv[]) { std::cerr << "Error: hunspell marked wrong word as correct" << std::endl; } - + char ** result; int n = h.suggest(&result, "ell"); for (int i = 0; i < n; i++) std::cout << result[i]; - + return 0; } diff --git a/src/hunspell.mk b/src/hunspell.mk index 74e943e..0aa6190 100644 --- a/src/hunspell.mk +++ b/src/hunspell.mk @@ -31,6 +31,6 @@ define $(PKG)_BUILD # Test '$(TARGET)-g++' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).cxx' -o '$(PREFIX)/$(TARGET)/bin/test-hunspell.exe' \ + '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-hunspell.exe' \ `'$(TARGET)-pkg-config' hunspell --cflags --libs` endef |