diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Source/CursesDialog/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | Source/CursesDialog/form/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Source/CursesDialog/form/form.h | 11 | ||||
| -rw-r--r-- | Source/CursesDialog/form/nc_alloc.h | 2 |
5 files changed, 17 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 38ad602..916073c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,6 +34,6 @@ SET(EXECUTABLE_OUTPUT_PATH ${CMake_BINARY_DIR}/Source CACHE PATH "Where to put the executables for CMake" ) -INCLUDE_REGULAR_EXPRESSION("^(\\.\\./)?(cm|FLTK|CMake).*") +INCLUDE_REGULAR_EXPRESSION("^(\\.\\./)?(cm|FLTK|CMake|form).*") diff --git a/Source/CursesDialog/CMakeLists.txt b/Source/CursesDialog/CMakeLists.txt index 336b64f..1382ace 100644 --- a/Source/CursesDialog/CMakeLists.txt +++ b/Source/CursesDialog/CMakeLists.txt @@ -14,8 +14,9 @@ SOURCE_FILES( CURSES_SRCS ccurses ) +INCLUDE_DIRECTORIES(${CMake_SOURCE_DIR}/Source/CursesDialog/form) INCLUDE_DIRECTORIES(${CURSES_INCLUDE_PATH}) -INCLUDE_DIRECTORIES(${CMake_SOURCE_DIR}/Source/CursesDialog/form/) + LINK_LIBRARIES(${CURSES_LIBRARY}) IF(CURSES_EXTRA_LIBRARY) diff --git a/Source/CursesDialog/form/CMakeLists.txt b/Source/CursesDialog/form/CMakeLists.txt index 7691bc9..32c17eb 100644 --- a/Source/CursesDialog/form/CMakeLists.txt +++ b/Source/CursesDialog/form/CMakeLists.txt @@ -1,5 +1,7 @@ PROJECT(CMAKE_FORM) +INCLUDE_REGULAR_EXPRESSION("^.*$") + SOURCE_FILES(FORM_SRCS fld_arg.c fld_attr.c diff --git a/Source/CursesDialog/form/form.h b/Source/CursesDialog/form/form.h index d0777da..e18dfee 100644 --- a/Source/CursesDialog/form/form.h +++ b/Source/CursesDialog/form/form.h @@ -33,7 +33,18 @@ #ifndef FORM_H #define FORM_H +#if defined(__sun__) && defined(__GNUC__) + #define _MSE_INT_H +#endif + +#define _BOOL_DEFINED +#include <sys/time.h> +#ifndef _XOPEN_SOURCE_EXTENDED + #define _XOPEN_SOURCE_EXTENDED +#endif /* XOPEN_SOURCE_EXTENDED */ #include <curses.h> +#undef _XOPEN_SOURCE_EXTENDED + #include <eti.h> #include <stdarg.h> diff --git a/Source/CursesDialog/form/nc_alloc.h b/Source/CursesDialog/form/nc_alloc.h index 80ce3f4..f49ea93 100644 --- a/Source/CursesDialog/form/nc_alloc.h +++ b/Source/CursesDialog/form/nc_alloc.h @@ -72,7 +72,7 @@ extern void _nc_leaks_dump_entry(void); /* doalloc.c */ extern void *_nc_doalloc(void *, size_t); #if !HAVE_STRDUP -#define strdup _nc_strdup +/* #define strdup _nc_strdup */ extern char *_nc_strdup(const char *); #endif |