Permalink
Browse files

Merge branch 'master' of github.com:mxe/mxe

  • Loading branch information...
2 parents 6171bcb + df196b5 commit 09856b3ec5a71facd1c2f894f6f299337c37fb05 @tonytheodore tonytheodore committed Apr 16, 2012
Showing with 8 additions and 10 deletions.
  1. +4 −5 .gitignore
  2. +0 −1 Makefile
  3. +3 −3 src/{hunspell-test.cxx → hunspell-test.cpp}
  4. +1 −1 src/hunspell.mk
View
@@ -1,5 +1,4 @@
-usr/
-log/
-pkg
-dist/
-wip/
+/usr/
+/log/
+/pkg
+/wip/
View
@@ -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)))
@@ -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;
}
View
@@ -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

0 comments on commit 09856b3

Please sign in to comment.