Makefile: Prefer Win32 native over MSYS

Prefer Win32 native over MSYS on default build. MSYS still can be
choosen with "PLATFORM=msys".
This commit is contained in:
okuoku 2017-12-13 20:55:53 +09:00
parent d313f85b16
commit 7c45b4ab0e
2 changed files with 12 additions and 1 deletions

View file

@ -24,6 +24,17 @@ TEMPFILE := $(shell mktemp -t chibi.XXXXXX)
######################################################################## ########################################################################
# Choose compiled library on MSYS
ifeq ($(OS), Windows_NT)
ifeq ($(PLATFORM),msys)
EXCLUDE_WIN32_LIBS=1
else
EXCLUDE_POSIX_LIBS=1
endif
endif
########################################################################
CHIBI_COMPILED_LIBS = lib/chibi/filesystem$(SO) lib/chibi/weak$(SO) \ CHIBI_COMPILED_LIBS = lib/chibi/filesystem$(SO) lib/chibi/weak$(SO) \
lib/chibi/heap-stats$(SO) lib/chibi/disasm$(SO) lib/chibi/ast$(SO) \ lib/chibi/heap-stats$(SO) lib/chibi/disasm$(SO) lib/chibi/ast$(SO) \
lib/chibi/emscripten$(SO) lib/chibi/emscripten$(SO)

View file

@ -32,7 +32,7 @@ before_build:
- if %BUILDTYPE%.==x86MinGW. set CC=c:/msys64/mingw32/bin/gcc - if %BUILDTYPE%.==x86MinGW. set CC=c:/msys64/mingw32/bin/gcc
- if %BUILDTYPE%.==x64MSYS. set CC=gcc - if %BUILDTYPE%.==x64MSYS. set CC=gcc
- if %TOOLCHAIN%.==MSVC. set CC=cl.exe - if %TOOLCHAIN%.==MSVC. set CC=cl.exe
- if %TOOLCHAIN%%BUILDSYSTEM%.==MinGWMSYS2. set EXARG=EXCLUDE_POSIX_LIBS=1 - if %TOOLCHAIN%%BUILDSYSTEM%.==MinGWMSYS2. set EXARG=
- if %TOOLCHAIN%%BUILDSYSTEM%.==MSYSMSYS2. set EXARG=PLATFORM=msys - if %TOOLCHAIN%%BUILDSYSTEM%.==MSYSMSYS2. set EXARG=PLATFORM=msys
- if %BUILDSYSTEM%.==CMAKE. cmake -G Ninja . - if %BUILDSYSTEM%.==CMAKE. cmake -G Ninja .