Revision faf9fe75223dfef2f86958c1ced84be369f4738e authored by Tony Kelman on 17 September 2016, 16:31:22 UTC, committed by Tony Kelman on 17 September 2016, 16:35:31 UTC
* Attempt to fix osx travis

We're now getting
> Error: You must `brew link autoconf` before staticfloat/julia/julia can be installed

Probably because Homebrew officially started supporting 10.12 Sierra, and that broke something.
Try to use the 10.10 Travis OSX image instead of the default 10.9 (https://docs.travis-ci.com/user/osx-ci-environment/)

* explicitly install cmake on osx travis

(cherry picked from commit 45bc17d41b40f271dd5ebb2357e7f3564f969007)
1 parent ea2aaf7
Raw File
Windows.inc
!ifndef _MAKEFILE_INC_

_MAKEFILE_INC_ = 1

!if ( "$(TARGET_CPU)" == "X86" ) || ( "$(TARGET_CPU)" == "x86" )
CPU = i386
!elseif ( "$(TARGET_CPU)" == "X64" ) || ( "$(TARGET_CPU)" == "x64" )
CPU = AMD64
!else
CPU = $(PROCESSOR_ARCHITECTURE)
!endif

###############################################################################

!if "$(TARGET_OS)" == ""
TARGET_OS = 5.02
!endif

###############################################################################

!if "$(TARGET_OS)" == "5.0"
WINVER = 0x0500
!elseif "$(TARGET_OS)" == "5.01"
WINVER = 0x0501
!elseif "$(TARGET_OS)" == "5.02"
WINVER = 0x0502
!elseif "$(TARGET_OS)" == "6.0"
WINVER = 0x0600
!endif

###############################################################################

!ifdef INTEL
CC = icl /nologo /Qstd=c99
LINK = xilink /nologo
AR = xilib /nologo
!else
CC = cl /nologo /TP
LINK = link /nologo
AR = lib /nologo
!endif

###############################################################################

CFLAGS = /c /DCRTAPI1=_cdecl /DCRTAPI2=_cdecl /GS /D_WINNT /D_WIN32_WINNT=$(WINVER) /DNTDDI_VERSION=$(WINVER)0000 /DWINVER=$(WINVER) /DWIN32 /D_WIN32
LFLAGS = /INCREMENTAL:NO /NODEFAULTLIB:MSVCRT

!if "$(CPU)" == "i386"
CFLAGS = $(CFLAGS) /D_X86_=1
!elseif "$(CPU)" == "AMD64"
CFLAGS = $(CFLAGS) /D_AMD64_=1 /DWIN64 /D_WIN64
!endif

!ifdef JL_DEBUG_BUILD
CFLAGS = $(CFLAGS) /Zi /Od /DDEBUG /MDd
LFLAGS = $(LFLAGS) /DEBUG
!else
CFLAGS = $(CFLAGS) /Ox /DNDEBUG /MD
LFLAGS = $(LFLAGS) /RELEASE
!endif

!endif # _MAKEFILE_INC_

# vim: noexpandtab:ts=4:sw=4:ft=make:

back to top