diff options
| author |  Bob Tolbert <bob@eyesopen.com> | 2025-03-10 10:13:36 -0500 |
|---|---|---|
| committer | Bob Tolbert <bob@eyesopen.com> | 2025-03-10 10:13:36 -0500 |
| commit | a15916ec9cc44554b3d8a7f9171433498b33a23d (patch) | |
| tree | 1a643e52dcb0c6e69ddabc7fb5f911ce97ba9aab /Makefile | |
| parent | Fix defdyn in flychecking. (diff) | |
Update Makefile and meson to build with msys2 gcc and clang
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 12 |
1 files changed, 12 insertions, 0 deletions
@@ -57,6 +57,7 @@ LDFLAGS?=-rdynamic LIBJANET_LDFLAGS?=$(LD_FLAGS) RUN:=$(RUN) + COMMON_CFLAGS:=-std=c99 -Wall -Wextra -Isrc/include -Isrc/conf -fvisibility=hidden -fPIC BOOT_CFLAGS:=-DJANET_BOOTSTRAP -DJANET_BUILD=$(JANET_BUILD) -O0 $(COMMON_CFLAGS) -g BUILD_CFLAGS:=$(CFLAGS) $(COMMON_CFLAGS) @@ -94,12 +95,18 @@ endif endif # Mingw +MINGW_COMPILER= ifeq ($(findstring MINGW,$(UNAME)), MINGW) + MINGW_COMPILER=gcc CLIBS:=-lws2_32 -lpsapi -lwsock32 LDFLAGS:=-Wl,--out-implib,$(JANET_IMPORT_LIB) LIBJANET_LDFLAGS:=-Wl,--out-implib,$(JANET_LIBRARY_IMPORT_LIB) JANET_TARGET:=$(JANET_TARGET).exe JANET_BOOT:=$(JANET_BOOT).exe + COMPILER_VERSION:=$(shell $(CC) --version) + ifeq ($(findstring clang,$(COMPILER_VERSION)), clang) + MINGW_COMPILER=clang + endif endif @@ -211,6 +218,11 @@ else SONAME=libjanet.so.1.37 endif +ifeq ($(MINGW_COMPILER), clang) + SONAME= + SONAME_SETTER= +endif + build/c/shell.c: src/mainclient/shell.c cp $< $@ |