From: <sv...@op...> - 2024-07-14 12:33:03
|
Author: manx Date: Sun Jul 14 14:32:49 2024 New Revision: 21161 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21161 Log: Merged revision(s) 21160 from trunk/OpenMPT: [Fix] build: Makefile: Fix copy-paste error in OPTIMIZE_FASTMATH handling. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/Makefile Modified: branches/OpenMPT-1.31/Makefile ============================================================================== --- branches/OpenMPT-1.31/Makefile Sun Jul 14 14:32:00 2024 (r21160) +++ branches/OpenMPT-1.31/Makefile Sun Jul 14 14:32:49 2024 (r21161) @@ -585,34 +585,6 @@ endif -ifeq ($(OPTIMIZE_FASTMATH),2) -CPPFLAGS += -DMPT_CHECK_CXX_IGNORE_WARNING_FASTMATH -DMPT_CHECK_CXX_IGNORE_WARNING_FINITEMATH -CXXFLAGS += -ffast-math -CFLAGS += -ffast-math -else ifeq ($(OPTIMIZE_FASTMATH),1) -CPPFLAGS += -DMPT_CHECK_CXX_IGNORE_WARNING_FINITEMATH -CXXFLAGS += -fassociative-math -CXXFLAGS += -fcx-limited-range -CXXFLAGS += -fexcess-precision=fast -CXXFLAGS += -ffinite-math-only -CXXFLAGS += -freciprocal-math -CXXFLAGS += -fno-math-errno -CXXFLAGS += -fno-rounding-math -CXXFLAGS += -fno-signaling-nans -CXXFLAGS += -fno-signed-zeros -CXXFLAGS += -fno-trapping-math -CFLAGS += -fassociative-math -CFLAGS += -fcx-limited-range -CFLAGS += -fexcess-precision=fast -CFLAGS += -ffinite-math-only -CFLAGS += -freciprocal-math -CFLAGS += -fno-math-errno -CFLAGS += -fno-rounding-math -CFLAGS += -fno-signaling-nans -CFLAGS += -fno-signed-zeros -CFLAGS += -fno-trapping-math -endif - ifeq ($(CHECKED),1) CPPFLAGS += -DMPT_BUILD_CHECKED CXXFLAGS += -g -fno-omit-frame-pointer |