zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-12-28 03:37:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CONFIG: default compilation is 'Opt' in Makefiles

Browse Source 
- only include compiler-family rules for C++ once

STYLE: minor cleanup of wmake/src Makefile
This commit is contained in:
Mark Olesen
2019-12-16 09:22:50 +01:00
parent 1a16207e0d
commit 9edaf8bfa5
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wmake/rules/General/general
View File

@ -14,11 +14,16 @@ GLIBS = -lm
GLIB_LIBS =
COMPILER_TYPE = $(shell echo "$(WM_COMPILER)" | sed -e 's/[0-9].*//')
DEFAULT_RULES = $(WM_DIR)/rules/$(WM_ARCH)$(COMPILER_TYPE)
COMPILER_FAMILY = $(shell echo "$(WM_COMPILER)" | sed -e 's/[0-9].*//')
DEFAULT_RULES = $(WM_DIR)/rules/$(WM_ARCH)$(COMPILER_FAMILY)
RULES = $(WM_DIR)/rules/$(WM_ARCH)$(WM_COMPILER)
WMAKE_BIN = $(WM_DIR)/platforms/$(WM_ARCH)$(WM_COMPILER)
# Default compilation is 'Opt' - never permit an empty value
ifeq ($(WM_COMPILE_OPTION),)
WM_COMPILE_OPTION = Opt
endif
ifeq ($(WM_SCHEDULER),)
AND = &&
else
@ -26,7 +31,6 @@ else
endif
include $(DEFAULT_RULES)/general
include $(DEFAULT_RULES)/c++
sinclude $(RULES)/general
sinclude $(RULES)/c++
include $(GENERAL_RULES)/transform