[OMPT-svn-commit] OpenMPT r22776 - in branches/OpenMPT-1.31: . build/make

[<sv...@op...>]

Author: manx
Date: Sat Jan  4 09:30:03 2025
New Revision: 22776
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22776

Log:
Merged revision(s) 22756-22767 from trunk/OpenMPT:
[Imp] build: Makefile: Add basic Cygwin support (without auto-detection).
........
[Imp] build: Makefile: Auto-detect Cygwin.
........

Added:
   branches/OpenMPT-1.31/build/make/config-cygwin.mk
      - copied, changed from r22767, trunk/OpenMPT/build/make/config-cygwin.mk
Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/Makefile
   branches/OpenMPT-1.31/build/make/config-defaults.mk

Modified: branches/OpenMPT-1.31/Makefile
==============================================================================
--- branches/OpenMPT-1.31/Makefile	Sat Jan  4 09:13:07 2025	(r22775)
+++ branches/OpenMPT-1.31/Makefile	Sat Jan  4 09:30:03 2025	(r22776)
@@ -256,6 +256,27 @@
 
 else ifeq ($(OS),Windows_NT)
 
+ifeq ($(shell uname -o),Cygwin)
+
+HOST=unix
+HOST_FLAVOUR=CYGWIN
+
+TOOLCHAIN_SUFFIX=
+
+CPPCHECK = cppcheck
+
+MKDIR_P = mkdir -p
+RM = rm -f
+RMTREE = rm -rf
+INSTALL = install
+INSTALL_MAKE_DIR = install -d
+INSTALL_DIR = cp -r -v
+FIXPATH = $1
+
+NUMTHREADS:=$(NUMBER_OF_PROCESSORS)
+
+else
+
 HOST=windows
 HOST_FLAVOUR=
 
@@ -273,6 +294,8 @@
 
 NUMTHREADS:=$(NUMBER_OF_PROCESSORS)
 
+endif
+
 else
 
 HOST=unix

Copied and modified: branches/OpenMPT-1.31/build/make/config-cygwin.mk (from r22767, trunk/OpenMPT/build/make/config-cygwin.mk)
==============================================================================
--- trunk/OpenMPT/build/make/config-cygwin.mk	Sat Jan  4 07:53:11 2025	(r22767, copy source)
+++ branches/OpenMPT-1.31/build/make/config-cygwin.mk	Sat Jan  4 09:30:03 2025	(r22776)
@@ -14,8 +14,6 @@
 
 ifneq ($(STDCXX),)
 CXXFLAGS_STDCXX = -std=$(STDCXX) -fexceptions -frtti -pthread
-else ifeq ($(shell printf '\n' > bin/empty.cpp ; if $(CXX) -std=c++23 -c bin/empty.cpp -o bin/empty.out > /dev/null 2>&1 ; then echo 'c++23' ; fi ), c++23)
-CXXFLAGS_STDCXX = -std=c++23 -fexceptions -frtti -pthread
 else ifeq ($(shell printf '\n' > bin/empty.cpp ; if $(CXX) -std=c++20 -c bin/empty.cpp -o bin/empty.out > /dev/null 2>&1 ; then echo 'c++20' ; fi ), c++20)
 CXXFLAGS_STDCXX = -std=c++20 -fexceptions -frtti -pthread
 else
@@ -23,8 +21,6 @@
 endif
 ifneq ($(STDC),)
 CFLAGS_STDC = -std=$(STDC) -pthread
-else ifeq ($(shell printf '\n' > bin/empty.c ; if $(CC) -std=c23 -c bin/empty.c -o bin/empty.out > /dev/null 2>&1 ; then echo 'c23' ; fi ), c23)
-CFLAGS_STDC = -std=c23 -pthread
 else ifeq ($(shell printf '\n' > bin/empty.c ; if $(CC) -std=c18 -c bin/empty.c -o bin/empty.out > /dev/null 2>&1 ; then echo 'c18' ; fi ), c18)
 CFLAGS_STDC = -std=c18 -pthread
 else ifeq ($(shell printf '\n' > bin/empty.c ; if $(CC) -std=c17 -c bin/empty.c -o bin/empty.out > /dev/null 2>&1 ; then echo 'c17' ; fi ), c17)

Modified: branches/OpenMPT-1.31/build/make/config-defaults.mk
==============================================================================
--- branches/OpenMPT-1.31/build/make/config-defaults.mk	Sat Jan  4 09:13:07 2025	(r22775)
+++ branches/OpenMPT-1.31/build/make/config-defaults.mk	Sat Jan  4 09:30:03 2025	(r22776)
@@ -25,6 +25,10 @@
 include build/make/config-mingw-w64.mk
 endif
 
+else ifeq ($(HOST_FLAVOUR),CYGWIN)
+
+include build/make/config-cygwin.mk
+
 else ifeq ($(HOST_FLAVOUR),LINUX)
 
 include build/make/config-gcc.mk