equal
deleted
inserted
replaced
63 # BUNDLE_FILE_SUFFIX suffix for bundles: .tar or .tar.gz |
63 # BUNDLE_FILE_SUFFIX suffix for bundles: .tar or .tar.gz |
64 # ISA_DIR solaris only: /sparcv9 or /amd64 |
64 # ISA_DIR solaris only: /sparcv9 or /amd64 |
65 # REQUIRED_WINDOWS_NAME windows only: basic name of windows |
65 # REQUIRED_WINDOWS_NAME windows only: basic name of windows |
66 # REQUIRED_WINDOWS_VERSION windows only: specific version of windows |
66 # REQUIRED_WINDOWS_VERSION windows only: specific version of windows |
67 # USING_CYGWIN windows only: true or false |
67 # USING_CYGWIN windows only: true or false |
|
68 # USING_MSYS windows only: true or false |
|
69 # USING_MKS windows only: true or false |
68 # WINDOWS_NT_VERSION_STRING windows only: long version name |
70 # WINDOWS_NT_VERSION_STRING windows only: long version name |
69 # REQUIRED_OS_VERSION required OS version, e.g. 5.10, 2.4 |
71 # REQUIRED_OS_VERSION required OS version, e.g. 5.10, 2.4 |
70 # REQUIRED_FREE_SPACE minimum disk space needed for outputdir |
72 # REQUIRED_FREE_SPACE minimum disk space needed for outputdir |
71 # REQUIRED_ZIP_VER required version of zip |
73 # REQUIRED_ZIP_VER required version of zip |
72 # REQUIRED_UNZIP_VER required version of unzip |
74 # REQUIRED_UNZIP_VER required version of unzip |
325 endif |
327 endif |
326 |
328 |
327 # Windows with and without CYGWIN will be slightly different |
329 # Windows with and without CYGWIN will be slightly different |
328 ifeq ($(SYSTEM_UNAME), Windows_NT) |
330 ifeq ($(SYSTEM_UNAME), Windows_NT) |
329 PLATFORM = windows |
331 PLATFORM = windows |
|
332 USING_MKS = true |
|
333 export USING_MKS |
330 OS_VERSION := $(shell uname -r) |
334 OS_VERSION := $(shell uname -r) |
331 WINDOWS_NT_VERSION_STRING=Windows_NT |
335 WINDOWS_NT_VERSION_STRING=Windows_NT |
332 REQUIRED_MKS_VER=6.1 |
336 REQUIRED_MKS_VER=6.1 |
333 endif |
337 endif |
334 ifneq (,$(findstring CYGWIN,$(SYSTEM_UNAME))) |
338 ifneq (,$(findstring CYGWIN,$(SYSTEM_UNAME))) |
336 OS_VERSION := 5 |
340 OS_VERSION := 5 |
337 USING_CYGWIN = true |
341 USING_CYGWIN = true |
338 export USING_CYGWIN |
342 export USING_CYGWIN |
339 WINDOWS_NT_VERSION_STRING=CYGWIN_NT |
343 WINDOWS_NT_VERSION_STRING=CYGWIN_NT |
340 REQUIRED_CYGWIN_VER=4.0 |
344 REQUIRED_CYGWIN_VER=4.0 |
|
345 endif |
|
346 ifneq (,$(findstring MINGW,$(SYSTEM_UNAME))) |
|
347 PLATFORM = windows |
|
348 USING_MSYS = true |
|
349 export USING_MSYS |
341 endif |
350 endif |
342 |
351 |
343 # Platform settings specific to Windows |
352 # Platform settings specific to Windows |
344 ifeq ($(PLATFORM), windows) |
353 ifeq ($(PLATFORM), windows) |
345 OS_NAME = nt |
354 OS_NAME = nt |