From ab4d689e0b201114baa75845112bb4c21f5edefb Mon Sep 17 00:00:00 2001 From: Noah Evans Date: Thu, 11 Jun 2020 21:37:35 -0600 Subject: [PATCH] make a few small hacks to get graywolf compiling on OSX --- include/date.h | 1 + include/yalecad/base.h | 2 +- src/Ylib/CMakeLists.txt | 2 +- src/Ylib/relpath.c | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 include/date.h diff --git a/include/date.h b/include/date.h new file mode 100644 index 00000000..4ff28a29 --- /dev/null +++ b/include/date.h @@ -0,0 +1 @@ +#define DATE "@(#) Yale compilation date:Mon May 25 21:15:08 EDT 1992" diff --git a/include/yalecad/base.h b/include/yalecad/base.h index dc5775d0..60a4bdff 100644 --- a/include/yalecad/base.h +++ b/include/yalecad/base.h @@ -161,7 +161,7 @@ typedef long SHORT_LONG ; #endif /* ultrix, linux */ -#if defined(THINK_C) || defined(linux) +#if defined(THINK_C) || defined(linux) || __APPLE__ #define PROTOTYPES_OK #endif /* Mac, linux */ diff --git a/src/Ylib/CMakeLists.txt b/src/Ylib/CMakeLists.txt index 5118f736..2e7d7472 100644 --- a/src/Ylib/CMakeLists.txt +++ b/src/Ylib/CMakeLists.txt @@ -3,7 +3,7 @@ #add_executable(mincut main.c output.c readcells.c ${CMAKE_SOURCE_DIR}/src/date/date.c) -add_library(ycadgraywolf SHARED assign.c buster.c cleanup.c colors.c deck.c dialog.c draw.c dset.c edcolors.c file.c getftime.c graph.c grid.c hash.c heap.c list.c log.c menus.c message.c mst.c mytime.c okmalloc.c path.c plot.c program.c project.c queue.c quicksort.c radixsort.c rand.c rbtree.c relpath.c set.c stat.c stats.c string.c system.c time.c timer.c trans.c wgraphics.c ydebug.c yreadpar.c ) +add_library(ycadgraywolf SHARED assign.c buster.c cleanup.c colors.c deck.c dialog.c draw.c dset.c edcolors.c file.c getftime.c graph.c grid.c hash.c heap.c list.c log.c menus.c message.c mst.c mytime.c okmalloc.c path.c plot.c program.c project.c queue.c quicksort.c radixsort.c rand.c rbtree.c relpath.c set.c stat.c stats.c string.c system.c time.c timer.c trans.c wgraphics.c ydebug.c yreadpar.c ${CMAKE_SOURCE_DIR}/src/date/date.c) target_link_libraries(ycadgraywolf ${X11_LIBRARIES}) target_link_libraries(ycadgraywolf m) diff --git a/src/Ylib/relpath.c b/src/Ylib/relpath.c index 826629d4..d1b78430 100644 --- a/src/Ylib/relpath.c +++ b/src/Ylib/relpath.c @@ -58,7 +58,7 @@ char *known_path, *rel_path ; /* known path and relative path to it */ char known_fpath[LRECL] ; /* full path of known obj */ char *ptr ; /* used to replace obj with relative path */ char *result ; /* resulting path */ - char *Yfixpath(), *strrchr(), *strcat() ; + char *Yfixpath()/*, *strrchr(), *strcat()*/ ; INT up ; /* keeps count of backtracking up dir tree */ /* make a copy of path */