diff options
author | 2013-04-26 14:48:54 -0400 | |
---|---|---|
committer | 2013-04-26 14:48:54 -0400 | |
commit | 6f7d37b3f5c805594f098bd61786a76f8d8773f9 (patch) | |
tree | a41fed9b34bf194dd152c3e8d7fba8ce31de7693 | |
parent | 7af4f16f84188cc49f51aafeb2b3ac42957f04bf (diff) |
Fixed compilation error for CDK on Mac OSX.
-rw-r--r-- | doc/12_Compiling.md | 5 | ||||
-rw-r--r-- | src/Makefile | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/doc/12_Compiling.md b/doc/12_Compiling.md index 276b33b8..98f97bfd 100644 --- a/doc/12_Compiling.md +++ b/doc/12_Compiling.md @@ -176,9 +176,10 @@ made to CDK are as follows: `typedef`ed. * *cdk_config.h* no longer defines `HAVE_SETLOCALE` since Textadept handles locale settings, no longer defines `HAVE_NCURSES_H` and `NCURSES` since - Textadept supports multiple curses implementations (not just ncurses), and + Textadept supports multiple curses implementations (not just ncurses), conditionally enables `HAVE_GRP_H`, `HAVE_LSTAT`, and `HAVE_PWD_H` definitions - on \*nix platforms since Windows does not have them. + on \*nix platforms since Windows does not have them, and explicitly undefines + `NCURSES_OPAQUE` since newer versions of ncurses on Mac OSX define it. * *cdk_util.h* `#define`s `Beep` as `CDKBeep` on Windows platforms since Beep is already defined. * The `baseName` and `dirName` functions in *cdk.c* recognize Window's '\' diff --git a/src/Makefile b/src/Makefile index dcc5e7c8..667c3833 100644 --- a/src/Makefile +++ b/src/Makefile @@ -131,7 +131,7 @@ ifneq (, $(or $(findstring Linux, $(kernel)), $(findstring BSD, $(kernel)))) # --libs gtk+-2.0) -framework Cocoa -lgtkmacintegration # .DEFAULT_GOAL := osx # #else -# # plat_flag = -DCURSES +# # plat_flag = -DCURSES -D_XOPEN_SOURCE_EXTENDED # # curses_libs = -lncurses # # .DEFAULT_GOAL := osx-curses # #endif |