zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wmake: Simplified and standardised the Make/files files

Browse Source 
cpp is no longer used to pre-process Make/files files allowing standard make '#'
syntax for comments, 'ifdef', 'ifndef' conditionals etc.  This is make possible
by automatically pre-pending SOURCE += to each of the source file names in
Make/files.

The list of source files compile can be specified either as a simple list of
files in Make/files e.g.

    # Note: fileMonitor assumes inotify by default. Compile with -DFOAM_USE_STAT
    # to use stat (=timestamps) instead of inotify
    fileMonitor.C

    ifdef SunOS64
        dummyPrintStack.C
    else
        printStack.C
    endif

    LIB = $(FOAM_LIBBIN)/libOSspecific

or

or directly as the SOURCE entry which is used in the Makefile:

    SOURCE = \
        adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C \
        adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C \
        adjointShapeOptimizationFoam.C

    EXE = $(FOAM_APPBIN)/adjointShapeOptimizationFoam

In either form make syntax for comments and conditionals is supported.
This commit is contained in:
Henry Weller
2020-12-10 08:09:49 +00:00
parent 25926b505d
commit 848ec1cd97
22 changed files with 85 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/Make/files
View File

@ -29,7 +29,7 @@ $(cellSizeAndAlignmentControl)/cellSizeAndAlignmentControls.C
$(cellSizeAndAlignmentControl)/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.C
$(cellSizeAndAlignmentControl)/fileControl/fileControl.C
$(cellSizeAndAlignmentControl)/searchableSurfaceControl/searchableSurfaceControl.C
/*cellShapeControl/pQuadCoorControl/pQuadCoorControl.C*/
# cellShapeControl/pQuadCoorControl/pQuadCoorControl.C
cellShapeControl/cellAspectRatioControl/cellAspectRatioControl.C
@ -37,7 +37,7 @@ cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.C
cellShapeControl/controlMeshRefinement/controlMeshRefinement.C
/*cellSizeControlSurfaces/cellSizeControlSurfaces.C*/
# cellSizeControlSurfaces/cellSizeControlSurfaces.C
cellSizeFunctions = cellSizeControlSurfaces/cellSizeFunction
$(cellSizeFunctions)/cellSizeFunction/cellSizeFunction.C

28
applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Make/files
View File

@ -1,21 +1,17 @@
/*
foamyHexMeshSurfaceSimplify_non_octree.C
MarchingCubes/MarchingCubes.cpp
MarchingCubes/ply.c
*/
# foamyHexMeshSurfaceSimplify_non_octree.C
# MarchingCubes/MarchingCubes.cpp
# MarchingCubes/ply.c
/*
MarchingCubes = fastdualoctree_sgp
# MarchingCubes = fastdualoctree_sgp
$(MarchingCubes)/data_access.cpp
$(MarchingCubes)/fparser.cpp
$(MarchingCubes)/fpoptimizer.cpp
$(MarchingCubes)/MarchingCubes.cpp
$(MarchingCubes)/mc_draw.cpp
$(MarchingCubes)/morton.cpp
$(MarchingCubes)/opt_octree.cpp
$(MarchingCubes)/hash_octree.cpp
*/
# $(MarchingCubes)/data_access.cpp
# $(MarchingCubes)/fparser.cpp
# $(MarchingCubes)/fpoptimizer.cpp
# $(MarchingCubes)/MarchingCubes.cpp
# $(MarchingCubes)/mc_draw.cpp
# $(MarchingCubes)/morton.cpp
# $(MarchingCubes)/opt_octree.cpp
# $(MarchingCubes)/hash_octree.cpp
foamyHexMeshSurfaceSimplify.C