Skip to content

Commit

Permalink
Merge pull request #173 from Mindwerks/fix_freebsd_builds
Browse files Browse the repository at this point in the history
add *BSD fix for ONLCR support
  • Loading branch information
psi29a committed Jul 11, 2017
2 parents d40186f + 970f926 commit 2e49573
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
@@ -1,7 +1,7 @@
os:
- linux
- osx
osx_image: xcode7.2
osx_image: xcode8.3
dist: trusty
sudo: required
language: c
Expand Down
5 changes: 2 additions & 3 deletions CI/before_install.osx.sh
@@ -1,6 +1,5 @@
#!/bin/sh

brew update
brew rm cmake || true
brew rm pkgconfig || true
brew install cmake pkgconfig
brew outdated cmake || brew upgrade cmake
brew outdated pkgconfig || brew upgrade pkgconfig
6 changes: 3 additions & 3 deletions CI/before_script.osx.sh
Expand Up @@ -11,9 +11,9 @@ cd build
cmake \
-D CMAKE_EXE_LINKER_FLAGS="-lz" \
-D CMAKE_PREFIX_PATH="$DEPENDENCIES_ROOT" \
-D CMAKE_OSX_DEPLOYMENT_TARGET="10.8" \
-D CMAKE_OSX_SYSROOT="macosx10.11" \
-D CMAKE_BUILD_TYPE=Debug \
-D CMAKE_OSX_DEPLOYMENT_TARGET="10.9" \
-D CMAKE_OSX_SYSROOT="macosx10.12" \
-D CMAKE_BUILD_TYPE=Release \
-D WANT_OSX_DEPLOYMENT=TRUE \
-G"Unix Makefiles" \
..
1 change: 1 addition & 0 deletions src/wm_tty.c
Expand Up @@ -27,6 +27,7 @@
#if !(defined(_WIN32) || defined(__DJGPP__) || defined(WILDMIDI_AMIGA) || defined(__OS2__) || defined(__EMX__))

#define _XOPEN_SOURCE 600 /* for ONLCR */
#define __BSD_VISIBLE 1 /* for ONLCR in *BSD */

#include <unistd.h>
#include <termios.h>
Expand Down

0 comments on commit 2e49573

Please sign in to comment.